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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.329 by sf-exg, Mon Jun 11 14:56:33 2012 UTC vs.
Revision 1.334 by sf-exg, Sat Aug 16 10:51:23 2014 UTC

14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
519#endif 519#endif
520 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
522 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
523#endif 523#endif
524#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
525 NULL, 525 NULL,
526#endif 526#endif
527#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
528 "rgb:00/00/00", 528 "rgb:00/00/00",
529#endif 529#endif
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 660 pointerBlankDelay = i;
661 else 661 else
662 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
663#endif 663#endif
664
665 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
666 multiClickTime = i;
667 else
668 multiClickTime = 500;
664 669
665 /* no point having a scrollbar without having any scrollback! */ 670 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 671 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 672 set_option (Opt_scrollBar, 0);
668 673
1396 classHint.res_name = (char *)rs[Rs_name]; 1401 classHint.res_name = (char *)rs[Rs_name];
1397 classHint.res_class = (char *)RESCLASS; 1402 classHint.res_class = (char *)RESCLASS;
1398 1403
1399 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1404 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1400 wmHint.input = True; 1405 wmHint.input = True;
1401 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1406 wmHint.initial_state = option (Opt_iconic) ? IconicState
1407 : option (Opt_dockapp) ? WithdrawnState
1408 : NormalState;
1402 wmHint.window_group = top; 1409 wmHint.window_group = top;
1403 1410
1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1411 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1405 &szHint, &wmHint, &classHint); 1412 &szHint, &wmHint, &classHint);
1406#if ENABLE_EWMH 1413#if ENABLE_EWMH
1408 * set up icon hint 1415 * set up icon hint
1409 * rs [Rs_iconfile] is path to icon 1416 * rs [Rs_iconfile] is path to icon
1410 */ 1417 */
1411 1418
1412 if (rs [Rs_iconfile]) 1419 if (rs [Rs_iconfile])
1413 {
1414 set_icon (rs [Rs_iconfile]); 1420 set_icon (rs [Rs_iconfile]);
1415 }
1416#endif 1421#endif
1417 1422
1418#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
1419 if (mwmhints.flags) 1424 if (mwmhints.flags)
1420 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1425 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines