| … | |
… | |
| 40 | #include "init.h" |
40 | #include "init.h" |
| 41 | |
41 | |
| 42 | #include <limits> |
42 | #include <limits> |
| 43 | |
43 | |
| 44 | #include <csignal> |
44 | #include <csignal> |
|
|
45 | |
|
|
46 | #ifdef HAVE_XSETLOCALE |
|
|
47 | # define X_LOCALE |
|
|
48 | # include <X11/Xlocale.h> |
|
|
49 | #else |
|
|
50 | # ifdef HAVE_SETLOCALE |
|
|
51 | # include <clocale> |
|
|
52 | # endif |
|
|
53 | #endif |
|
|
54 | |
|
|
55 | #ifdef HAVE_NL_LANGINFO |
|
|
56 | # include <langinfo.h> |
|
|
57 | #endif |
| 45 | |
58 | |
| 46 | #ifdef DISPLAY_IS_IP |
59 | #ifdef DISPLAY_IS_IP |
| 47 | /* On Solaris link with -lsocket and -lnsl */ |
60 | /* On Solaris link with -lsocket and -lnsl */ |
| 48 | #include <sys/types.h> |
61 | #include <sys/types.h> |
| 49 | #include <sys/socket.h> |
62 | #include <sys/socket.h> |
| … | |
… | |
| 386 | rs[Rs_display_name] = ":0"; |
399 | rs[Rs_display_name] = ":0"; |
| 387 | |
400 | |
| 388 | get_options (r_argc, r_argv); |
401 | get_options (r_argc, r_argv); |
| 389 | |
402 | |
| 390 | if (!(display = displays.get (rs[Rs_display_name]))) |
403 | if (!(display = displays.get (rs[Rs_display_name]))) |
|
|
404 | { |
|
|
405 | free (r_argv); |
| 391 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
406 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
|
|
407 | } |
| 392 | |
408 | |
| 393 | // using a local pointer decreases code size a lot |
409 | // using a local pointer decreases code size a lot |
| 394 | xa = display->xa; |
410 | xa = display->xa; |
| 395 | |
411 | |
| 396 | set (display); |
412 | set (display); |
