snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

Removed dead code, eliminated empty cycles, reduced doubleclick timeout from 1.5sec to 0.5sec

Browse source
This commit is contained in:
Alexey I. Froloff 2012-08-14 17:04:19 +04:00 committed by Carlos R. Mafra
parent 18524ce06f
commit cb310ed1a1
1 changed files with 4 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
wmMatrix/wmMatrix.c
View file

@ -58,7 +58,7 @@
/* /*
* Delay between refreshes (in microseconds) * Delay between refreshes (in microseconds)
*/ */
#define DELAY 10000UL #define DELAY 20000UL /* 0.020000 sec */
#define WMMATRIX_VERSION "0.2" #define WMMATRIX_VERSION "0.2"
@ -89,11 +89,7 @@ char* BackgroundColor = "#181818";
*/ */
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
XEvent event; XEvent event;
int n, k, m;
/* float avg1;*/
/*char Command[512];*/
m_state *state; m_state *state;
/* FILE *fp;*/
/* /*
@ -104,55 +100,22 @@ int main(int argc, char *argv[]) {
DoubleClickCmd=strdup("xscreensaver-demo"); DoubleClickCmd=strdup("xscreensaver-demo");
if(RDoubleClickCmd==NULL) if(RDoubleClickCmd==NULL)
RDoubleClickCmd=strdup("xscreensaver-command -activate"); RDoubleClickCmd=strdup("xscreensaver-command -activate");
/*HasExecute = 1;*/
initXwindow(argc, argv); initXwindow(argc, argv);
openXwindow(argc, argv, wmMatrix_master, wmMatrix_mask_bits, wmMatrix_mask_width, wmMatrix_mask_height); openXwindow(argc, argv, wmMatrix_master, wmMatrix_mask_bits, wmMatrix_mask_width, wmMatrix_mask_height);
state = init_matrix( display, iconwin ); state = init_matrix( display, iconwin );
/*
if (HasExecute){
sprintf(Command, "%s -window-id 0x%x &", ExecuteCommand, (int)iconwin);
system(Command);
}
*/
/* /*
* Loop until we die * Loop until we die
*/ */
n = k = m = 32000;
while(1) { while(1) {
#if 0 draw_matrix( state, 40 );
if ( n>10 ){
n = 0;
if ( (fp = fopen("/proc/loadavg", "r")) != NULL ){
fscanf(fp, "%f", &avg1); avg1 *= 10.0; fclose(fp);
m = (int)(40.0 - 1.00*avg1 + 0.5);
if (m < 0) m = 0;
} else {
printf("problem opening /proc/loadavg file for read\n");
exit(-1);
}
} else {
/*
* Update the counter.
*/
++n;
}
#endif
m=0;
if (k > m){
k = 0;
draw_matrix( state, 40 );
} else {
++k;
}
/* /*
* Double Click Delays * Double Click Delays
* Keep track of click events. If Delay too long, set GotFirstClick's to False. * Keep track of click events. If Delay too long, set GotFirstClick's to False.
*/ */
if (DblClkDelay > 150) { /* 25 * 0.02 = .5 sec */
if (DblClkDelay > 25) {
DblClkDelay = 0; DblClkDelay = 0;
GotFirstClick1 = 0; GotDoubleClick1 = 0; GotFirstClick1 = 0; GotDoubleClick1 = 0;
GotFirstClick2 = 0; GotDoubleClick2 = 0; GotFirstClick2 = 0; GotDoubleClick2 = 0;
@ -161,7 +124,6 @@ int main(int argc, char *argv[]) {
++DblClkDelay; ++DblClkDelay;
} }
/* /*
* Process any pending X events. * Process any pending X events.
*/ */
@ -179,7 +141,6 @@ int main(int argc, char *argv[]) {
} }
} }
/* /*
* sleep till next update. I cant seem to get usleep or select to work properly * sleep till next update. I cant seem to get usleep or select to work properly
* with args smaller than 10000. A kernel tick problem? If I comment out the next line, * with args smaller than 10000. A kernel tick problem? If I comment out the next line,