ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.141 by root, Sat Dec 26 10:24:04 2009 UTC vs.
Revision 1.145 by sf-exg, Sun Apr 4 18:59:19 2010 UTC

177#ifdef RXVT_SCROLLBAR 177#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif 179#endif
180#ifdef OPTION_HC 180#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
182 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182#endif 183#endif
183#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 186 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
258 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
259 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 260 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
260 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 261 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
261#endif 262#endif
262#if ISO_14755 263#if ISO_14755
264 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
263 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 265 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
264#endif 266#endif
265#ifdef HAVE_AFTERIMAGE 267#ifdef HAVE_AFTERIMAGE
266 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 268 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
267 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), 269 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
553#ifdef KEYSYM_RESOURCE 555#ifdef KEYSYM_RESOURCE
554 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
555 { 557 {
556 if (i+1 < argc) 558 if (i+1 < argc)
557 { 559 {
558 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
559 sprintf (res, "*.%s: %s\n", opt, argv[i]); 561 sprintf (res, "*.%s: %s\n", opt, argv[i]);
560 XrmPutLineResource (&option_db, res); 562 XrmPutLineResource (&option_db, res);
561 free (res);
562 } 563 }
563 } 564 }
564#endif 565#endif
565 else 566 else
566 { 567 {
688 // fallback on hexadecimal parsing 689 // fallback on hexadecimal parsing
689 char *end; 690 char *end;
690 sym = strtol (str, &end, 16); 691 sym = strtol (str, &end, 16);
691 if (*end) 692 if (*end)
692 return -1; 693 return -1;
693 } 694 }
694 695
695 keyboard->register_user_translation (sym, state, arg); 696 keyboard->register_user_translation (sym, state, arg);
696 return 1; 697 return 1;
697} 698}
698 699

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines