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.138 by root, Tue Nov 4 11:03:29 2008 UTC vs.
Revision 1.146 by sf-exg, Thu Sep 2 15:48:11 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"),
… …
189 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"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 192#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 193 RSTRG (Rs_path, "path", "search path"),
193 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
194#endif 198#endif
195 /* fonts: command-line option = resource name */ 199 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 201#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 202 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 232 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 233 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 234 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
231 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"),
232#endif 237#endif
233#ifdef BUILTIN_GLYPHS 238#ifdef BUILTIN_GLYPHS
234 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"),
235#endif 240#endif
236#ifdef POINTER_BLANK 241#ifdef POINTER_BLANK
… …
257 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
258 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
259 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"),
260#endif 265#endif
261#if ISO_14755 266#if ISO_14755
267 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262 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),
263#endif 269#endif
264#ifdef HAVE_AFTERIMAGE 270#ifdef HAVE_AFTERIMAGE
265 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..."),
266 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"),
267# if ENABLE_EWMH
268 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to aplication icon image"),
269# endif
270#endif 273#endif
271 INFO ("e", "command arg ...", "command to execute") 274 INFO ("e", "command arg ...", "command to execute")
272 }; 275 };
273 276
274#undef INFO 277#undef INFO
… …
400 { 403 {
401 int len = 0; 404 int len = 0;
402 405
403 if (optList[i].arg) 406 if (optList[i].arg)
404 len = strlen (optList[i].arg) + 1; 407 len = strlen (optList[i].arg) + 1;
405#ifdef DEBUG_STRICT
406 assert (optList[i].opt != NULL); 408 assert (optList[i].opt != NULL);
407#endif
408 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 409 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
409 col += len; 410 col += len;
410 if (col > 79) 411 if (col > 79)
411 { 412 {
412 /* assume regular width */ 413 /* assume regular width */
… …
426 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 427 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
427 428
428 for (i = 0; i < optList_size; i++) 429 for (i = 0; i < optList_size; i++)
429 if (optList[i].desc != NULL) 430 if (optList[i].desc != NULL)
430 { 431 {
431#ifdef DEBUG_STRICT
432 assert (optList[i].opt != NULL); 432 assert (optList[i].opt != NULL);
433#endif
434 rxvt_log (" %s%s %-*s%s%s\n", 433 rxvt_log (" %s%s %-*s%s%s\n",
435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 434 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
436 (INDENT - strlen (optList[i].opt) 435 (INDENT - strlen (optList[i].opt)
437 + (optList_isBool (i) ? 0 : 2)), 436 + (optList_isBool (i) ? 0 : 2)),
438 (optList[i].arg ? optList[i].arg : ""), 437 (optList[i].arg ? optList[i].arg : ""),
… …
556#ifdef KEYSYM_RESOURCE 555#ifdef KEYSYM_RESOURCE
557 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
558 { 557 {
559 if (i+1 < argc) 558 if (i+1 < argc)
560 { 559 {
561 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
562 sprintf (res, "*.%s: %s\n", opt, argv[i]); 561 sprintf (res, "*.%s: %s\n", opt, argv[i]);
563 XrmPutLineResource (&option_db, res); 562 XrmPutLineResource (&option_db, res);
564 free (res);
565 } 563 }
566 } 564 }
567#endif 565#endif
568 else 566 else
569 { 567 {
… …
691 // fallback on hexadecimal parsing 689 // fallback on hexadecimal parsing
692 char *end; 690 char *end;
693 sym = strtol (str, &end, 16); 691 sym = strtol (str, &end, 16);
694 if (*end) 692 if (*end)
695 return -1; 693 return -1;
696 } 694 }
697 695
698 keyboard->register_user_translation (sym, state, arg); 696 keyboard->register_user_translation (sym, state, arg);
699 return 1; 697 return 1;
700} 698}
701 699

Diff Legend

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