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.136 by ayin, Sat Feb 16 15:56:41 2008 UTC vs.
Revision 1.146 by sf-exg, Thu Sep 2 15:48:11 2010 UTC

… …
91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
93 SWCH ("C", Opt_console, 0, "intercept console messages"), 93 SWCH ("C", Opt_console, 0, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 94 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
96 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 100 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 101 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
… …
176#ifdef RXVT_SCROLLBAR 177#ifdef RXVT_SCROLLBAR
177 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 178 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
178#endif 179#endif
179#ifdef OPTION_HC 180#ifdef OPTION_HC
180 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"),
181#endif 183#endif
182#ifndef NO_CURSORCOLOR 184#ifndef NO_CURSORCOLOR
183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
184 /* command-line option = resource name */ 186 /* command-line option = resource name */
185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
188 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
190#ifdef BG_IMAGE_FROM_FILE 192#ifdef BG_IMAGE_FROM_FILE
191 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
195# if ENABLE_EWMH
196 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
197# endif
193#endif 198#endif
194 /* fonts: command-line option = resource name */ 199 /* fonts: command-line option = resource name */
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
196#if ENABLE_STYLES 201#if ENABLE_STYLES
197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 202 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 233 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 234 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 235 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
236 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
231#endif 237#endif
232#ifdef BUILTIN_GLYPHS 238#ifdef BUILTIN_GLYPHS
233 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 239 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
234#endif 240#endif
235#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
… …
256 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 262 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
257 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 263 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
258 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 264 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
259#endif 265#endif
260#if ISO_14755 266#if ISO_14755
267 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
261 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 268 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
262#endif 269#endif
263#ifdef HAVE_AFTERIMAGE 270#ifdef HAVE_AFTERIMAGE
264 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 271 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
265 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), 272 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
266#endif 273#endif
267 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
268 }; 275 };
269 276
270#undef INFO 277#undef INFO
… …
396 { 403 {
397 int len = 0; 404 int len = 0;
398 405
399 if (optList[i].arg) 406 if (optList[i].arg)
400 len = strlen (optList[i].arg) + 1; 407 len = strlen (optList[i].arg) + 1;
401#ifdef DEBUG_STRICT
402 assert (optList[i].opt != NULL); 408 assert (optList[i].opt != NULL);
403#endif
404 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 409 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
405 col += len; 410 col += len;
406 if (col > 79) 411 if (col > 79)
407 { 412 {
408 /* assume regular width */ 413 /* assume regular width */
… …
422 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 427 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
423 428
424 for (i = 0; i < optList_size; i++) 429 for (i = 0; i < optList_size; i++)
425 if (optList[i].desc != NULL) 430 if (optList[i].desc != NULL)
426 { 431 {
427#ifdef DEBUG_STRICT
428 assert (optList[i].opt != NULL); 432 assert (optList[i].opt != NULL);
429#endif
430 rxvt_log (" %s%s %-*s%s%s\n", 433 rxvt_log (" %s%s %-*s%s%s\n",
431 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 434 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
432 (INDENT - strlen (optList[i].opt) 435 (INDENT - strlen (optList[i].opt)
433 + (optList_isBool (i) ? 0 : 2)), 436 + (optList_isBool (i) ? 0 : 2)),
434 (optList[i].arg ? optList[i].arg : ""), 437 (optList[i].arg ? optList[i].arg : ""),
… …
552#ifdef KEYSYM_RESOURCE 555#ifdef KEYSYM_RESOURCE
553 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
554 { 557 {
555 if (i+1 < argc) 558 if (i+1 < argc)
556 { 559 {
557 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
558 sprintf (res, "*.%s: %s\n", opt, argv[i]); 561 sprintf (res, "*.%s: %s\n", opt, argv[i]);
559 XrmPutLineResource (&option_db, res); 562 XrmPutLineResource (&option_db, res);
560 free (res);
561 } 563 }
562 } 564 }
563#endif 565#endif
564 else 566 else
565 { 567 {
… …
687 // fallback on hexadecimal parsing 689 // fallback on hexadecimal parsing
688 char *end; 690 char *end;
689 sym = strtol (str, &end, 16); 691 sym = strtol (str, &end, 16);
690 if (*end) 692 if (*end)
691 return -1; 693 return -1;
692 } 694 }
693 695
694 keyboard->register_user_translation (sym, state, arg); 696 keyboard->register_user_translation (sym, state, arg);
695 return 1; 697 return 1;
696} 698}
697 699

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines