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.140 by root, Sat May 30 08:51:23 2009 UTC vs.
Revision 1.144 by sf-exg, Sun Jan 31 09:02:48 2010 UTC

258 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 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_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 259 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"), 260 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
261#endif 261#endif
262#if ISO_14755 262#if ISO_14755
263 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
263 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 264 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
264#endif 265#endif
265#ifdef HAVE_AFTERIMAGE 266#ifdef HAVE_AFTERIMAGE
266 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 267 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"), 268 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
401 { 402 {
402 int len = 0; 403 int len = 0;
403 404
404 if (optList[i].arg) 405 if (optList[i].arg)
405 len = strlen (optList[i].arg) + 1; 406 len = strlen (optList[i].arg) + 1;
406#ifdef DEBUG_STRICT
407 assert (optList[i].opt != NULL); 407 assert (optList[i].opt != NULL);
408#endif
409 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 408 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
410 col += len; 409 col += len;
411 if (col > 79) 410 if (col > 79)
412 { 411 {
413 /* assume regular width */ 412 /* assume regular width */
427 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 426 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
428 427
429 for (i = 0; i < optList_size; i++) 428 for (i = 0; i < optList_size; i++)
430 if (optList[i].desc != NULL) 429 if (optList[i].desc != NULL)
431 { 430 {
432#ifdef DEBUG_STRICT
433 assert (optList[i].opt != NULL); 431 assert (optList[i].opt != NULL);
434#endif
435 rxvt_log (" %s%s %-*s%s%s\n", 432 rxvt_log (" %s%s %-*s%s%s\n",
436 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 433 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
437 (INDENT - strlen (optList[i].opt) 434 (INDENT - strlen (optList[i].opt)
438 + (optList_isBool (i) ? 0 : 2)), 435 + (optList_isBool (i) ? 0 : 2)),
439 (optList[i].arg ? optList[i].arg : ""), 436 (optList[i].arg ? optList[i].arg : ""),
557#ifdef KEYSYM_RESOURCE 554#ifdef KEYSYM_RESOURCE
558 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 555 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
559 { 556 {
560 if (i+1 < argc) 557 if (i+1 < argc)
561 { 558 {
562 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 559 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
563 sprintf (res, "*.%s: %s\n", opt, argv[i]); 560 sprintf (res, "*.%s: %s\n", opt, argv[i]);
564 XrmPutLineResource (&option_db, res); 561 XrmPutLineResource (&option_db, res);
565 free (res);
566 } 562 }
567 } 563 }
568#endif 564#endif
569 else 565 else
570 { 566 {
692 // fallback on hexadecimal parsing 688 // fallback on hexadecimal parsing
693 char *end; 689 char *end;
694 sym = strtol (str, &end, 16); 690 sym = strtol (str, &end, 16);
695 if (*end) 691 if (*end)
696 return -1; 692 return -1;
697 } 693 }
698 694
699 keyboard->register_user_translation (sym, state, arg); 695 keyboard->register_user_translation (sym, state, arg);
700 return 1; 696 return 1;
701} 697}
702 698

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines