snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

Applied wmMatrix-0.2-alt-right-doubleclick.patch

Browse source
This commit is contained in:
Alexey I. Froloff 2012-08-14 17:04:17 +04:00 committed by Carlos R. Mafra
parent 75fced152e
commit 0c2fd260dd
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
wmMatrix/wmMatrix.c
View file

@ -74,11 +74,12 @@ int GotFirstClick2, GotDoubleClick2;
int GotFirstClick3, GotDoubleClick3; int GotFirstClick3, GotDoubleClick3;
int DblClkDelay; int DblClkDelay;
/*int HasExecute;*/ /*int HasExecute;*/
char* ExecuteCommand = "xmatrixsmall"; /*char* ExecuteCommand = "xmatrixsmall";*/
char *progname = "wmMatrix"; char *progname = "wmMatrix";
char *progclass = "WMMatrix"; char *progclass = "WMMatrix";
int PixmapSize; int PixmapSize;
char *DoubleClickCmd = NULL; char *DoubleClickCmd = NULL;
char *RDoubleClickCmd = NULL;
char* TimeColor = "#ffff00"; char* TimeColor = "#ffff00";
char* BackgroundColor = "#181818"; char* BackgroundColor = "#181818";
@ -101,6 +102,8 @@ int main(int argc, char *argv[]) {
ParseCMDLine(argc, argv); ParseCMDLine(argc, argv);
if(DoubleClickCmd==NULL) if(DoubleClickCmd==NULL)
DoubleClickCmd=strdup("xscreensaver-demo"); DoubleClickCmd=strdup("xscreensaver-demo");
if(RDoubleClickCmd==NULL)
RDoubleClickCmd=strdup("xscreensaver-command -activate");
/*HasExecute = 1;*/ /*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);
@ -207,6 +210,15 @@ void ParseCMDLine(int argc, char *argv[]) {
if(DoubleClickCmd!=NULL) if(DoubleClickCmd!=NULL)
free(DoubleClickCmd); free(DoubleClickCmd);
DoubleClickCmd=strdup(argv[++i]); DoubleClickCmd=strdup(argv[++i]);
} else if (!strcmp(argv[i], "-cr")){
if ((i+1 >= argc)||(argv[i+1][0] == '-')) {
fprintf(stderr, "wmMatrix: No command given\n");
print_usage();
exit(-1);
}
if(RDoubleClickCmd!=NULL)
free(RDoubleClickCmd);
RDoubleClickCmd=strdup(argv[++i]);
} else if (!strcmp(argv[i], "-sml")){ } else if (!strcmp(argv[i], "-sml")){
PixmapSize = 1; PixmapSize = 1;
} else if (!strcmp(argv[i], "-med")){ } else if (!strcmp(argv[i], "-med")){
@ -224,6 +236,8 @@ void ParseCMDLine(int argc, char *argv[]) {
void print_usage() { void print_usage() {
printf("\nwmMatrix version: %s\n", WMMATRIX_VERSION); printf("\nwmMatrix version: %s\n", WMMATRIX_VERSION);
printf("\t-h\t\tDisplay help screen.\n"); printf("\t-h\t\tDisplay help screen.\n");
printf("\t-c cmd\t\tCommand executed on doubleclick.\n");
printf("\t-cr cmd\t\tCommand executed on right doubleclick\n");
printf("\t-sml\t\tUse small size pixmap.\n"); printf("\t-sml\t\tUse small size pixmap.\n");
printf("\t-med\t\tUse medium size pixmap.\n"); printf("\t-med\t\tUse medium size pixmap.\n");
printf("\t-lrg\t\tUse large size pixmap.\n"); printf("\t-lrg\t\tUse large size pixmap.\n");
@ -234,9 +248,9 @@ void print_usage() {
* This routine handles button presses. * This routine handles button presses.
* *
* Double click on * Double click on
* Mouse Button 1: Execute the command defined in the -e command-line option. * Mouse Button 1: Execute the command defined in the -c command-line option.
* Mouse Button 2: No action assigned. * Mouse Button 2: No action assigned.
* Mouse Button 3: No action assigned. * Mouse Button 3: Execute the command defined in the -cr command-line option.
* *
* *
*/ */
@ -279,6 +293,7 @@ void ButtonPressEvent(XButtonEvent *xev){
if (GotDoubleClick3) { if (GotDoubleClick3) {
GotFirstClick3 = 0; GotFirstClick3 = 0;
GotDoubleClick3 = 0; GotDoubleClick3 = 0;
system(RDoubleClickCmd);
} }
return; return;
} }