head 1.4; access; symbols pkgsrc-2023Q4:1.4.0.150 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.148 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.146 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.144 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.142 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.140 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.138 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.136 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.134 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.132 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.130 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.128 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.126 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.124 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.120 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.100 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.122 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.118 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.116 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.114 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.112 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.110 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.108 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.106 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.104 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.102 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.98 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.96 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.94 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.92 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.90 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.88 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.86 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.84 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.82 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.80 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.78 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.76 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.74 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.72 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.70 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.68 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.66 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.64 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.62 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.60 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.58 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.56 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.54 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.52 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.50 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.48 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.46 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.44 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.42 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.40 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.38 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.36 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.34 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.32 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.30 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.28 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.26 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.24 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.22 pkgsrc-2008Q1:1.4.0.20 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.18 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.16 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.14 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.12 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.10 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.8 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.6 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.4 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.2 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.3.0.24 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.22 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.20 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.18 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.16 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.14 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.12 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.10 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1 netbsd-1-3-PATCH003:1.1; locks; strict; comment @# @; 1.4 date 2005.12.11.20.48.46; author joerg; state Exp; branches; next 1.3; 1.3 date 99.09.06.16.37.43; author tron; state Exp; branches; next 1.2; 1.2 date 99.09.06.16.36.33; author tron; state Exp; branches; next 1.1; 1.1 date 98.08.23.06.49.29; author garbled; state Exp; branches; next ; desc @@ 1.4 log @DragonFly support. XXX Is sys/buf.h needed at all in cdrom_freebsd.c? @ text @$NetBSD: patch-ai,v 1.3 1999/09/06 16:37:43 tron Exp $ --- logo_setup.c.orig Tue Jan 12 19:59:46 1993 +++ logo_setup.c Mon Sep 6 18:37:05 1999 @@@@ -28,6 +28,9 @@@@ # include # include "cdrom_globs.h" +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun # include "cdrom_sun.h" #endif @@@@ -43,6 +46,8 @@@@ void Done(); +extern AppData app_data; + static Widget track_button_widget; static Widget timer_button_widget; static Widget volume_scroll_widget; @@@@ -55,19 +60,19 @@@@ Widget title_done_widget; static int vol; +extern void leds_label_setup(); +static void cb_track_button(); +static void cb_timer_button(); +static void volume_jump_proc(); +static void volume_scroll_proc(); +static void popup_title_dialog(); +static void popdown_title_dialog(); + void logo_setup(parent_widget) Widget parent_widget; { - extern void leds_label_setup(); - extern void cb_track_button(); - extern void cb_timer_button(); - extern void volume_jump_proc(); - extern void volume_scroll_proc(); - extern void popup_title_dialog(); - extern void popdown_title_dialog(); - Widget version_label_widget; char version_string[80]; @@@@ -126,15 +131,16 @@@@ track_button_update(); - if (display_timer == True) + if (app_data.display_timer == True) { timer_button_widget = XtCreateManagedWidget("timerButton", toggleWidgetClass, logo_form_widget, (ArgList) NULL, 0); - XtAddCallback(timer_button_widget, XtNcallback, cb_timer_button, 0); - - timer_button_update(); + XtAddCallback(timer_button_widget, XtNcallback, + cb_timer_button, 0); + timer_button_update(); + } thumb_pixmap = XCreateBitmapFromData(XtDisplay(logo_form_widget), rootwin(logo_form_widget), thumb_bits, @@@@ -171,10 +177,10 @@@@ #ifdef sgi if ((vol = cdrom_get_volume()) == 0) { - vol = (int) ((MAXVOL - volbase) * 0.75) + volbase; + vol = (int) ((MAXVOL - app_data.volbase) * 0.75) + app_data.volbase; } #else - vol = (int) ((MAXVOL - volbase) * 0.75) + volbase; + vol = (int) ((MAXVOL - app_data.volbase) * 0.75) + app_data.volbase; #endif cdrom_volume(vol, vol); #ifdef sgi @@@@ -356,7 +362,7 @@@@ Arg args[1]; Boolean state; - if (display_timer == False) + if (app_data.display_timer == False) return; if ((cdi.state & CDROM_STATE_PAUSE) == 0) @@@@ -413,7 +419,7 @@@@ vol = PCT2VAL(*(float *)percent); #else vol = (*(float *) percent) * MAXVOL; - vol = (vol * volpcent) + volbase; + vol = (vol * app_data.volpcent) + app_data.volbase; #endif if (vol > MAXVOL) @ 1.3 log @Fix RCS Ids. @ text @d1 1 a1 1 $NetBSD$ d9 1 a9 1 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) @ 1.2 log @Convert patches to unified output format. @ text @d1 1 a1 1 $NetBSD d4 1 a4 1 +++ logo_setup.c Mon Sep 6 18:22:07 1999 @ 1.1 log @Added and fixed patches to allow build on alpha. Closes PR 5815 (Tim Rightnour) @ text @d1 7 a7 4 $NetBSD$ --- internals.c.orig Tue Jan 12 11:59:45 1993 +++ internals.c Wed Jul 22 21:35:54 1998 @@@@ -24,2 +24,5 @@@@ d13 13 a25 1 @@@@ -31,3 +34,3 @@@@ d27 21 d49 6 a54 3 +static void scan_update(); static XtIntervalId ivid = -1; @@@@ -38,2 +41,3 @@@@ d56 46 a101 1 +extern AppData app_data; d103 1 a103 90 @@@@ -172,3 +176,2 @@@@ int curtrack; - extern void scan_update(); @@@@ -198,3 +201,3 @@@@ ((start_addr.minute * 60) + start_addr.second - - scanSkipInterval)) || + app_data.scanSkipInterval)) || ((cdi.state & CDROM_STATE_PAUSE) && @@@@ -202,3 +205,3 @@@@ ((start_addr.minute * 60) + start_addr.second - - pauseSkipInterval))) + app_data.pauseSkipInterval))) { @@@@ -210,5 +213,5 @@@@ if (cdi.state & CDROM_STATE_PAUSE) { - start_addr.second -= pauseSkipInterval; + start_addr.second -= app_data.pauseSkipInterval; } else if (cdi.state & CDROM_STATE_PLAY) { - start_addr.second -= scanSkipInterval; + start_addr.second -= app_data.scanSkipInterval; } @@@@ -225,5 +228,5 @@@@ if (cdi.state & CDROM_STATE_PAUSE) { - start_addr.second -= pauseSkipInterval; + start_addr.second -= app_data.pauseSkipInterval; } else if (cdi.state & CDROM_STATE_PLAY) { - start_addr.second -= scanSkipInterval; + start_addr.second -= app_data.scanSkipInterval; } @@@@ -276,3 +279,3 @@@@ scanivid = XtAppAddTimeOut(appc, - (int)(pausePauseInterval * 1000.0), + (int)(app_data.pausePauseInterval * 1000.0), scan_update, NULL); @@@@ -306,3 +309,2 @@@@ int curtrack; - extern void scan_update(); @@@@ -334,3 +336,3 @@@@ ((start_addr.minute * 60) + start_addr.second + - scanSkipInterval)) || + app_data.scanSkipInterval)) || ((cdi.state & CDROM_STATE_PAUSE) && @@@@ -338,3 +340,3 @@@@ ((start_addr.minute * 60) + start_addr.second + - pauseSkipInterval))) + app_data.pauseSkipInterval))) { @@@@ -348,5 +350,5 @@@@ if (cdi.state & CDROM_STATE_PAUSE) { - start_addr.second += pauseSkipInterval; + start_addr.second += app_data.pauseSkipInterval; } else if (cdi.state & CDROM_STATE_PLAY) { - start_addr.second += scanSkipInterval; + start_addr.second += app_data.scanSkipInterval; } @@@@ -362,5 +364,5 @@@@ if (cdi.state & CDROM_STATE_PAUSE) { - start_addr.second += pauseSkipInterval; + start_addr.second += app_data.pauseSkipInterval; } else if (cdi.state & CDROM_STATE_PLAY) { - start_addr.second += scanSkipInterval; + start_addr.second += app_data.scanSkipInterval; } @@@@ -415,3 +417,3 @@@@ scanivid = XtAppAddTimeOut(appc, - (int)(pausePauseInterval * 1000.0), + (int)(app_data.pausePauseInterval * 1000.0), scan_update, NULL); @@@@ -559,3 +561,3 @@@@ ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), scan_update, NULL); @@@@ -576,3 +578,3 @@@@ ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), scan_update, NULL); @@@@ -664,3 +666,3 @@@@ ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), update_track, NULL); @@@@ -681,3 +683,3 @@@@ ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), update_track, NULL); @