| 1 | --- src/gplt_x11.c.orig 2005-06-20 20:45:43.000000000 -0700 |
|---|
| 2 | +++ src/gplt_x11.c 2005-06-20 20:49:22.000000000 -0700 |
|---|
| 3 | @@ -515,8 +515,8 @@ |
|---|
| 4 | static unsigned int dep; /* depth */ |
|---|
| 5 | |
|---|
| 6 | static Bool Mono = 0, Gray = 0, Rv = 0, Clear = 0; |
|---|
| 7 | -static char Name[64] = "gnuplot"; |
|---|
| 8 | -static char Class[64] = "Gnuplot"; |
|---|
| 9 | +static char X_Name[64] = "gnuplot"; |
|---|
| 10 | +static char X_Class[64] = "Gnuplot"; |
|---|
| 11 | |
|---|
| 12 | static int cx = 0, cy = 0; |
|---|
| 13 | |
|---|
| 14 | @@ -3891,13 +3891,13 @@ |
|---|
| 15 | |
|---|
| 16 | while (++Argv, --Argc > 0) { |
|---|
| 17 | if (!strcmp(*Argv, "-name") && Argc > 1) { |
|---|
| 18 | - strncpy(Name, Argv[1], sizeof(Name) - 1); |
|---|
| 19 | - strncpy(Class, Argv[1], sizeof(Class) - 1); |
|---|
| 20 | + strncpy(X_Name, Argv[1], sizeof(X_Name) - 1); |
|---|
| 21 | + strncpy(X_Class, Argv[1], sizeof(X_Class) - 1); |
|---|
| 22 | /* just in case */ |
|---|
| 23 | - Name[sizeof(Name) - 1] = NUL; |
|---|
| 24 | - Class[sizeof(Class) - 1] = NUL; |
|---|
| 25 | - if (Class[0] >= 'a' && Class[0] <= 'z') |
|---|
| 26 | - Class[0] -= 0x20; |
|---|
| 27 | + X_Name[sizeof(X_Name) - 1] = NUL; |
|---|
| 28 | + X_Class[sizeof(X_Class) - 1] = NUL; |
|---|
| 29 | + if (X_Class[0] >= 'a' && X_Class[0] <= 'z') |
|---|
| 30 | + X_Class[0] -= 0x20; |
|---|
| 31 | } |
|---|
| 32 | } |
|---|
| 33 | Argc = argc; |
|---|
| 34 | @@ -3906,7 +3906,7 @@ |
|---|
| 35 | /*---parse command line---------------------------------------------------*/ |
|---|
| 36 | |
|---|
| 37 | XrmInitialize(); |
|---|
| 38 | - XrmParseCommand(&dbCmd, options, Nopt, Name, &Argc, Argv); |
|---|
| 39 | + XrmParseCommand(&dbCmd, options, Nopt, X_Name, &Argc, Argv); |
|---|
| 40 | if (Argc > 1) { |
|---|
| 41 | #ifdef PIPE_IPC |
|---|
| 42 | if (!strcmp(Argv[1], "-noevents")) { |
|---|
| 43 | @@ -4129,9 +4129,9 @@ |
|---|
| 44 | { |
|---|
| 45 | char name[128], class[128], *rc; |
|---|
| 46 | |
|---|
| 47 | - strcpy(name, Name); |
|---|
| 48 | + strcpy(name, X_Name); |
|---|
| 49 | strcat(name, resource); |
|---|
| 50 | - strcpy(class, Class); |
|---|
| 51 | + strcpy(class, X_Class); |
|---|
| 52 | strcat(class, resource); |
|---|
| 53 | rc = XrmGetResource(xrdb, name, class, type, &value) |
|---|
| 54 | ? (char *) value.addr : (char *) 0; |
|---|
| 55 | @@ -4614,7 +4614,7 @@ |
|---|
| 56 | #undef TEMP_NUM_LEN |
|---|
| 57 | if (!plot->titlestring) { |
|---|
| 58 | int orig_len; |
|---|
| 59 | - if (!title) title = Class; |
|---|
| 60 | + if (!title) title = X_Class; |
|---|
| 61 | orig_len = strlen(title); |
|---|
| 62 | /* memory for text, white space, number and terminating \0 */ |
|---|
| 63 | if ((plot->titlestring = (char *) malloc(orig_len + ((orig_len && plot->plot_number) ? 1 : 0) + strlen(numstr) - strlen(ICON_TEXT) + 1))) { |
|---|
