| … | |
… | |
| 297 | get_options (r_argc, r_argv); |
297 | get_options (r_argc, r_argv); |
| 298 | |
298 | |
| 299 | if (!(display = displays.get (rs[Rs_display_name]))) |
299 | if (!(display = displays.get (rs[Rs_display_name]))) |
| 300 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
300 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
| 301 | |
301 | |
| 302 | extract_resources (); |
|
|
| 303 | |
|
|
| 304 | free (r_argv); |
|
|
| 305 | |
|
|
| 306 | #if ENABLE_PERL |
|
|
| 307 | if (!rs[Rs_perl_ext_1]) |
|
|
| 308 | rs[Rs_perl_ext_1] = "default"; |
|
|
| 309 | |
|
|
| 310 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
|
|
| 311 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
|
|
| 312 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
| 313 | { |
|
|
| 314 | rxvt_perl.init (this); |
|
|
| 315 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
|
|
| 316 | } |
|
|
| 317 | #endif |
|
|
| 318 | |
|
|
| 319 | xa = display->xa; |
302 | xa = display->xa; |
| 320 | |
303 | |
| 321 | #if ENABLE_FRILLS |
304 | #if ENABLE_FRILLS |
| 322 | if (rs[Rs_depth]) |
305 | if (rs[Rs_depth]) |
| 323 | set (display, strtol (rs[Rs_depth], 0, 0)); |
306 | set (display, strtol (rs[Rs_depth], 0, 0)); |
| 324 | else |
307 | else |
| 325 | #endif |
308 | #endif |
| 326 | set (display); |
309 | set (display); |
|
|
310 | |
|
|
311 | extract_resources (); |
|
|
312 | |
|
|
313 | free (r_argv); |
|
|
314 | |
|
|
315 | #if ENABLE_PERL |
|
|
316 | if (!rs[Rs_perl_ext_1]) |
|
|
317 | rs[Rs_perl_ext_1] = "default"; |
|
|
318 | |
|
|
319 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
|
|
320 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
|
|
321 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
322 | { |
|
|
323 | rxvt_perl.init (this); |
|
|
324 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
|
|
325 | } |
|
|
326 | #endif |
| 327 | |
327 | |
| 328 | /* |
328 | /* |
| 329 | * set any defaults not already set |
329 | * set any defaults not already set |
| 330 | */ |
330 | */ |
| 331 | if (cmd_argv && cmd_argv[0]) |
331 | if (cmd_argv && cmd_argv[0]) |
| … | |
… | |
| 482 | val = rxvt_network_display (rs[Rs_display_name]); |
482 | val = rxvt_network_display (rs[Rs_display_name]); |
| 483 | rs[Rs_display_name] = (const char *)val; |
483 | rs[Rs_display_name] = (const char *)val; |
| 484 | |
484 | |
| 485 | if (val == NULL) |
485 | if (val == NULL) |
| 486 | #endif /* DISPLAY_IS_IP */ |
486 | #endif /* DISPLAY_IS_IP */ |
| 487 | val = XDisplayString (display->display); |
487 | val = XDisplayString (xdisp); |
| 488 | |
488 | |
| 489 | if (rs[Rs_display_name] == NULL) |
489 | if (rs[Rs_display_name] == NULL) |
| 490 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
490 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
| 491 | |
491 | |
| 492 | i = strlen (val); |
492 | i = strlen (val); |
| … | |
… | |
| 804 | |
804 | |
| 805 | if (rsmod |
805 | if (rsmod |
| 806 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
806 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
| 807 | requestedmeta = rsmod[3] - '0'; |
807 | requestedmeta = rsmod[3] - '0'; |
| 808 | |
808 | |
| 809 | map = XGetModifierMapping (display->display); |
809 | map = XGetModifierMapping (xdisp); |
| 810 | kc = map->modifiermap; |
810 | kc = map->modifiermap; |
| 811 | |
811 | |
| 812 | for (i = 1; i < 6; i++) |
812 | for (i = 1; i < 6; i++) |
| 813 | { |
813 | { |
| 814 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
814 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
| … | |
… | |
| 816 | for (j = map->max_keypermod; j--; k++) |
816 | for (j = map->max_keypermod; j--; k++) |
| 817 | { |
817 | { |
| 818 | if (kc[k] == 0) |
818 | if (kc[k] == 0) |
| 819 | break; |
819 | break; |
| 820 | |
820 | |
| 821 | switch (XKeycodeToKeysym (display->display, kc[k], 0)) |
821 | switch (XKeycodeToKeysym (xdisp, kc[k], 0)) |
| 822 | { |
822 | { |
| 823 | case XK_Num_Lock: |
823 | case XK_Num_Lock: |
| 824 | ModNumLockMask = modmasks[i - 1]; |
824 | ModNumLockMask = modmasks[i - 1]; |
| 825 | continue; |
825 | continue; |
| 826 | |
826 | |
