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.149 by sf-exg, Sat Dec 18 18:17:39 2010 UTC vs.
Revision 1.153 by sf-exg, Sat Apr 30 13:11:34 2011 UTC

4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
11 * 11 *
12 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
405 int len = 0; 405 int len = 0;
406 406
407 if (optList[i].arg) 407 if (optList[i].arg)
408 len = strlen (optList[i].arg) + 1; 408 len = strlen (optList[i].arg) + 1;
409 assert (optList[i].opt != NULL); 409 assert (optList[i].opt != NULL);
410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
411 col += len; 411 col += len;
412 if (col > 79) 412 if (col > 79)
413 { 413 {
414 /* assume regular width */ 414 /* assume regular width */
415 rxvt_log ("\n"); 415 rxvt_log ("\n");
461 break; 461 break;
462 } 462 }
463 463
464 rxvt_log ("\n\n"); 464 rxvt_log ("\n\n");
465 rxvt_exit_failure (); 465 rxvt_exit_failure ();
466 /* NOTREACHED */
467} 466}
468 467
469/*}}} */ 468/*}}} */
470 469
471/*{{{ get command-line options before getting resources */ 470/*{{{ get command-line options before getting resources */
522 flag = !flag; 521 flag = !flag;
523 522
524 if (optList_isString (entry)) 523 if (optList_isString (entry))
525 { 524 {
526 /* 525 /*
527 * special cases are handled in main.c:main () to allow 526 * special cases are handled in init_resources () to allow
528 * X resources to set these values before we settle for 527 * X resources to set these values before we settle for
529 * default values 528 * default values
530 */ 529 */
531 530
532 if (optList[entry].doff != -1) 531 if (optList[entry].doff != -1)
585 * Define key from XrmEnumerateDatabase. 584 * Define key from XrmEnumerateDatabase.
586 * quarks will be something like 585 * quarks will be something like
587 * "rxvt" "keysym" "0xFF01" 586 * "rxvt" "keysym" "0xFF01"
588 * value will be a string 587 * value will be a string
589 */ 588 */
590/* ARGSUSED */
591int 589int
592rxvt_define_key (XrmDatabase *database UNUSED, 590rxvt_define_key (XrmDatabase *database UNUSED,
593 XrmBindingList bindings UNUSED, 591 XrmBindingList bindings UNUSED,
594 XrmQuarkList quarks, 592 XrmQuarkList quarks,
595 XrmRepresentation *type UNUSED, 593 XrmRepresentation *type UNUSED,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines