[Pkg-wmaker-commits] [wmrack] 10/97: ran through indent (for big diffs), then did major rewrite of main loop
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sat Aug 22 02:41:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmrack.
commit 7125354c52becbb502125ed4947475fdd3d6dfbd
Author: Chris Waters <xtifr.w at gmail.com>
Date: Thu Mar 8 16:53:05 2012 -0800
ran through indent (for big diffs), then did major rewrite of main loop
---
wmrack.c | 2097 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 1096 insertions(+), 1001 deletions(-)
diff --git a/wmrack.c b/wmrack.c
index 9f155bb..4f8a1bb 100644
--- a/wmrack.c
+++ b/wmrack.c
@@ -1,5 +1,5 @@
/*
- * $Id: wmrack.c,v 1.2 2001/02/14 10:27:48 xtifr Exp $
+ * $Id: wmrack.c,v 1.2.2.1 2001/06/17 04:19:18 xtifr Exp $
*
* WMRack - WindowMaker Sound Control Panel
*
@@ -31,98 +31,101 @@
#include <X11/extensions/shape.h>
#include "xpmicon.h"
+#include "xpmsize.h"
#include "cdrom.h"
#include "mixer.h"
#include "library.h"
/* Functions *****************************************************************/
-void usage();
-void parseCmdLine(int argc, char *argv[]);
-void initHandler();
-void createWindow(int, char **);
-void shutDown(int);
-void mainLoop();
-int flushExpose(Window w);
-void redrawWindow();
-void redrawDisplay(int force_win, int force_disp);
-Pixel getColor(char *name);
-Time getTime();
-int loadMixerRC();
-int saveMixerRC();
-void rack_popup(char *msg);
+void usage ();
+void parseCmdLine (int argc, char *argv[]);
+void initHandler ();
+void createWindow (int, char **);
+void shutDown (int);
+void mainLoop ();
+int flushExpose (Window w);
+void redrawWindow ();
+void redrawDisplay (int force_win, int force_disp);
+Pixel getColor (char *name);
+Time getTime ();
+int loadMixerRC ();
+int saveMixerRC ();
+void rack_popup (char *msg);
/* Global stuff **************************************************************/
Display *Disp;
Window Root;
Window Iconwin;
Window Win;
-char *Geometry=0;
+char *Geometry = 0;
GC WinGC;
/* varibles for the options */
-char *StyleXpmFile=NULL;
-char *LedColor=NULL;
-char *BackColor=NULL;
-char CdDevice[1024]="/dev/cdrom";
-char MixerDevice[1024]="/dev/mixer";
-int withdraw=0;
-int noprobe=0;
-
-MSF last_time={-1,-1,-1};
-int last_track=-1;
-int last_cdmode=-1; /* to sense a change */
-int displaymode=0; /* bit 1 is run/remain, bit 2 is track/total */
-int newdisc=0;
-int curMixer=0; /* this is the device number of the currently shown mixer scale */
-int lastMixer=0;
-char *popup_display=NULL;
-time_t popup_time=0;
-int popup_done=0;
+char *StyleXpmFile = NULL;
+char *LedColor = NULL;
+char *BackColor = NULL;
+char CdDevice[1024] = "/dev/cdrom";
+char MixerDevice[1024] = "/dev/mixer";
+int withdraw = 0;
+int noprobe = 0;
+
+MSF last_time = { -1, -1, -1 };
+int last_track = -1;
+int last_cdmode = -1; /* to sense a change */
+int displaymode = 0; /* bit 1 is run/remain, bit 2 is track/total */
+int newdisc = 0;
+int curMixer = 0; /* this is the device number of the currently shown mixer scale */
+int lastMixer = 0;
+char *popup_display = NULL;
+time_t popup_time = 0;
+int popup_done = 0;
/* Mode of WMRack */
#define MODE_CDPLAYER 0
#define MODE_MIXER 1
-int WMRack_Mode=MODE_CDPLAYER;
+int WMRack_Mode = MODE_CDPLAYER;
/* our cd device */
-CD *cd=NULL;
-CDPlayList *playlist=NULL;
-int start_track=0;
+CD *cd = NULL;
+CDPlayList *playlist = NULL;
+int start_track = 0;
/* and the mixer */
-MIXER *mixer=NULL;
-int mixer_order[32], mixer_max=0;
-LIBRARY *mixer_lib=NULL;
+MIXER *mixer = NULL;
+int mixer_order[32], mixer_max = 0;
+LIBRARY *mixer_lib = NULL;
/*
* start the whole stuff and enter the MainLoop
*/
-int main(int argc,char *argv[])
+int
+main (int argc, char *argv[])
{
- struct timeval tm;
- parseCmdLine(argc, argv);
- cd=cd_open(CdDevice,noprobe);
- if (cd_getStatus(cd,0,1)>0)
+ struct timeval tm;
+
+ parseCmdLine (argc, argv);
+ cd = cd_open (CdDevice, noprobe);
+ if (cd_getStatus (cd, 0, 1) > 0)
{
- if (cd_list(cd,tracks)==0)
+ if (cd_list (cd, tracks) == 0)
{
- rack_popup("DATA");
- cd_suspend(cd);
+ rack_popup ("DATA");
+ cd_suspend (cd);
}
- else
- newdisc=1;
+ else
+ newdisc = 1;
}
- mixer=mixer_open(MixerDevice);
- loadMixerRC();
+ mixer = mixer_open (MixerDevice);
+ loadMixerRC ();
#ifdef DEBUG
- fprintf(stderr,"wmrack: Mixer RC loaded\n");
+ fprintf (stderr, "wmrack: Mixer RC loaded\n");
#endif
- initHandler();
- gettimeofday(&tm,NULL);
- srandom(tm.tv_usec^tm.tv_sec);
- createWindow(argc, argv);
- mainLoop();
- return 0;
+ initHandler ();
+ gettimeofday (&tm, NULL);
+ srandom (tm.tv_usec ^ tm.tv_sec);
+ createWindow (argc, argv);
+ mainLoop ();
+ return 0;
}
/*
@@ -130,23 +133,32 @@ int main(int argc,char *argv[])
*
* print out usage text and exit
*/
-void usage()
+void
+usage ()
{
- fprintf(stderr,"wmrack - Version " WMR_VERSION "\n");
- fprintf(stderr,"usage: wmrack [OPTIONS] \n");
- fprintf(stderr,"\n");
- fprintf(stderr,"OPTION DEFAULT DESCRIPTION\n");
- fprintf(stderr,"-b|--background COLSPEC black color of the led background\n");
- fprintf(stderr,"-d|--device DEV /dev/cdrom device of the Drive\n");
- fprintf(stderr,"-h|--help none display help\n");
- fprintf(stderr,"-l|--ledcolor COLSPEC green set the color of the led\n");
- fprintf(stderr,"-m|--mixer DEV /dev/mixer device of the Mixer\n");
- fprintf(stderr,"-p|--noprobe off disable the startup probe\n");
- fprintf(stderr,"-s|--style STYLEFILE compile-time load an alternate set of xpm\n");
- fprintf(stderr,"-w|--withdrawn off start withdrawn or not\n");
- fprintf(stderr,"-M|--mode [cd|mixer] cd start in which mode\n");
- fprintf(stderr,"\n");
- exit(1);
+ fprintf (stderr, "wmrack - Version " WMR_VERSION "\n");
+ fprintf (stderr, "usage: wmrack [OPTIONS] \n");
+ fprintf (stderr, "\n");
+ fprintf (stderr, "OPTION DEFAULT DESCRIPTION\n");
+ fprintf (stderr,
+ "-b|--background COLSPEC black color of the led background\n");
+ fprintf (stderr,
+ "-d|--device DEV /dev/cdrom device of the Drive\n");
+ fprintf (stderr, "-h|--help none display help\n");
+ fprintf (stderr,
+ "-l|--ledcolor COLSPEC green set the color of the led\n");
+ fprintf (stderr,
+ "-m|--mixer DEV /dev/mixer device of the Mixer\n");
+ fprintf (stderr,
+ "-p|--noprobe off disable the startup probe\n");
+ fprintf (stderr,
+ "-s|--style STYLEFILE compile-time load an alternate set of xpm\n");
+ fprintf (stderr,
+ "-w|--withdrawn off start withdrawn or not\n");
+ fprintf (stderr,
+ "-M|--mode [cd|mixer] cd start in which mode\n");
+ fprintf (stderr, "\n");
+ exit (1);
}
/*
@@ -154,98 +166,103 @@ void usage()
*
* parse the command line args
*/
-void parseCmdLine(int argc, char *argv[])
+void
+parseCmdLine (int argc, char *argv[])
{
- int i, j;
- char opt;
- struct {char *name, option;} Options[]={{"background",'b'},
- {"device",'d'},
- {"withdrawn",'w'},
- {"help",'h'},
- {"ledcolor",'l'},
- {"mixer",'m'},
- {"style",'s'},
- {"noprobe",'p'},
- {"mode",'M'},
- {NULL,0}};
-
- for(i=1; i<argc; i++)
+ int i, j;
+ char opt;
+ struct
+ {
+ char *name;
+ char option;
+ } Options[] = { { "background", 'b'},
+ { "device", 'd'},
+ { "withdrawn", 'w'},
+ { "help", 'h'},
+ { "ledcolor", 'l'},
+ { "mixer", 'm'},
+ { "style", 's'},
+ { "noprobe", 'p'},
+ { "mode", 'M'},
+ { NULL, 0} };
+
+ for (i = 1; i < argc; i++)
{
- if (argv[i][0]=='-')
+ if (argv[i][0] == '-')
{
- if (argv[i][1]=='-')
+ if (argv[i][1] == '-')
{
- for (j=0; Options[j].name!=NULL; j++)
- if (strcmp(Options[j].name,argv[i]+2)==0)
- {
- opt=Options[j].option;
- break;
- }
- if (Options[j].name==NULL)
- usage();
+ for (j = 0; Options[j].name != NULL; j++)
+ if (strcmp (Options[j].name, argv[i] + 2) == 0)
+ {
+ opt = Options[j].option;
+ break;
+ }
+ if (Options[j].name == NULL)
+ usage ();
}
- else
+ else
{
- if (argv[i][2]!=0)
- usage();
- opt=argv[i][1];
+ if (argv[i][2] != 0)
+ usage ();
+ opt = argv[i][1];
}
- switch (opt)
+ switch (opt)
{
- case 'b': /* Led Color */
- if (++i>=argc)
- usage();
- BackColor=strdup(argv[i]);
- continue;
- case 'd': /* Device */
- if (++i>=argc)
- usage();
- strcpy(CdDevice,argv[i]);
- continue;
- case 'w': /* start Withdrawn */
- withdraw=1;
- continue;
- case 'h': /* usage */
- usage();
- break;
- case 'l': /* Led Color */
- if (++i>=argc)
- usage();
- LedColor=strdup(argv[i]);
- continue;
- case 'm': /* Device */
- if (++i>=argc)
- usage();
- strcpy(MixerDevice,argv[i]);
- continue;
+ case 'b': /* Led Color */
+ if (++i >= argc)
+ usage ();
+ BackColor = strdup (argv[i]);
+ continue;
+ case 'd': /* Device */
+ if (++i >= argc)
+ usage ();
+ strcpy (CdDevice, argv[i]);
+ continue;
+ case 'w': /* start Withdrawn */
+ withdraw = 1;
+ continue;
+ case 'h': /* usage */
+ usage ();
+ break;
+ case 'l': /* Led Color */
+ if (++i >= argc)
+ usage ();
+ LedColor = strdup (argv[i]);
+ continue;
+ case 'm': /* Device */
+ if (++i >= argc)
+ usage ();
+ strcpy (MixerDevice, argv[i]);
+ continue;
case 's':
- if (++i>=argc)
- usage();
- StyleXpmFile=strdup(argv[i]);
- continue;
+ if (++i >= argc)
+ usage ();
+ StyleXpmFile = strdup (argv[i]);
+ continue;
case 'p':
- noprobe=1;
- continue;
+ noprobe = 1;
+ continue;
case 'M':
- if (++i>=argc)
- usage();
- if (strcmp(argv[i],"cd")==0)
+ if (++i >= argc)
+ usage ();
+ if (strcmp (argv[i], "cd") == 0)
{
- WMRack_Mode=MODE_CDPLAYER;
- curRack=RACK_NODISC;
+ WMRack_Mode = MODE_CDPLAYER;
+ curRack = RACK_NODISC;
}
- else if (strcmp(argv[i],"mixer")==0)
+ else if (strcmp (argv[i], "mixer") == 0)
{
- WMRack_Mode=MODE_MIXER;
- curRack=RACK_MIXER;
+ WMRack_Mode = MODE_MIXER;
+ curRack = RACK_MIXER;
}
- continue;
+ continue;
default:
- usage();
+ usage ();
}
}
- else
- usage();
+ else
+ usage ();
}
}
@@ -256,20 +273,22 @@ void parseCmdLine(int argc, char *argv[])
* inits the signal handlers
* note: this function is not currently recursive (shouldn't be an issue)
*/
-void initHandler()
+void
+initHandler ()
{
- static struct sigaction sa;
- sa.sa_handler=shutDown;
- sigfillset(&sa.sa_mask);
- sa.sa_flags=0;
- sigaction(SIGTERM,&sa,NULL);
- sigaction(SIGINT,&sa,NULL);
- sigaction(SIGHUP,&sa,NULL);
- sigaction(SIGQUIT,&sa,NULL);
- sigaction(SIGPIPE,&sa,NULL);
- sa.sa_handler=SIG_IGN;
- sigaction(SIGUSR1,&sa,NULL);
- sigaction(SIGUSR2,&sa,NULL);
+ static struct sigaction sa;
+
+ sa.sa_handler = shutDown;
+ sigfillset (&sa.sa_mask);
+ sa.sa_flags = 0;
+ sigaction (SIGTERM, &sa, NULL);
+ sigaction (SIGINT, &sa, NULL);
+ sigaction (SIGHUP, &sa, NULL);
+ sigaction (SIGQUIT, &sa, NULL);
+ sigaction (SIGPIPE, &sa, NULL);
+ sa.sa_handler = SIG_IGN;
+ sigaction (SIGUSR1, &sa, NULL);
+ sigaction (SIGUSR2, &sa, NULL);
}
/*
@@ -277,113 +296,118 @@ void initHandler()
*
* create the basic shaped window and set all the required stuff
*/
-void createWindow(int argc, char **argv)
+void
+createWindow (int argc, char **argv)
{
- int i;
- unsigned int borderwidth ;
- char *display_name=NULL;
- char *wname="wmrack";
- XGCValues gcv;
- unsigned long gcm;
- XTextProperty name;
- Pixel back_pix, fore_pix;
- int screen;
- int x_fd;
- int d_depth;
- int ScreenWidth, ScreenHeight;
- XSizeHints SizeHints;
- XWMHints WmHints;
- XClassHint classHint;
-
- /* Open display */
- if (!(Disp = XOpenDisplay(display_name)))
+ int i;
+ unsigned int borderwidth;
+ char *display_name = NULL;
+ char *wname = "wmrack";
+ XGCValues gcv;
+ unsigned long gcm;
+ XTextProperty name;
+ Pixel back_pix, fore_pix;
+ int screen;
+ int x_fd;
+ int d_depth;
+ int ScreenWidth, ScreenHeight;
+ XSizeHints SizeHints;
+ XWMHints WmHints;
+ XClassHint classHint;
+
+ /* Open display */
+ if (!(Disp = XOpenDisplay (display_name)))
{
- fprintf(stderr,"wmrack: can't open display %s\n", XDisplayName(display_name));
- exit (1);
+ fprintf (stderr, "wmrack: can't open display %s\n",
+ XDisplayName (display_name));
+ exit (1);
}
- screen=DefaultScreen(Disp);
- Root=RootWindow(Disp, screen);
- d_depth=DefaultDepth(Disp, screen);
- x_fd=XConnectionNumber(Disp);
- ScreenHeight=DisplayHeight(Disp,screen);
- ScreenWidth=DisplayWidth(Disp,screen);
+ screen = DefaultScreen (Disp);
+ Root = RootWindow (Disp, screen);
+ d_depth = DefaultDepth (Disp, screen);
+ x_fd = XConnectionNumber (Disp);
+ ScreenHeight = DisplayHeight (Disp, screen);
+ ScreenWidth = DisplayWidth (Disp, screen);
- xpm_setDefaultAttr(Disp,Root,LedColor,BackColor);
- if (StyleXpmFile)
+ xpm_setDefaultAttr (Disp, Root, LedColor, BackColor);
+ if (StyleXpmFile)
{
- if (xpm_loadSet(Disp,Root,StyleXpmFile))
+ if (xpm_loadSet (Disp, Root, StyleXpmFile))
{
- fprintf(stderr,"wmrack: can't load and create pixmaps\n");
- XCloseDisplay(Disp);
- exit(1);
+ fprintf (stderr, "wmrack: can't load and create pixmaps\n");
+ XCloseDisplay (Disp);
+ exit (1);
}
}
- else if (xpm_setDefaultSet(Disp,Root,RACK_MAX))
+ else if (xpm_setDefaultSet (Disp, Root, RACK_MAX))
{
- fprintf(stderr,"wmrack: can't create pixmaps\n");
- XCloseDisplay(Disp);
- exit(1);
+ fprintf (stderr, "wmrack: can't create pixmaps\n");
+ XCloseDisplay (Disp);
+ exit (1);
}
- SizeHints.flags=USSize|USPosition;
- SizeHints.x=0;
- SizeHints.y=0;
- back_pix=getColor("white");
- fore_pix=getColor("black");
-
- XWMGeometry(Disp, screen, Geometry, NULL, (borderwidth=1), &SizeHints,
- &SizeHints.x,&SizeHints.y,&SizeHints.width,
- &SizeHints.height, &i);
-
- SizeHints.width=currentXpm(attributes).width;
- SizeHints.height=currentXpm(attributes).height;
- Win=XCreateSimpleWindow(Disp,Root,SizeHints.x,SizeHints.y,
- SizeHints.width,SizeHints.height,
- borderwidth,fore_pix,back_pix);
- Iconwin=XCreateSimpleWindow(Disp,Win,SizeHints.x,SizeHints.y,
- SizeHints.width,SizeHints.height,
- borderwidth,fore_pix,back_pix);
- XSetWMNormalHints(Disp, Win, &SizeHints);
-
- classHint.res_name="wmrack";
- classHint.res_class="WMRack";
- XSetClassHint(Disp, Win, &classHint);
-
- XSelectInput(Disp, Win, (ExposureMask|ButtonPressMask|ButtonReleaseMask
- |StructureNotifyMask|ButtonMotionMask));
- XSelectInput(Disp, Iconwin, (ExposureMask|ButtonPressMask|ButtonReleaseMask
- |StructureNotifyMask|ButtonMotionMask));
-
- if (XStringListToTextProperty(&wname, 1, &name) ==0)
+ SizeHints.flags = USSize | USPosition;
+ SizeHints.x = 0;
+ SizeHints.y = 0;
+ back_pix = getColor ("white");
+ fore_pix = getColor ("black");
+
+ XWMGeometry (Disp, screen, Geometry, NULL, (borderwidth = 1), &SizeHints,
+ &SizeHints.x, &SizeHints.y, &SizeHints.width,
+ &SizeHints.height, &i);
+
+ SizeHints.width = currentXpm (attributes).width;
+ SizeHints.height = currentXpm (attributes).height;
+ Win = XCreateSimpleWindow (Disp, Root, SizeHints.x, SizeHints.y,
+ SizeHints.width, SizeHints.height,
+ borderwidth, fore_pix, back_pix);
+ Iconwin = XCreateSimpleWindow (Disp, Win, SizeHints.x, SizeHints.y,
+ SizeHints.width, SizeHints.height,
+ borderwidth, fore_pix, back_pix);
+ XSetWMNormalHints (Disp, Win, &SizeHints);
+
+ classHint.res_name = "wmrack";
+ classHint.res_class = "WMRack";
+ XSetClassHint (Disp, Win, &classHint);
+
+ XSelectInput (Disp, Win,
+ (ExposureMask | ButtonPressMask | ButtonReleaseMask |
+ StructureNotifyMask | ButtonMotionMask));
+ XSelectInput (Disp, Iconwin,
+ (ExposureMask | ButtonPressMask | ButtonReleaseMask |
+ StructureNotifyMask | ButtonMotionMask));
+
+ if (XStringListToTextProperty (&wname, 1, &name) == 0)
{
- fprintf(stderr, "wmrack: can't allocate window name\n");
- exit(-1);
+ fprintf (stderr, "wmrack: can't allocate window name\n");
+ exit (-1);
}
- XSetWMName(Disp, Win, &name);
-
- /* Create WinGC */
- gcm=GCForeground|GCBackground|GCGraphicsExposures;
- gcv.foreground=fore_pix;
- gcv.background=back_pix;
- gcv.graphics_exposures=False;
- WinGC=XCreateGC(Disp, Root, gcm, &gcv);
-
- XShapeCombineMask(Disp, Win, ShapeBounding, 0, 0,
- currentXpm(mask), ShapeSet);
- XShapeCombineMask(Disp, Iconwin, ShapeBounding, 0, 0,
- currentXpm(mask), ShapeSet);
-
- WmHints.initial_state=withdraw?WithdrawnState:NormalState;
- WmHints.icon_window=Iconwin;
- WmHints.window_group=Win;
- WmHints.icon_x=SizeHints.x;
- WmHints.icon_y=SizeHints.y;
- WmHints.flags=StateHint|IconWindowHint|IconPositionHint|WindowGroupHint;
- XSetCommand(Disp, Win, argv, argc);
- XSetWMHints(Disp, Win, &WmHints);
- XMapWindow(Disp,Win);
- redrawDisplay(1,1);
+ XSetWMName (Disp, Win, &name);
+
+ /* Create WinGC */
+ gcm = GCForeground | GCBackground | GCGraphicsExposures;
+ gcv.foreground = fore_pix;
+ gcv.background = back_pix;
+ gcv.graphics_exposures = False;
+ WinGC = XCreateGC (Disp, Root, gcm, &gcv);
+
+ XShapeCombineMask (Disp, Win, ShapeBounding, 0, 0,
+ currentXpm (mask), ShapeSet);
+ XShapeCombineMask (Disp, Iconwin, ShapeBounding, 0, 0,
+ currentXpm (mask), ShapeSet);
+
+ WmHints.initial_state = withdraw ? WithdrawnState : NormalState;
+ WmHints.icon_window = Iconwin;
+ WmHints.window_group = Win;
+ WmHints.icon_x = SizeHints.x;
+ WmHints.icon_y = SizeHints.y;
+ WmHints.flags =
+ StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
+ XSetCommand (Disp, Win, argv, argc);
+ XSetWMHints (Disp, Win, &WmHints);
+ XMapWindow (Disp, Win);
+ redrawDisplay (1, 1);
}
/*
@@ -391,26 +415,27 @@ void createWindow(int argc, char **argv)
*
* handler for signal and close-down function
*/
-void shutDown(int sig)
+void
+shutDown (int sig)
{
#ifdef DEBUG
- if (sig)
- fprintf(stderr,"wmrack: got signal %s\n",strsignal(sig));
- else
- fprintf(stderr,"wmrack: manual shutdown\n");
- fprintf(stderr,"wmrack: Shutting down\n");
+ if (sig)
+ fprintf (stderr, "wmrack: got signal %s\n", strsignal (sig));
+ else
+ fprintf (stderr, "wmrack: manual shutdown\n");
+ fprintf (stderr, "wmrack: Shutting down\n");
#endif
- saveMixerRC();
+ saveMixerRC ();
#ifdef DEBUG
- fprintf(stderr,"wmrack: mixer RC written\n");
+ fprintf (stderr, "wmrack: mixer RC written\n");
#endif
- cd_close(cd);
+ cd_close (cd);
#ifdef DEBUG
- fprintf(stderr,"wmrack: cd closed\n");
+ fprintf (stderr, "wmrack: cd closed\n");
#endif
- mixer_close(mixer);
+ mixer_close (mixer);
#ifdef DEBUG
- fprintf(stderr,"wmrack: mixer closed\n");
+ fprintf (stderr, "wmrack: mixer closed\n");
#endif
/* cause it's no good, this is commented out (CloseDisplay woes)
xpm_freeSet(Disp);
@@ -430,11 +455,11 @@ void shutDown(int sig)
fprintf(stderr,"wmrack: Iconwin destroyed\n");
# endif
*/
- XCloseDisplay(Disp);
+ XCloseDisplay (Disp);
#ifdef DEBUG
- fprintf(stderr,"wmrack: Display closed\n");
+ fprintf (stderr, "wmrack: Display closed\n");
#endif
- exit(0);
+ exit (0);
}
/*
@@ -442,451 +467,488 @@ void shutDown(int sig)
*
* the main event loop
*/
-void mainLoop()
+void
+mainLoop ()
{
- XEvent Event;
- Time when;
- Time press_time=-1;
- int skip_count, skip_amount, skip_delay;
- int force_win=0, force_disp=0;
- int change_volume=0, vol_y, vol_side;
-
- while(1)
+ XEvent Event;
+ Time when;
+ Time press_time = -1;
+ int skip_count, skip_amount, skip_delay;
+ int force_win = 0, force_disp = 0;
+ int change_volume = 0, vol_y, vol_side;
+
+ while (1)
{
- /* Check events */
- while (XPending(Disp))
+ /* Check events */
+ while (XPending (Disp))
{
- XNextEvent(Disp,&Event);
- switch (Event.type)
+ XNextEvent (Disp, &Event);
+ switch (Event.type)
{
case Expose:
- if (Event.xexpose.count==0)
- last_time.minute=last_time.second=last_time.frame=-1;
- force_win=1;
- break;
+ if (Event.xexpose.count == 0)
+ last_time.minute = last_time.second = last_time.frame =
+ -1;
+ force_win = 1;
+ break;
case ButtonPress:
- switch (WMRack_Mode)
+ switch (WMRack_Mode)
{
case MODE_CDPLAYER:
- newdisc=0;
- cd_getStatus(cd,0,0);
- if (Event.xbutton.y<15)
+ newdisc = 0;
+ cd_getStatus (cd, 0, 0);
+
+ if (IN_CD_TIME_WIDGET (Event))
{
- switch (Event.xbutton.button)
+ switch (Event.xbutton.button)
{
case 1:
- if (cd_cur(cd,mode)==CDM_PLAY)
- displaymode^=1;
- break;
+ if (cd_cur (cd, mode) == CDM_PLAY)
+ displaymode ^= 1;
+ break;
case 2:
- if (cd_cur(cd,mode)==CDM_PLAY)
- displaymode^=2;
- break;
+ if (cd_cur (cd, mode) == CDM_PLAY)
+ displaymode ^= 2;
+ break;
case 3:
- switch (cd_play(cd,repeat_mode))
+ switch (cd_play (cd, repeat_mode))
{
case CDR_NONE:
- cd_play(cd,repeat_mode)=CDR_ALL;
- break;
+ cd_play (cd, repeat_mode) = CDR_ALL;
+ break;
case CDR_ALL:
- cd_play(cd,repeat_mode)=CDR_ONE;
- break;
+ cd_play (cd, repeat_mode) = CDR_ONE;
+ break;
default:
- cd_play(cd,repeat_mode)=CDR_NONE;
- break;
+ cd_play (cd, repeat_mode) = CDR_NONE;
+ break;
}
- if (cd_play(cd,repeat_mode)==2 && cd_cur(cd,mode)==CDM_PLAY)
- start_track=cd_cur(cd,track);
- break;
+ if (cd_play (cd, repeat_mode) == 2
+ && cd_cur (cd, mode) == CDM_PLAY)
+ start_track = cd_cur (cd, track);
+ break;
}
- force_disp=1;
+ force_disp = 1;
}
- else if (Event.xbutton.y>15 && Event.xbutton.y<32)
+ else if (IN_CD_PLAY_BUTTON (Event))
{
- if (Event.xbutton.x<13)
+ if (cd_cur (cd, mode) == CDM_PLAY
+ || cd_cur (cd, mode) == CDM_PAUSE)
+ cd_doPause (cd);
+ else if (cd_cur (cd, mode) == CDM_EJECT)
{
- if (cd_cur(cd,mode)==CDM_PLAY || cd_cur(cd,mode)==CDM_PAUSE)
- cd_doPause(cd);
- else if (cd_cur(cd,mode)==CDM_EJECT)
+ if (cd_getStatus (cd, 1, 0))
{
- if (cd_getStatus(cd,1,0))
+ start_track = 0;
+ if (cd_list (cd, tracks) == 0)
{
- start_track=0;
- if (cd_list(cd,tracks)==0)
- {
- rack_popup("DATA");
- cd_suspend(cd);
- }
- else
- {
- newdisc=1;
- cd_doPlay(cd,start_track);
- }
+ rack_popup ("DATA");
+ cd_suspend (cd);
}
- }
- else
- {
- if (playlist!=NULL)
+ else
{
- cd_setpl(cd,playlist);
- cdpl_free(playlist);
- playlist=NULL;
- cd_doPlay(cd,0);
+ newdisc = 1;
+ cd_doPlay (cd, start_track);
}
- else
- cd_doPlay(cd,start_track);
}
}
- else if (Event.xbutton.x>34)
+ else
{
- if (cd_cur(cd,mode)==CDM_PLAY || cd_cur(cd,mode)==CDM_PAUSE)
+ if (playlist != NULL)
{
- cd_doStop(cd);
- start_track=cd_play(cd,cur_track);
+ cd_setpl (cd, playlist);
+ cdpl_free (playlist);
+ playlist = NULL;
+ cd_doPlay (cd, 0);
}
- else if (cd_cur(cd,mode)==CDM_EJECT)
- {
- if (Event.xbutton.button==3)
- cd_doEject(cd);
- else
- {
- if (cd_getStatus(cd,1,1))
- {
- start_track=0;
- if (cd_list(cd,tracks)==0)
- {
- rack_popup("DATA");
- cd_suspend(cd);
- }
- else
- newdisc=1;
- }
- }
- }
- else
- cd_doEject(cd);
- }
- else
- {
- if (Event.xbutton.button==3
- && (Event.xbutton.state&ControlMask))
- shutDown(0);
- WMRack_Mode=MODE_MIXER;
- force_win=1;
+ else
+ cd_doPlay (cd, start_track);
}
}
- else if (Event.xbutton.y>32)
+ else if (IN_CD_STOP_BUTTON (Event))
{
- if (Event.xbutton.x<13 || Event.xbutton.x>34)
+ if (cd_cur (cd, mode) == CDM_PLAY
+ || cd_cur (cd, mode) == CDM_PAUSE)
{
- press_time=Event.xbutton.time;
- skip_count=0;
- skip_delay=8;
- if (Event.xbutton.x<13)
- skip_amount=-1;
- else
- skip_amount=1;
+ cd_doStop (cd);
+ start_track = cd_play (cd, cur_track);
}
- else /* track display clicked */
+ else if (cd_cur (cd, mode) == CDM_EJECT)
{
- if (cd_cur(cd,mode)!=CDM_STOP) break;
- if (Event.xbutton.state&ControlMask)
+ if (Event.xbutton.button == 3)
+ cd_doEject (cd);
+ else
{
- switch (Event.xbutton.button)
+ if (cd_getStatus (cd, 1, 1))
{
- case 1:
- if (playlist!=NULL)
- {
- cdpl_free(playlist);
- playlist=NULL;
- force_disp=1;
- }
- else
+ start_track = 0;
+ if (cd_list (cd, tracks) == 0)
{
- playlist=cdpl_new();
- cd_resetpl(cd);
- rack_popup("PROG");
+ rack_popup ("DATA");
+ cd_suspend (cd);
}
- break;
- case 3:
- if (playlist!=NULL)
- cdpl_free(playlist);
- playlist=NULL;
- cd_randomize(cd);
- rack_popup("RAND");
- break;
+ else
+ newdisc = 1;
}
}
- else if (Event.xbutton.state&Mod1Mask
- && playlist!=NULL)
+ }
+ else
+ cd_doEject (cd);
+ }
+ else if (IN_CD_PREV_BUTTON(Event))
+ {
+ press_time = Event.xbutton.time;
+ skip_count = 0;
+ skip_delay = 8;
+ skip_amount = -1;
+ }
+ else if (IN_CD_NEXT_BUTTON(Event))
+ {
+ press_time = Event.xbutton.time;
+ skip_count = 0;
+ skip_delay = 8;
+ skip_amount = 1;
+ }
+ else if (IN_CD_TRACK_WIDGET(Event))
+ {
+ if (cd_cur (cd, mode) != CDM_STOP)
+ break;
+ if (Event.xbutton.state & ControlMask)
+ {
+ switch (Event.xbutton.button)
{
- char num[20];
- /* add current track to playlist */
- cdpl_add(playlist,cd,start_track);
- sprintf(num,"%02d%02d",
- playlist->tracks,
- playlist->track[playlist->tracks-1]);
- rack_popup(num);
+ case 1:
+ if (playlist != NULL)
+ {
+ cdpl_free (playlist);
+ playlist = NULL;
+ force_disp = 1;
+ }
+ else
+ {
+ playlist = cdpl_new ();
+ cd_resetpl (cd);
+ rack_popup ("PROG");
+ }
+ break;
+ case 3:
+ if (playlist != NULL)
+ cdpl_free (playlist);
+ playlist = NULL;
+ cd_randomize (cd);
+ rack_popup ("RAND");
+ break;
}
}
+ else if (Event.xbutton.state & Mod1Mask
+ && playlist != NULL)
+ {
+ char num[20];
+
+ /* add current track to playlist */
+ cdpl_add (playlist, cd, start_track);
+ sprintf (num, "%02d%02d", playlist->tracks,
+ playlist->track[playlist->tracks - 1]);
+ rack_popup (num);
+ }
}
- break;
+ else if (IN_RACK_SWITCH_BUTTON(Event))
+ {
+ if (Event.xbutton.button == 3
+ && (Event.xbutton.state & ControlMask))
+ shutDown (0);
+ WMRack_Mode = MODE_MIXER;
+ force_win = 1;
+ }
+#ifdef DEBUG
+ else
+ fprintf (stderr,"WMRack: click outside widgets\n");
+#endif
+ break;
+
case MODE_MIXER:
- if (Event.xbutton.y<15
- && Event.xbutton.x>13 && Event.xbutton.x<34)
+ if (IN_MX_SLIDER(Event))
+ {
+ int change;
+
+ /* change volume */
+ change_volume = Event.xbutton.button;
+ vol_y = Event.xbutton.y_root;
+ vol_side = IN_MX_LEFT_SLIDER (Event);
+ switch (change_volume)
+ {
+ case 1:
+ if (vol_side)
+ mixer_setvols (mixer, mixer_order[curMixer],
+ CLICK_VOLUME (Event),
+ mixer_volright (mixer,
+ mixer_order
+ [curMixer]));
+ else
+ mixer_setvols (mixer, mixer_order[curMixer],
+ mixer_volleft (mixer,
+ mixer_order
+ [curMixer]),
+ CLICK_VOLUME (Event));
+ break;
+ case 2:
+ mixer_setvol (mixer, mixer_order[curMixer],
+ CLICK_VOLUME (Event));
+ break;
+ case 3:
+ change = (CLICK_VOLUME (Event) -
+ (vol_side
+ ? mixer_volleft (mixer,
+ mixer_order[curMixer])
+ : mixer_volright (mixer,
+ mixer_order
+ [curMixer])));
+ if (vol_side)
+ mixer_changebal (mixer, mixer_order[curMixer],
+ -change);
+ else
+ mixer_changebal (mixer, mixer_order[curMixer],
+ change);
+ break;
+ }
+ }
+ else if (IN_MX_CHAN_WIDGET (Event))
{
- if (Event.xbutton.state&ControlMask)
+ if (Event.xbutton.state & ControlMask)
{
- int i, j, c;
- switch (Event.xbutton.button)
+ int i, j, c;
+
+ switch (Event.xbutton.button)
{
- case 1: /* show all mixer devices */
- c=mixer_order[curMixer];
- for (j=i=0; i<mixer_devices; i++)
- if (mixer_isdevice(mixer,i))
- {
- if (i==c)
- curMixer=j;
- mixer_order[j++]=i;
- }
- mixer_max=j;
- force_disp=1;
- break;
- case 3: /* delete this device */
- if (mixer_max>1)
+ case 1: /* show all mixer devices */
+ c = mixer_order[curMixer];
+ for (j = i = 0; i < mixer_devices; i++)
+ if (mixer_isdevice (mixer, i))
+ {
+ if (i == c)
+ curMixer = j;
+ mixer_order[j++] = i;
+ }
+ mixer_max = j;
+ force_disp = 1;
+ break;
+ case 3: /* delete this device */
+ if (mixer_max > 1)
{
- if (curMixer==mixer_max-1)
- curMixer--;
- else
- memmove(&mixer_order[curMixer],
- &mixer_order[curMixer+1],
- sizeof(int)*(mixer_max-curMixer));
- mixer_max--;
- force_disp=1;
+ if (curMixer == mixer_max - 1)
+ curMixer--;
+ else
+ memmove (&mixer_order[curMixer],
+ &mixer_order[curMixer + 1],
+ sizeof (int) *
+ (mixer_max - curMixer));
+ mixer_max--;
+ force_disp = 1;
}
- break;
+ break;
}
}
- else
+ else
{
- switch (Event.xbutton.button)
+ switch (Event.xbutton.button)
{
case 1:
- curMixer++;
- mixup:
- while (!mixer_isdevice(mixer,mixer_order[curMixer])
- && curMixer<mixer_max)
- curMixer++;
- if (curMixer==mixer_max)
- {
- curMixer=0;
- goto mixup;
- }
- break;
+ do {
+ curMixer++;
+ if (curMixer == mixer_max)
+ curMixer = 0;
+ } while (!mixer_isdevice (mixer,
+ mixer_order
+ [curMixer]));
+ break;
case 2:
- curMixer=0;
- break;
+ curMixer = 0;
+ break;
case 3:
- curMixer--;
- mixdown:
- while (!mixer_isdevice(mixer,mixer_order[curMixer])
- && curMixer>=0)
- curMixer--;
- if (curMixer<0)
- {
- curMixer=mixer_max-1;
- goto mixdown;
- }
- break;
+ do {
+ if (curMixer == 0)
+ curMixer = mixer_max;
+ curMixer--;
+ } while (!mixer_isdevice (mixer,
+ mixer_order
+ [curMixer]));
+ break;
}
}
}
- else if (Event.xbutton.y>15 && Event.xbutton.y<32
- && Event.xbutton.x>13 && Event.xbutton.x<34)
- {
- if (Event.xbutton.button==3
- && (Event.xbutton.state&ControlMask))
- shutDown(0);
- WMRack_Mode=MODE_CDPLAYER;
- force_win=1;
- }
- else if (mixer_isrecdev(mixer,mixer_order[curMixer])
- && Event.xbutton.y>32
- && Event.xbutton.x>13 && Event.xbutton.x<34)
+ else if (IN_MX_MUTE_BUTTON (Event))
{
- switch (Event.xbutton.button)
+ if (!mixer_isrecdev (mixer, mixer_order[curMixer]))
+ break;
+ switch (Event.xbutton.button)
{
case 1:
- mixer_setrecsrc(mixer,mixer_order[curMixer],
- mixer_isrecsrc(mixer,mixer_order[curMixer])
- ? 0
- : 1,0);
- break;
+ mixer_setrecsrc (mixer, mixer_order[curMixer],
+ mixer_isrecsrc (mixer,
+ mixer_order
+ [curMixer])
+ ? 0 : 1, 0);
+ break;
case 2:
- mixer_setrecsrc(mixer,mixer_order[curMixer],1,1);
- break;
+ mixer_setrecsrc (mixer, mixer_order[curMixer],
+ 1, 1);
+ break;
}
}
- else if (Event.xbutton.x<11 || Event.xbutton.x>36)
+ else if (IN_RACK_SWITCH_BUTTON (Event))
{
- int change;
- /* change volume */
- change_volume=Event.xbutton.button;
- vol_y=Event.xbutton.y_root;
- vol_side=Event.xbutton.x<24;
- switch (change_volume)
- {
- case 1:
- if (vol_side)
- mixer_setvols(mixer,mixer_order[curMixer],
- ((47-Event.xbutton.y)/4)*10,
- mixer_volright(mixer,mixer_order[curMixer]));
- else
- mixer_setvols(mixer,mixer_order[curMixer],
- mixer_volleft(mixer,mixer_order[curMixer]),
- ((47-Event.xbutton.y)/4)*10);
- break;
- case 2:
- mixer_setvol(mixer,mixer_order[curMixer],
- ((47-Event.xbutton.y)/4)*10);
- break;
- case 3:
- change=(((47-Event.xbutton.y)/4)*10-
- (vol_side
- ? mixer_volleft(mixer,mixer_order[curMixer])
- : mixer_volright(mixer,mixer_order[curMixer])));
- if (vol_side)
- mixer_changebal(mixer,mixer_order[curMixer],-change);
- else
- mixer_changebal(mixer,mixer_order[curMixer],change);
- break;
- }
+ if (Event.xbutton.button == 3
+ && (Event.xbutton.state & ControlMask))
+ shutDown (0);
+ WMRack_Mode = MODE_CDPLAYER;
+ force_win = 1;
}
- break;
+#ifdef DEBUG
+ else
+ fprintf (stderr,"WMRack: click outside widgets\n");
+#endif
+ break;
}
- break;
+ break;
+
case MotionNotify:
- switch (WMRack_Mode)
+ switch (WMRack_Mode)
{
case MODE_MIXER:
- if (change_volume)
+ if (change_volume)
{
- if ((Event.xmotion.y_root-vol_y)/8)
+ if ((Event.xmotion.y_root - vol_y) / 8)
{
- int change=((vol_y-Event.xmotion.y_root)/8)*10;
- switch (change_volume)
+ int change =
+ ((vol_y - Event.xmotion.y_root) / 8) * 10;
+ switch (change_volume)
{
case 1:
- if (vol_side)
- mixer_changeleft(mixer,mixer_order[curMixer],change);
- else
- mixer_changeright(mixer,mixer_order[curMixer],change);
- break;
+ if (vol_side)
+ mixer_changeleft (mixer,
+ mixer_order[curMixer],
+ change);
+ else
+ mixer_changeright (mixer,
+ mixer_order[curMixer],
+ change);
+ break;
case 2:
- mixer_changevol(mixer,mixer_order[curMixer],change);
- break;
+ mixer_changevol (mixer,
+ mixer_order[curMixer],
+ change);
+ break;
case 3:
- if (vol_side)
- mixer_changebal(mixer,mixer_order[curMixer],-change);
- else
- mixer_changebal(mixer,mixer_order[curMixer],change);
+ if (vol_side)
+ mixer_changebal (mixer,
+ mixer_order[curMixer],
+ -change);
+ else
+ mixer_changebal (mixer,
+ mixer_order[curMixer],
+ change);
}
- vol_y=Event.xmotion.y_root;
+ vol_y = Event.xmotion.y_root;
}
}
}
- break;
+ break;
+
case ButtonRelease:
- switch (WMRack_Mode)
+ switch (WMRack_Mode)
{
case MODE_CDPLAYER:
- if (press_time==-1) break;
- if (Event.xbutton.time-press_time<200 && Event.xbutton.y>32)
+ if (press_time == -1)
+ break;
+
+ if (IN_CD_PREV_BUTTON (Event)
+ && Event.xbutton.time - press_time < 200)
{
- if (cd_cur(cd,mode)==CDM_PLAY || cd_cur(cd,mode)==CDM_PAUSE)
+ if (cd_cur (cd, mode) == CDM_PLAY
+ || cd_cur (cd, mode) == CDM_PAUSE)
{
- if (Event.xbutton.x<13)
- {
- if (cd_cur(cd,relmsf.minute) ||
- cd_cur(cd,relmsf.second>2))
- cd_doPlay(cd,cd_cur(cd,track));
- else
- cd_doPlay(cd,cd_cur(cd,track)-1);
- }
- else if (Event.xbutton.x>34
- && cd_cur(cd,track)<cd_list(cd,tracks)-1)
- cd_doPlay(cd,cd_cur(cd,track)+1);
+ if (cd_cur (cd, relmsf.minute)
+ || cd_cur (cd, relmsf.second) > 2)
+ cd_doPlay (cd, cd_cur (cd, track));
+ else
+ cd_doPlay (cd, cd_cur (cd, track) - 1);
}
- else if (cd_cur(cd,mode)==CDM_STOP)
+ else if (cd_cur (cd, mode) == CDM_STOP)
{
- if (Event.xbutton.x<13)
- {
- if (start_track>0)
+ if (start_track > 0)
start_track--;
- else
- start_track=cd_list(cd,tracks)-1;
- }
- else if (Event.xbutton.x>34)
- {
- if (start_track<cd_list(cd,tracks)-1)
+ else
+ start_track = cd_list (cd, tracks) - 1;
+ }
+ }
+ else if (IN_CD_NEXT_BUTTON (Event)
+ && Event.xbutton.time - press_time < 200)
+ {
+ if (cd_cur (cd, mode) == CDM_PLAY
+ || cd_cur (cd, mode) == CDM_PAUSE)
+ {
+ if (cd_cur (cd, track) < cd_list (cd, tracks) - 1)
+ cd_doPlay (cd, cd_cur (cd, track) + 1);
+
+ }
+ else if (cd_cur (cd, mode) == CDM_STOP)
+ {
+ if (start_track < cd_list (cd, tracks) - 1)
start_track++;
- else
- start_track=0;
- }
+ else
+ start_track = 0;
}
- else
- ;
}
- break;
+ break;
case MODE_MIXER:
- if (change_volume)
+ if (change_volume)
{
- change_volume=0;
+ change_volume = 0;
}
- break;
+ break;
}
- press_time=-1;
- change_volume=0;
- break;
+ press_time = -1;
+ change_volume = 0;
+ break;
case DestroyNotify:
- shutDown(SIGTERM);
- break;
+ shutDown (SIGTERM);
+ break;
}
- XFlush(Disp);
+ XFlush (Disp);
}
- /* now check for a pressed button */
- if (press_time!=-1)
+ /* now check for a pressed button */
+ if (press_time != -1)
{
- if (cd_cur(cd,mode)==CDM_PLAY)
+ if (cd_cur (cd, mode) == CDM_PLAY)
{
- when=getTime();
- if (when-press_time>500)
+ when = getTime ();
+ if (when - press_time > 500)
{
- /* this is needed because of the faster pace */
- cd_getStatus(cd,0,1);
- skip_count++;
- if (skip_count%skip_delay==0)
+ /* this is needed because of the faster pace */
+ cd_getStatus (cd, 0, 1);
+ skip_count++;
+ if (skip_count % skip_delay == 0)
{
- if (Event.xbutton.x<17)
- cd_doSkip(cd,skip_amount);
- else if (Event.xbutton.x>34)
- cd_doSkip(cd,skip_amount);
+ if (IN_CD_PREV_BUTTON (Event))
+ cd_doSkip (cd, skip_amount);
+ else if (IN_CD_NEXT_BUTTON (Event))
+ cd_doSkip (cd, skip_amount);
}
- switch (skip_count)
+ switch (skip_count)
{
case 5:
case 10:
case 20:
- skip_delay>>=1;
- break;
+ skip_delay >>= 1;
+ break;
}
}
}
}
- /* do a redraw of the LED display */
- redrawDisplay(force_win,force_disp);
- usleep(5000L);
- force_win=force_disp=0;
+ /* do a redraw of the LED display */
+ redrawDisplay (force_win, force_disp);
+ usleep (5000L);
+ force_win = force_disp = 0;
}
}
@@ -895,13 +957,15 @@ void mainLoop()
*
* remove any Expose events from the current EventQueue
*/
-int flushExpose(Window w)
+int
+flushExpose (Window w)
{
- XEvent dummy;
- int i=0;
+ XEvent dummy;
+ int i = 0;
- while (XCheckTypedWindowEvent (Disp, w, Expose, &dummy)) i++;
- return i;
+ while (XCheckTypedWindowEvent (Disp, w, Expose, &dummy))
+ i++;
+ return i;
}
/*
@@ -909,20 +973,23 @@ int flushExpose(Window w)
*
* combine mask and draw pixmap
*/
-void redrawWindow()
+void
+redrawWindow ()
{
- flushExpose(Win);
- flushExpose(Iconwin);
-
- XShapeCombineMask(Disp, Win, ShapeBounding, 0, 0,
- currentXpm(mask), ShapeSet);
- XShapeCombineMask(Disp, Iconwin, ShapeBounding, 0, 0,
- currentXpm(mask), ShapeSet);
-
- XCopyArea(Disp,currentXpm(pixmap),Win,WinGC,
- 0,0,currentXpm(attributes).width, currentXpm(attributes).height,0,0);
- XCopyArea(Disp,currentXpm(pixmap),Iconwin,WinGC,
- 0,0,currentXpm(attributes).width, currentXpm(attributes).height,0,0);
+ flushExpose (Win);
+ flushExpose (Iconwin);
+
+ XShapeCombineMask (Disp, Win, ShapeBounding, 0, 0,
+ currentXpm (mask), ShapeSet);
+ XShapeCombineMask (Disp, Iconwin, ShapeBounding, 0, 0,
+ currentXpm (mask), ShapeSet);
+
+ XCopyArea (Disp, currentXpm (pixmap), Win, WinGC,
+ 0, 0, currentXpm (attributes).width,
+ currentXpm (attributes).height, 0, 0);
+ XCopyArea (Disp, currentXpm (pixmap), Iconwin, WinGC, 0, 0,
+ currentXpm (attributes).width, currentXpm (attributes).height,
+ 0, 0);
}
/*
@@ -930,148 +997,153 @@ void redrawWindow()
*
* draws the digital numbers to the pixmaps
*/
-void paint_cd_led(int flash, int track[], int cdtime[])
+void
+paint_cd_led (int flash, int track[], int cdtime[])
{
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- (track[0]?8*track[0]:80),0, 8,11, 16,35);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- (track[0]?8*track[0]:80),0, 8,11, 16,35);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 8*track[1],0, 8,11, 24,35);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 8*track[1],0, 8,11, 24,35);
-
- if (flash || cd_cur(cd,mode)!=CDM_PAUSE)
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ (track[0] ? 8 * track[0] : 80), 0, 8, 11, 16, 35);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ (track[0] ? 8 * track[0] : 80), 0, 8, 11, 16, 35);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 8 * track[1], 0, 8, 11, 24, 35);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 8 * track[1], 0, 8, 11, 24, 35);
+
+ if (flash || cd_cur (cd, mode) != CDM_PAUSE)
{
- if (cd_cur(cd,mode)==CDM_PLAY || cd_cur(cd,mode)==CDM_PAUSE)
+ if (cd_cur (cd, mode) == CDM_PLAY || cd_cur (cd, mode) == CDM_PAUSE)
{
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- ((displaymode&2)?94:98),0, 4,5, 3,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- ((displaymode&2)?94:98),0, 4,5, 3,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- ((displaymode&1)?94:98),5, 4,1, 3,7);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- ((displaymode&1)?94:98),5, 4,1, 3,7);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ ((displaymode & 2) ? 94 : 98), 0, 4, 5, 3, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ ((displaymode & 2) ? 94 : 98), 0, 4, 5, 3, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ ((displaymode & 1) ? 94 : 98), 5, 4, 1, 3, 7);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ ((displaymode & 1) ? 94 : 98), 5, 4, 1, 3, 7);
}
- else
+ else
{
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 98,0, 4,6, 3,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 98,0, 4,6, 3,2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 98, 0, 4, 6, 3, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 98, 0, 4, 6, 3, 2);
}
-
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- ((playlist!=NULL)?94:98),6, 4,5, 3,8);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- ((playlist!=NULL)?94:98),6, 4,5, 3,8);
- if (popup_display==NULL)
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ ((playlist != NULL) ? 94 : 98), 6, 4, 5, 3, 8);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ ((playlist != NULL) ? 94 : 98), 6, 4, 5, 3, 8);
+
+ if (popup_display == NULL)
{
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- (cdtime[0]?8*cdtime[0]:80),0, 8,11, 7,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- (cdtime[0]?8*cdtime[0]:80),0, 8,11, 7,2);
-
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 8*cdtime[1],0, 8,11, 15,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 8*cdtime[1],0, 8,11, 15,2);
-
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 88,0, 3,11, 23,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 88,0, 3,11, 23,2);
-
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 8*cdtime[2],0, 8,11, 26,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 8*cdtime[2],0, 8,11, 26,2);
-
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 8*cdtime[3],0, 8,11, 34,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 8*cdtime[3],0, 8,11, 34,2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ (cdtime[0] ? 8 * cdtime[0] : 80), 0, 8, 11, 7, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ (cdtime[0] ? 8 * cdtime[0] : 80), 0, 8, 11, 7, 2);
+
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 8 * cdtime[1], 0, 8, 11, 15, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 8 * cdtime[1], 0, 8, 11, 15, 2);
+
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 88, 0, 3, 11, 23, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 88, 0, 3, 11, 23, 2);
+
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 8 * cdtime[2], 0, 8, 11, 26, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 8 * cdtime[2], 0, 8, 11, 26, 2);
+
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 8 * cdtime[3], 0, 8, 11, 34, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 8 * cdtime[3], 0, 8, 11, 34, 2);
}
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- (cd_play(cd,repeat_mode)!=CDR_NONE?102:106),0, 4,5, 42,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- (cd_play(cd,repeat_mode)!=CDR_NONE?102:106),0, 4,5, 42,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- (cd_play(cd,repeat_mode)==CDR_ONE?102:106),6, 4,5, 42,8);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- (cd_play(cd,repeat_mode)==CDR_ONE?102:106),6, 4,5, 42,8);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ (cd_play (cd, repeat_mode) != CDR_NONE ? 102 : 106), 0, 4,
+ 5, 42, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ (cd_play (cd, repeat_mode) != CDR_NONE ? 102 : 106), 0, 4,
+ 5, 42, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ (cd_play (cd, repeat_mode) == CDR_ONE ? 102 : 106), 6, 4,
+ 5, 42, 8);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ (cd_play (cd, repeat_mode) == CDR_ONE ? 102 : 106), 6, 4,
+ 5, 42, 8);
}
- else
+ else
{
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 98,0, 4,11, 3,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 98,0, 4,11, 3,2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 98, 0, 4, 11, 3, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 98, 0, 4, 11, 3, 2);
- if (popup_display==NULL)
+ if (popup_display == NULL)
{
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 80,0, 8,11, 7,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 80,0, 8,11, 7,2);
-
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 80,0, 8,11, 15,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 80,0, 8,11, 15,2);
-
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 91,0, 3,11, 23,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 91,0, 3,11, 23,2);
-
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 80,0, 8,11, 26,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 80,0, 8,11, 26,2);
-
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 80,0, 8,11, 34,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 80,0, 8,11, 34,2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 80, 0, 8, 11, 7, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 80, 0, 8, 11, 7, 2);
+
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 80, 0, 8, 11, 15, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 80, 0, 8, 11, 15, 2);
+
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 91, 0, 3, 11, 23, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 91, 0, 3, 11, 23, 2);
+
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 80, 0, 8, 11, 26, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 80, 0, 8, 11, 26, 2);
+
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 80, 0, 8, 11, 34, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 80, 0, 8, 11, 34, 2);
}
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Win, WinGC,
- 106,0, 4,11, 42,2);
- XCopyArea(Disp, ledXpm(RACK_LED_PLAYER,pixmap), Iconwin, WinGC,
- 106,0, 4,11, 42,2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Win, WinGC,
+ 106, 0, 4, 11, 42, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_PLAYER, pixmap), Iconwin, WinGC,
+ 106, 0, 4, 11, 42, 2);
}
- if (popup_display!=NULL)
+ if (popup_display != NULL)
{
- int disp_pos[4]={7,15,26,34};
- char *d;
- int i, j;
+ int disp_pos[4] = { 7, 15, 26, 34 };
+ char *d;
+ int i, j;
- /*
- if (!popup_done)
+#if 0
+ if (!popup_done)
{
- XFillRectangle(Disp, Win, WinGC, 7, 2, 35, 11);
- XFillRectangle(Disp, Iconwin, WinGC, 7, 2, 35, 11);
- popup_done=1;
+ XFillRectangle(Disp, Win, WinGC, 7, 2, 35, 11);
+ XFillRectangle(Disp, Iconwin, WinGC, 7, 2, 35, 11);
+ popup_done=1;
}
- */
+#endif
- for (j=0, d=popup_display; *d; d++, j++)
+ for (j = 0, d = popup_display; *d; d++, j++)
{
- for (i=0; ledAlphabet[i]; i++)
- if (toupper(*d)==ledAlphabet[i])
- {
- XCopyArea(Disp, ledXpm(RACK_LED_ALPHA,pixmap), Win, WinGC,
- i*8,0, 8,11, disp_pos[j],2);
- XCopyArea(Disp, ledXpm(RACK_LED_ALPHA,pixmap), Iconwin, WinGC,
- i*8,0, 8,11, disp_pos[j],2);
- break;
- }
+ for (i = 0; ledAlphabet[i]; i++)
+ if (toupper (*d) == ledAlphabet[i])
+ {
+ XCopyArea (Disp, ledXpm (RACK_LED_ALPHA, pixmap), Win,
+ WinGC, i * 8, 0, 8, 11, disp_pos[j], 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_ALPHA, pixmap), Iconwin,
+ WinGC, i * 8, 0, 8, 11, disp_pos[j], 2);
+ break;
+ }
}
}
@@ -1082,65 +1154,72 @@ void paint_cd_led(int flash, int track[], int cdtime[])
*
* draws the digital scales and signs to the pixmaps
*/
-void paint_mixer_led()
+void
+paint_mixer_led ()
{
- int i;
-
- /* the device name */
- for (i=0; ledAlphabet[i]; i++)
- if (toupper(mixer_shortnames[mixer_order[curMixer]][0])==ledAlphabet[i])
- {
- XCopyArea(Disp, ledXpm(RACK_LED_ALPHA,pixmap), Win, WinGC,
- i*8,0, 8,11, 16,2);
- XCopyArea(Disp, ledXpm(RACK_LED_ALPHA,pixmap), Iconwin, WinGC,
- i*8,0, 8,11, 16,2);
- break;
- }
- for (i=0; ledAlphabet[i]; i++)
- if (toupper(mixer_shortnames[mixer_order[curMixer]][1])==ledAlphabet[i])
- {
- XCopyArea(Disp, ledXpm(RACK_LED_ALPHA,pixmap), Win, WinGC,
- i*8,0, 8,11, 24,2);
- XCopyArea(Disp, ledXpm(RACK_LED_ALPHA,pixmap), Iconwin, WinGC,
- i*8,0, 8,11, 24,2);
- break;
- }
+ int i;
+
+ /* the device name */
+ for (i = 0; ledAlphabet[i]; i++)
+ if (toupper (mixer_shortnames[mixer_order[curMixer]][0]) ==
+ ledAlphabet[i])
+ {
+ XCopyArea (Disp, ledXpm (RACK_LED_ALPHA, pixmap), Win, WinGC,
+ i * 8, 0, 8, 11, 16, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_ALPHA, pixmap), Iconwin, WinGC,
+ i * 8, 0, 8, 11, 16, 2);
+ break;
+ }
+ for (i = 0; ledAlphabet[i]; i++)
+ if (toupper (mixer_shortnames[mixer_order[curMixer]][1]) ==
+ ledAlphabet[i])
+ {
+ XCopyArea (Disp, ledXpm (RACK_LED_ALPHA, pixmap), Win, WinGC,
+ i * 8, 0, 8, 11, 24, 2);
+ XCopyArea (Disp, ledXpm (RACK_LED_ALPHA, pixmap), Iconwin, WinGC,
+ i * 8, 0, 8, 11, 24, 2);
+ break;
+ }
- /* the recsrc button */
- if (mixer_isrecdev(mixer,mixer_order[curMixer]))
+ /* the recsrc button */
+ if (mixer_isrecdev (mixer, mixer_order[curMixer]))
{
- if (mixer_isrecsrc(mixer,mixer_order[curMixer]))
- i=13;
- else
- i=0;
+ if (mixer_isrecsrc (mixer, mixer_order[curMixer]))
+ i = 13;
+ else
+ i = 0;
}
- else
- i=26;
- XCopyArea(Disp, ledXpm(RACK_LED_MIXER,pixmap), Win, WinGC,
- 44,i, 14,13, 17,34);
- XCopyArea(Disp, ledXpm(RACK_LED_MIXER,pixmap), Iconwin, WinGC,
- 44,i, 14,13, 17,34);
-
- /* the volume displays */
- /* left */
- i=(mixer_volleft(mixer,mixer_order[curMixer])/10);
- if (i<0) i=0;
- if (i>10) i=10;
- i*=4;
- XCopyArea(Disp, ledXpm(RACK_LED_MIXER,pixmap), Win, WinGC,
- i,0, 3,39, 4,4);
- XCopyArea(Disp, ledXpm(RACK_LED_MIXER,pixmap), Iconwin, WinGC,
- i,0, 3,39, 4,4);
- /* right */
- i=(mixer_volright(mixer,mixer_order[curMixer])/10);
- if (i<0) i=0;
- if (i>10) i=10;
- i*=4;
- XCopyArea(Disp, ledXpm(RACK_LED_MIXER,pixmap), Win, WinGC,
- i,0, 3,39, 41,4);
- XCopyArea(Disp, ledXpm(RACK_LED_MIXER,pixmap), Iconwin, WinGC,
- i,0, 3,39, 41,4);
-
+ else
+ i = 26;
+ XCopyArea (Disp, ledXpm (RACK_LED_MIXER, pixmap), Win, WinGC,
+ 44, i, 14, 13, 17, 34);
+ XCopyArea (Disp, ledXpm (RACK_LED_MIXER, pixmap), Iconwin, WinGC,
+ 44, i, 14, 13, 17, 34);
+
+ /* the volume displays */
+ /* left */
+ i = (mixer_volleft (mixer, mixer_order[curMixer]) / 10);
+ if (i < 0)
+ i = 0;
+ if (i > 10)
+ i = 10;
+ i *= 4;
+ XCopyArea (Disp, ledXpm (RACK_LED_MIXER, pixmap), Win, WinGC,
+ i, 0, 3, 39, 4, 4);
+ XCopyArea (Disp, ledXpm (RACK_LED_MIXER, pixmap), Iconwin, WinGC,
+ i, 0, 3, 39, 4, 4);
+ /* right */
+ i = (mixer_volright (mixer, mixer_order[curMixer]) / 10);
+ if (i < 0)
+ i = 0;
+ if (i > 10)
+ i = 10;
+ i *= 4;
+ XCopyArea (Disp, ledXpm (RACK_LED_MIXER, pixmap), Win, WinGC,
+ i, 0, 3, 39, 41, 4);
+ XCopyArea (Disp, ledXpm (RACK_LED_MIXER, pixmap), Iconwin, WinGC,
+ i, 0, 3, 39, 41, 4);
+
}
/*
@@ -1149,190 +1228,196 @@ void paint_mixer_led()
* redraw wants a complete redraw (covering, movement, etc.)
* but the display of the time/track does not need this overhead (SHAPE)
*/
-void redrawDisplay(int force_win, int force_disp)
+void
+redrawDisplay (int force_win, int force_disp)
{
- int track[2]={0,0};
- int cdtime[4]={0,0,0,0};
- static time_t last_flash_time;
- static flash=0;
- int st=0, newRack=RACK_NODISC, im_stop=0;
- MSF pos;
+ int track[2] = { 0, 0 };
+ int cdtime[4] = { 0, 0, 0, 0 };
+ static time_t last_flash_time;
+ static flash = 0;
+ int st = 0, newRack = RACK_NODISC, im_stop = 0;
+ MSF pos;
- st=cd_getStatus(cd,0,0);
+ st = cd_getStatus (cd, 0, 0);
- if (!force_win && !force_disp && popup_display==NULL)
+ if (!force_win && !force_disp && popup_display == NULL)
{
- /* test if something has changed */
- switch (WMRack_Mode)
+ /* test if something has changed */
+ switch (WMRack_Mode)
{
case MODE_CDPLAYER:
- if (cd_cur(cd,mode)!=CDM_PAUSE
- && last_cdmode==cd_cur(cd,mode)
- && (st<1 ||
- (last_time.minute==cd_cur(cd,relmsf.minute)
- && last_time.second==cd_cur(cd,relmsf.second)
- && last_track==start_track)))
- return;
- break;
+ if (cd_cur (cd, mode) != CDM_PAUSE
+ && last_cdmode == cd_cur (cd, mode)
+ && (st < 1
+ || (last_time.minute == cd_cur (cd, relmsf.minute)
+ && last_time.second == cd_cur (cd, relmsf.second)
+ && last_track == start_track)))
+ return;
+ break;
case MODE_MIXER:
- mixer_readvol(mixer,mixer_order[curMixer]);
- if (curMixer==lastMixer
- && !mixer_volchanged(mixer,mixer_order[curMixer])
- && !mixer_srcchanged(mixer,mixer_order[curMixer]))
- return;
- break;
+ mixer_readvol (mixer, mixer_order[curMixer]);
+ if (curMixer == lastMixer
+ && !mixer_volchanged (mixer, mixer_order[curMixer])
+ && !mixer_srcchanged (mixer, mixer_order[curMixer]))
+ return;
+ break;
}
}
-
+
#ifdef DEBUG
- if (last_cdmode!=cd_cur(cd,mode)) {
- fprintf(stderr,"wmrack: cur_cdmode %d\n",cd_cur(cd,mode));
- }
+ if (last_cdmode != cd_cur (cd, mode))
+ {
+ fprintf (stderr, "wmrack: cur_cdmode %d\n", cd_cur (cd, mode));
+ }
#endif
- if (cd_cur(cd,mode)==CDM_STOP && cd_play(cd,last_action)==CDA_PLAY)
- start_track=0;
+ if (cd_cur (cd, mode) == CDM_STOP
+ && cd_play (cd, last_action) == CDA_PLAY)
+ start_track = 0;
- lastMixer=curMixer;
+ lastMixer = curMixer;
- last_cdmode=cd_cur(cd,mode);
- if (st>0)
+ last_cdmode = cd_cur (cd, mode);
+ if (st > 0)
{
- last_time=cd_cur(cd,relmsf);
- last_track=start_track;
+ last_time = cd_cur (cd, relmsf);
+ last_track = start_track;
}
- else
+ else
{
- MSFnone(last_time);
- last_track=-1;
+ MSFnone (last_time);
+ last_track = -1;
}
-
- if (cd_cur(cd,mode)==CDM_PAUSE)
+
+ if (cd_cur (cd, mode) == CDM_PAUSE)
{
- time_t flash_time=time(NULL);
- if (flash_time==last_flash_time && !force_win)
- return;
- last_flash_time=flash_time;
- flash=!flash;
+ time_t flash_time = time (NULL);
+
+ if (flash_time == last_flash_time && !force_win)
+ return;
+ last_flash_time = flash_time;
+ flash = !flash;
}
- else
+ else
{
- last_flash_time=0;
- flash=1;
+ last_flash_time = 0;
+ flash = 1;
}
- if (popup_display!=NULL)
+ if (popup_display != NULL)
{
- if (popup_time==0)
- popup_time=time(NULL);
- else
+ if (popup_time == 0)
+ popup_time = time (NULL);
+ else
{
- time_t now=time(NULL);
- if (now>popup_time+1)
+ time_t now = time (NULL);
+
+ if (now > popup_time + 1)
{
- free(popup_display);
- popup_display=NULL;
- popup_time=0;
- popup_done=0;
+ free (popup_display);
+ popup_display = NULL;
+ popup_time = 0;
+ popup_done = 0;
}
}
}
-
- newRack=RACK_PLAY;
- if (WMRack_Mode==MODE_MIXER)
- newRack=RACK_MIXER;
- else
+ newRack = RACK_PLAY;
+
+ if (WMRack_Mode == MODE_MIXER)
+ newRack = RACK_MIXER;
+ else
{
- switch (cd_cur(cd,mode))
+ switch (cd_cur (cd, mode))
{
case CDM_PAUSE:
- newRack=RACK_PAUSE;
+ newRack = RACK_PAUSE;
case CDM_PLAY:
- track[0]=cd_list(cd,track)[cd_cur(cd,track)].num/10;
- track[1]=cd_list(cd,track)[cd_cur(cd,track)].num%10;
- switch (displaymode)
+ track[0] = cd_list (cd, track)[cd_cur (cd, track)].num / 10;
+ track[1] = cd_list (cd, track)[cd_cur (cd, track)].num % 10;
+ switch (displaymode)
{
case 0:
- pos=cd_cur(cd,relmsf);
- break;
+ pos = cd_cur (cd, relmsf);
+ break;
case 1:
- pos=subMSF(cd_list(cd,track)[cd_cur(cd,track)].length,
- cd_cur(cd,relmsf));
- break;
+ pos = subMSF (cd_list (cd, track)[cd_cur (cd, track)].length,
+ cd_cur (cd, relmsf));
+ break;
case 2:
- pos=subMSF(cd_cur(cd,absmsf),
- cd_info(cd,track)[0].start);
- break;
+ pos = subMSF (cd_cur (cd, absmsf),
+ cd_info (cd, track)[0].start);
+ break;
case 3:
- pos=subMSF(cd_info(cd,track)[cd_info(cd,tracks)-1].end,
- cd_cur(cd,absmsf));
- break;
+ pos = subMSF (cd_info (cd, track)[cd_info (cd, tracks)
+ - 1].end,
+ cd_cur (cd, absmsf));
+ break;
}
- cdtime[0]=pos.minute/10;
- cdtime[1]=pos.minute%10;
- cdtime[2]=pos.second/10;
- cdtime[3]=pos.second%10;
- break;
+ cdtime[0] = pos.minute / 10;
+ cdtime[1] = pos.minute % 10;
+ cdtime[2] = pos.second / 10;
+ cdtime[3] = pos.second % 10;
+ break;
case CDM_STOP:
- newRack=RACK_STOP;
- if (newdisc)
+ newRack = RACK_STOP;
+ if (newdisc)
{
- track[0]=cd_list(cd,tracks)/10;
- track[1]=cd_list(cd,tracks)%10;
+ track[0] = cd_list (cd, tracks) / 10;
+ track[1] = cd_list (cd, tracks) % 10;
}
- else
+ else
{
- track[0]=cd_list(cd,track)[start_track].num/10;
- track[1]=cd_list(cd,track)[start_track].num%10;
+ track[0] = cd_list (cd, track)[start_track].num / 10;
+ track[1] = cd_list (cd, track)[start_track].num % 10;
}
- if (playlist==NULL)
+ if (playlist == NULL)
{
- cdtime[0]=cd_list(cd,length).minute/10;
- cdtime[1]=cd_list(cd,length).minute%10;
- cdtime[2]=cd_list(cd,length).second/10;
- cdtime[3]=cd_list(cd,length).second%10;
+ cdtime[0] = cd_list (cd, length).minute / 10;
+ cdtime[1] = cd_list (cd, length).minute % 10;
+ cdtime[2] = cd_list (cd, length).second / 10;
+ cdtime[3] = cd_list (cd, length).second % 10;
}
- else
+ else
{
- cdtime[0]=playlist->length.minute/10;
- cdtime[1]=playlist->length.minute%10;
- cdtime[2]=playlist->length.second/10;
- cdtime[3]=playlist->length.second%10;
+ cdtime[0] = playlist->length.minute / 10;
+ cdtime[1] = playlist->length.minute % 10;
+ cdtime[2] = playlist->length.second / 10;
+ cdtime[3] = playlist->length.second % 10;
}
- break;
+ break;
case CDM_COMP:
- newRack=RACK_STOP;
- goto set_null;
+ newRack = RACK_STOP;
+ goto set_null;
case CDM_EJECT:
- newRack=RACK_NODISC;
+ newRack = RACK_NODISC;
default:
- set_null:
- track[0]= 0;
- track[1]= 0;
- cdtime[0]=0;
- cdtime[1]=0;
- cdtime[2]=0;
- cdtime[3]=0;
- break;
+ set_null:
+ track[0] = 0;
+ track[1] = 0;
+ cdtime[0] = 0;
+ cdtime[1] = 0;
+ cdtime[2] = 0;
+ cdtime[3] = 0;
+ break;
}
}
- if (newRack!=curRack || force_win)
+ if (newRack != curRack || force_win)
{
- /* Mode has changed, paint new mask and pixmap */
- curRack=newRack;
- redrawWindow();
+ /* Mode has changed, paint new mask and pixmap */
+ curRack = newRack;
+ redrawWindow ();
}
- switch (curRack)
+ switch (curRack)
{
case RACK_MIXER:
- paint_mixer_led();
- break;
+ paint_mixer_led ();
+ break;
default:
- paint_cd_led(flash,track,cdtime);
- break;
+ paint_cd_led (flash, track, cdtime);
+ break;
}
}
@@ -1342,20 +1427,21 @@ void redrawDisplay(int force_win, int force_disp)
*
* save way to get a color from X
*/
-Pixel getColor(char *ColorName)
+Pixel
+getColor (char *ColorName)
{
- XColor Color;
- XWindowAttributes Attributes;
+ XColor Color;
+ XWindowAttributes Attributes;
- XGetWindowAttributes(Disp,Root,&Attributes);
- Color.pixel = 0;
+ XGetWindowAttributes (Disp, Root, &Attributes);
+ Color.pixel = 0;
- if (!XParseColor (Disp, Attributes.colormap, ColorName, &Color))
- fprintf(stderr,"wmrack: can't parse %s\n", ColorName);
- else if(!XAllocColor (Disp, Attributes.colormap, &Color))
- fprintf(stderr,"wmrack: can't allocate %s\n", ColorName);
+ if (!XParseColor (Disp, Attributes.colormap, ColorName, &Color))
+ fprintf (stderr, "wmrack: can't parse %s\n", ColorName);
+ else if (!XAllocColor (Disp, Attributes.colormap, &Color))
+ fprintf (stderr, "wmrack: can't allocate %s\n", ColorName);
- return Color.pixel;
+ return Color.pixel;
}
/*
@@ -1363,11 +1449,13 @@ Pixel getColor(char *ColorName)
*
* returns the time in milliseconds
*/
-Time getTime()
+Time
+getTime ()
{
- struct timeval tv;
- gettimeofday(&tv,NULL);
- return (tv.tv_sec*1000)+(tv.tv_usec/1000);
+ struct timeval tv;
+
+ gettimeofday (&tv, NULL);
+ return (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
}
/*
@@ -1375,77 +1463,82 @@ Time getTime()
*
* loads the mixer defaults
*/
-int loadMixerRC()
+int
+loadMixerRC ()
{
- char line[1024], dev[50], src[10], *d;
- int i, l, r, n, j, err=0;
+ char line[1024], dev[50], src[10], *d;
+ int i, l, r, n, j, err = 0;
- mixer_max=0;
- mixer_lib=lib_open("mixer",LIB_READ);
- if (mixer_lib==NULL)
+ mixer_max = 0;
+ mixer_lib = lib_open ("mixer", LIB_READ);
+ if (mixer_lib == NULL)
{
- fprintf(stderr,"wmrack: can't read mixer file\n");
- err=-1;
- goto endload;
+ fprintf (stderr, "wmrack: can't read mixer file\n");
+ err = -1;
+ goto endload;
}
- while ((lib_gets(mixer_lib,line,1024))!=NULL)
+ while ((lib_gets (mixer_lib, line, 1024)) != NULL)
{
- for (i=0; i<mixer_devices; i++)
- if (strncmp(line,mixer_names[i],strlen(mixer_names[i]))==0)
- break;
- if (i<mixer_devices)
+ for (i = 0; i < mixer_devices; i++)
+ if (strncmp (line, mixer_names[i], strlen (mixer_names[i])) == 0)
+ break;
+ if (i < mixer_devices)
{
- n=sscanf(line,"%s %d:%d %s",&dev,&l,&r,&src);
- if (n>1)
+ n = sscanf (line, "%s %d:%d %s", &dev, &l, &r, &src);
+ if (n > 1)
{
- mixer_setvols(mixer,i,l,r);
- if (strcmp(src,"src")==0)
- mixer_setrecsrc(mixer,i,1,0);
+ mixer_setvols (mixer, i, l, r);
+ if (strcmp (src, "src") == 0)
+ mixer_setrecsrc (mixer, i, 1, 0);
}
- *dev=*src=0;
+ *dev = *src = 0;
}
- else if (strncmp(line,"ORDER ",6)==0)
+ else if (strncmp (line, "ORDER ", 6) == 0)
{
- for (d=strchr(line,32); d!=NULL; d=strchr(d,32))
+ for (d = strchr (line, 32); d != NULL; d = strchr (d, 32))
{
- while (*d==32) *d++;
- if (*d==0 || *d=='\n' || *d=='\r') break;
- for (i=0; i<mixer_devices; i++)
- if (strncmp(d,mixer_names[i],strlen(mixer_names[i]))==0)
- break;
- if (i<mixer_devices && mixer_isdevice(mixer,i))
+ while (*d == 32)
+ *d++;
+ if (*d == 0 || *d == '\n' || *d == '\r')
+ break;
+ for (i = 0; i < mixer_devices; i++)
+ if (strncmp (d, mixer_names[i], strlen (mixer_names[i]))
+ == 0)
+ break;
+ if (i < mixer_devices && mixer_isdevice (mixer, i))
{
- mixer_order[mixer_max++]=i;
+ mixer_order[mixer_max++] = i;
#ifdef DEBUG
- fprintf(stderr,"wmrack: mixer_order %d=%s\n",mixer_max,mixer_names[i]);
+ fprintf (stderr, "wmrack: mixer_order %d=%s\n", mixer_max,
+ mixer_names[i]);
#endif
}
#ifdef DEBUG
- else
- fprintf(stderr,"wmrack: unsupported device '%s'\n",d);
+ else
+ fprintf (stderr, "wmrack: unsupported device '%s'\n", d);
#endif
}
}
}
- lib_free(mixer_lib);
+ lib_free (mixer_lib);
- endload:
- if (mixer_max==0)
+ endload:
+ if (mixer_max == 0)
{
#ifdef DEBUG
- fprintf(stderr,"wmrack: setting default mixer_order\n");
+ fprintf (stderr, "wmrack: setting default mixer_order\n");
#endif
- for (j=i=0; i<mixer_devices; i++)
- if (mixer_isdevice(mixer,i))
- mixer_order[j++]=i;
- mixer_max=j;
+ for (j = i = 0; i < mixer_devices; i++)
+ if (mixer_isdevice (mixer, i))
+ mixer_order[j++] = i;
+ mixer_max = j;
}
-
- mixer_readvols(mixer);
- return err;
+ mixer_readvols (mixer);
+
+ return err;
}
/*
@@ -1453,53 +1546,55 @@ int loadMixerRC()
*
* writes the mixer defaults
*/
-int saveMixerRC()
+int
+saveMixerRC ()
{
- int i;
+ int i;
- mixer_lib=lib_open("mixer",LIB_WRITE);
- if (mixer_lib==NULL)
+ mixer_lib = lib_open ("mixer", LIB_WRITE);
+ if (mixer_lib == NULL)
{
- fprintf(stderr,"wmrack: can't write mixer file\n");
- return -1;
+ fprintf (stderr, "wmrack: can't write mixer file\n");
+ return -1;
}
- for (i=0; i<mixer_devices; i++)
+ for (i = 0; i < mixer_devices; i++)
{
- if (mixer_isdevice(mixer,i))
+ if (mixer_isdevice (mixer, i))
{
- if (mixer_isstereo(mixer,i))
- lib_printf(mixer_lib,"%s %d:%d%s\n",
- mixer_names[i],
- mixer_volleft(mixer,i),
- mixer_volright(mixer,i),
- mixer_isrecsrc(mixer,i)?" src":"");
- else
- lib_printf(mixer_lib,"%s %d:%d%s\n",
- mixer_names[i],
- mixer_volmono(mixer,i),
- mixer_volmono(mixer,i),
- mixer_isrecsrc(mixer,i)?" src":"");
+ if (mixer_isstereo (mixer, i))
+ lib_printf (mixer_lib, "%s %d:%d%s\n",
+ mixer_names[i],
+ mixer_volleft (mixer, i),
+ mixer_volright (mixer, i),
+ mixer_isrecsrc (mixer, i) ? " src" : "");
+ else
+ lib_printf (mixer_lib, "%s %d:%d%s\n",
+ mixer_names[i],
+ mixer_volmono (mixer, i),
+ mixer_volmono (mixer, i),
+ mixer_isrecsrc (mixer, i) ? " src" : "");
}
}
- if (mixer_max>0)
+ if (mixer_max > 0)
{
- lib_printf(mixer_lib,"ORDER ");
- for (i=0; i<mixer_max; i++)
+ lib_printf (mixer_lib, "ORDER ");
+ for (i = 0; i < mixer_max; i++)
{
- lib_printf(mixer_lib,"%s ",mixer_names[mixer_order[i]]);
+ lib_printf (mixer_lib, "%s ", mixer_names[mixer_order[i]]);
}
- lib_printf(mixer_lib,"\n");
+ lib_printf (mixer_lib, "\n");
}
- lib_close(mixer_lib);
+ lib_close (mixer_lib);
- return 0;
+ return 0;
}
-void rack_popup(char *msg)
+void
+rack_popup (char *msg)
{
- if (popup_display!=NULL)
- free(popup_display);
- popup_display=strdup(msg);
- popup_done=0;
+ if (popup_display != NULL)
+ free (popup_display);
+ popup_display = strdup (msg);
+ popup_done = 0;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmrack.git
More information about the Pkg-wmaker-commits
mailing list