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.330 by sf-exg, Sat Dec 29 14:23:35 2012 UTC vs.
Revision 1.337 by sf-exg, Fri Sep 5 19:02:53 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
612 rxvt_perl.init (this); 612 rxvt_perl.init (this);
613 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
614 } 614 }
615#endif 615#endif
616 616
617 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources (); 617 extract_keysym_resources ();
620 618
621 /* 619 /*
622 * set any defaults not already set 620 * set any defaults not already set
623 */ 621 */
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 658 pointerBlankDelay = i;
661 else 659 else
662 pointerBlankDelay = 2; 660 pointerBlankDelay = 2;
663#endif 661#endif
662
663 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
664 multiClickTime = i;
665 else
666 multiClickTime = 500;
667
668 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
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
1203 for (j = map->max_keypermod; j--; k++) 1208 for (j = map->max_keypermod; j--; k++)
1204 { 1209 {
1205 if (kc[k] == 0) 1210 if (kc[k] == 0)
1206 break; 1211 break;
1207 1212
1208 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1213 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1209 { 1214 {
1210 case XK_Num_Lock: 1215 case XK_Num_Lock:
1211 ModNumLockMask = modmasks[i - 1]; 1216 ModNumLockMask = modmasks[i - 1];
1212 continue; 1217 continue;
1213 1218
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