1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: init.C |
2 | * File: init.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
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) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
7 | * - original version |
7 | * - original version |
8 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
8 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
9 | * - extensive modifications |
9 | * - extensive modifications |
|
|
10 | * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> |
|
|
11 | * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> |
|
|
12 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
10 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
13 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
11 | * - extensive modifications |
14 | * - extensive modifications |
12 | * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> |
|
|
13 | * - QNX support |
|
|
14 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
15 | * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> |
15 | * |
16 | * |
16 | * 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 |
17 | * 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 |
18 | * the Free Software Foundation; either version 2 of the License, or |
19 | * the Free Software Foundation; either version 2 of the License, or |
19 | * (at your option) any later version. |
20 | * (at your option) any later version. |
… | |
… | |
33 | |
34 | |
34 | #include "../config.h" /* NECESSARY */ |
35 | #include "../config.h" /* NECESSARY */ |
35 | #include "rxvt.h" /* NECESSARY */ |
36 | #include "rxvt.h" /* NECESSARY */ |
36 | #include "rxvtutil.h" |
37 | #include "rxvtutil.h" |
37 | #include "init.h" |
38 | #include "init.h" |
|
|
39 | #include "keyboard.h" |
38 | |
40 | |
39 | #include <limits> |
41 | #include <limits> |
40 | |
42 | |
41 | #include <csignal> |
43 | #include <csignal> |
|
|
44 | |
|
|
45 | #include <fcntl.h> |
|
|
46 | |
|
|
47 | #ifdef HAVE_XSETLOCALE |
|
|
48 | # define X_LOCALE |
|
|
49 | # include <X11/Xlocale.h> |
|
|
50 | #else |
|
|
51 | # ifdef HAVE_SETLOCALE |
|
|
52 | # include <clocale> |
|
|
53 | # endif |
|
|
54 | #endif |
|
|
55 | |
|
|
56 | #ifdef HAVE_NL_LANGINFO |
|
|
57 | # include <langinfo.h> |
|
|
58 | #endif |
|
|
59 | |
|
|
60 | #ifdef DISPLAY_IS_IP |
|
|
61 | /* On Solaris link with -lsocket and -lnsl */ |
|
|
62 | #include <sys/types.h> |
|
|
63 | #include <sys/socket.h> |
|
|
64 | |
|
|
65 | /* these next two are probably only on Sun (not Solaris) */ |
|
|
66 | #ifdef HAVE_SYS_SOCKIO_H |
|
|
67 | #include <sys/sockio.h> |
|
|
68 | #endif |
|
|
69 | #ifdef HAVE_SYS_BYTEORDER_H |
|
|
70 | #include <sys/byteorder.h> |
|
|
71 | #endif |
|
|
72 | |
|
|
73 | #include <netinet/in.h> |
|
|
74 | #include <arpa/inet.h> |
|
|
75 | #include <net/if.h> |
|
|
76 | #include <net/if_arp.h> |
|
|
77 | |
|
|
78 | static char * |
|
|
79 | rxvt_network_display (const char *display) |
|
|
80 | { |
|
|
81 | char buffer[1024], *rval = NULL; |
|
|
82 | struct ifconf ifc; |
|
|
83 | struct ifreq *ifr; |
|
|
84 | int i, skfd; |
|
|
85 | |
|
|
86 | if (display[0] != ':' && strncmp (display, "unix:", 5)) |
|
|
87 | return (char *) display; /* nothing to do */ |
|
|
88 | |
|
|
89 | ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */ |
|
|
90 | ifc.ifc_buf = buffer; |
|
|
91 | |
|
|
92 | if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0) |
|
|
93 | { |
|
|
94 | perror ("socket"); |
|
|
95 | return NULL; |
|
|
96 | } |
|
|
97 | |
|
|
98 | if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0) |
|
|
99 | { |
|
|
100 | perror ("SIOCGIFCONF"); |
|
|
101 | close (skfd); |
|
|
102 | return NULL; |
|
|
103 | } |
|
|
104 | |
|
|
105 | for (i = 0, ifr = ifc.ifc_req; |
|
|
106 | i < (ifc.ifc_len / sizeof (struct ifreq)); |
|
|
107 | i++, ifr++) |
|
|
108 | { |
|
|
109 | struct ifreq ifr2; |
|
|
110 | |
|
|
111 | strcpy (ifr2.ifr_name, ifr->ifr_name); |
|
|
112 | |
|
|
113 | if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0) |
|
|
114 | { |
|
|
115 | unsigned long addr; |
|
|
116 | struct sockaddr_in *p_addr; |
|
|
117 | |
|
|
118 | p_addr = (struct sockaddr_in *) &ifr2.ifr_addr; |
|
|
119 | addr = htonl ((unsigned long)p_addr->sin_addr.s_addr); |
|
|
120 | |
|
|
121 | /* |
|
|
122 | * not "0.0.0.0" or "127.0.0.1" - so format the address |
|
|
123 | */ |
|
|
124 | if (addr && addr != 0x7F000001) |
|
|
125 | { |
|
|
126 | char *colon = strchr (display, ':'); |
|
|
127 | |
|
|
128 | if (colon == NULL) |
|
|
129 | colon = ":0.0"; |
|
|
130 | |
|
|
131 | rval = rxvt_malloc (strlen (colon) + 16); |
|
|
132 | sprintf (rval, "%d.%d.%d.%d%s", |
|
|
133 | (int) ((addr >> 030) & 0xFF), |
|
|
134 | (int) ((addr >> 020) & 0xFF), |
|
|
135 | (int) ((addr >> 010) & 0xFF), |
|
|
136 | (int) (addr & 0xFF), colon); |
|
|
137 | break; |
|
|
138 | } |
|
|
139 | } |
|
|
140 | } |
|
|
141 | |
|
|
142 | close (skfd); |
|
|
143 | |
|
|
144 | return rval; |
|
|
145 | } |
|
|
146 | #endif |
42 | |
147 | |
43 | const char *const def_colorName[] = |
148 | const char *const def_colorName[] = |
44 | { |
149 | { |
45 | COLOR_FOREGROUND, |
150 | COLOR_FOREGROUND, |
46 | COLOR_BACKGROUND, |
151 | COLOR_BACKGROUND, |
47 | /* low-intensity colors */ |
152 | /* low-intensity colors */ |
48 | "Black", /* 0: black (#000000) */ |
153 | "rgb:00/00/00", // 0: black (Black) |
49 | "Red3", /* 1: red (#CD0000) */ |
154 | "rgb:cd/00/00", // 1: red (Red3) |
50 | "Green3", /* 2: green (#00CD00) */ |
155 | "rgb:00/cd/00", // 2: green (Green3) |
51 | "Yellow3", /* 3: yellow (#CDCD00) */ |
156 | "rgb:cd/cd/00", // 3: yellow (Yellow3) |
52 | "Blue3", /* 4: blue (#0000CD) */ |
157 | "rgb:00/00/cd", // 4: blue (Blue3) |
53 | "Magenta3", /* 5: magenta (#CD00CD) */ |
158 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
54 | "Cyan3", /* 6: cyan (#00CDCD) */ |
159 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
55 | # ifdef XTERM_COLORS |
160 | # ifdef XTERM_COLORS |
56 | "Grey90", /* 7: white (#E5E5E5) */ |
161 | "rgb:e5/e5/e5", // 7: white (Grey90) |
57 | # else |
162 | # else |
58 | "AntiqueWhite", /* 7: white (#FAEBD7) */ |
163 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
59 | # endif |
164 | # endif |
60 | /* high-intensity colors */ |
165 | /* high-intensity colors */ |
61 | # ifdef XTERM_COLORS |
166 | # ifdef XTERM_COLORS |
62 | "Grey30", /* 8: bright black (#4D4D4D) */ |
167 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
63 | # else |
168 | # else |
64 | "Grey25", /* 8: bright black (#404040) */ |
169 | "rgb:40/40/40", // 8: bright black (Grey25) |
65 | # endif |
170 | # endif |
66 | "Red", /* 1/9: bright red (#FF0000) */ |
171 | "rgb:ff/00/00", // 1/9: bright red (Reed) |
67 | "Green", /* 2/10: bright green (#00FF00) */ |
172 | "rgb:00/ff/00", // 2/10: bright green (Green) |
68 | "Yellow", /* 3/11: bright yellow (#FFFF00) */ |
173 | "rgb:ff/ff/00", // 3/11: bright yellow (Yellow) |
69 | "Blue", /* 4/12: bright blue (#0000FF) */ |
174 | "rgb:00/00/ff", // 4/12: bright blue (Blue) |
70 | "Magenta", /* 5/13: bright magenta (#FF00FF) */ |
175 | "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) |
71 | "Cyan", /* 6/14: bright cyan (#00FFFF) */ |
176 | "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) |
72 | "White", /* 7/15: bright white (#FFFFFF) */ |
177 | "rgb:ff/ff/ff", // 7/15: bright white (White) |
73 | |
178 | |
74 | // 88 xterm colours |
179 | // 88 xterm colours |
75 | "rgb:00/00/00", |
180 | "rgb:00/00/00", |
76 | "rgb:00/00/8b", |
181 | "rgb:00/00/8b", |
77 | "rgb:00/00/cd", |
182 | "rgb:00/00/cd", |
… | |
… | |
146 | "rgb:e7/e7/e7", |
251 | "rgb:e7/e7/e7", |
147 | |
252 | |
148 | #ifndef NO_CURSORCOLOR |
253 | #ifndef NO_CURSORCOLOR |
149 | COLOR_CURSOR_BACKGROUND, |
254 | COLOR_CURSOR_BACKGROUND, |
150 | COLOR_CURSOR_FOREGROUND, |
255 | COLOR_CURSOR_FOREGROUND, |
151 | #endif /* ! NO_CURSORCOLOR */ |
256 | #endif /* ! NO_CURSORCOLOR */ |
152 | NULL, /* Color_pointer_fg */ |
257 | NULL, /* Color_pointer_fg */ |
153 | NULL, /* Color_pointer_bg */ |
258 | NULL, /* Color_pointer_bg */ |
154 | NULL, /* Color_border */ |
259 | NULL, /* Color_border */ |
155 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
260 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
156 | NULL, /* Color_BD */ |
261 | NULL, /* Color_BD */ |
157 | NULL, /* Color_IT */ |
262 | NULL, /* Color_IT */ |
158 | NULL, /* Color_UL */ |
263 | NULL, /* Color_UL */ |
159 | NULL, /* Color_RV */ |
264 | NULL, /* Color_RV */ |
160 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
265 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
161 | #if ENABLE_FRILLS |
266 | #if ENABLE_FRILLS |
162 | NULL, // Color_underline |
267 | NULL, // Color_underline |
163 | #endif |
268 | #endif |
164 | #ifdef OPTION_HC |
269 | #ifdef OPTION_HC |
165 | NULL, |
270 | NULL, |
166 | #endif |
271 | #endif |
167 | #ifdef KEEP_SCROLLCOLOR |
|
|
168 | COLOR_SCROLLBAR, |
272 | COLOR_SCROLLBAR, |
|
|
273 | #ifdef RXVT_SCROLLBAR |
169 | COLOR_SCROLLTROUGH, |
274 | COLOR_SCROLLTROUGH, |
170 | #endif /* KEEP_SCROLLCOLOR */ |
275 | #endif |
171 | #if TINTING |
276 | #if ENABLE_TRANSPARENCY |
172 | NULL, |
277 | NULL, |
173 | #endif |
278 | #endif |
174 | #if OFF_FOCUS_FADING |
279 | #if OFF_FOCUS_FADING |
175 | "black", |
280 | "rgb:00/00/00", |
176 | #endif |
281 | #endif |
177 | }; |
282 | }; |
178 | |
283 | |
179 | const char *const xa_names[] = |
284 | void |
180 | { |
|
|
181 | "TEXT", |
|
|
182 | "COMPOUND_TEXT", |
|
|
183 | "UTF8_STRING", |
|
|
184 | "MULTIPLE", |
|
|
185 | "TARGETS", |
|
|
186 | "TIMESTAMP", |
|
|
187 | "VT_SELECTION", |
|
|
188 | "INCR", |
|
|
189 | "WM_PROTOCOLS", |
|
|
190 | "WM_DELETE_WINDOW", |
|
|
191 | "CLIPBOARD", |
|
|
192 | #if ENABLE_FRILLS |
|
|
193 | "_MOTIF_WM_HINTS", |
|
|
194 | #endif |
|
|
195 | #if ENABLE_EWMH |
|
|
196 | "_NET_WM_PID", |
|
|
197 | "_NET_WM_NAME", |
|
|
198 | "_NET_WM_ICON_NAME", |
|
|
199 | "_NET_WM_PING", |
|
|
200 | #endif |
|
|
201 | #if USE_XIM |
|
|
202 | "WM_LOCALE_NAME", |
|
|
203 | #endif |
|
|
204 | #ifdef TRANSPARENT |
|
|
205 | "_XROOTPMAP_ID", |
|
|
206 | "ESETROOT_PMAP_ID", |
|
|
207 | #endif |
|
|
208 | #ifdef OFFIX_DND |
|
|
209 | "DndProtocol", |
|
|
210 | "DndSelection", |
|
|
211 | #endif |
|
|
212 | #if ENABLE_XEMBED |
|
|
213 | "_XEMBED", |
|
|
214 | "_XEMBED_INFO", |
|
|
215 | #endif |
|
|
216 | }; |
|
|
217 | |
|
|
218 | bool |
|
|
219 | rxvt_term::init_vars () |
285 | rxvt_term::init_vars () |
220 | { |
286 | { |
221 | pix_colors_focused = new rxvt_color [TOTAL_COLORS]; |
|
|
222 | #ifdef OFF_FOCUS_FADING |
|
|
223 | pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; |
|
|
224 | #endif |
|
|
225 | pix_colors = pix_colors_focused; |
287 | pix_colors = pix_colors_focused; |
226 | |
|
|
227 | if (pix_colors == NULL) |
|
|
228 | return false; |
|
|
229 | |
|
|
230 | #if defined(XPM_BACKGROUND) || defined(TRANSPARENT) |
|
|
231 | pixmap = None; |
|
|
232 | #endif |
|
|
233 | |
288 | |
234 | MEvent.time = CurrentTime; |
289 | MEvent.time = CurrentTime; |
235 | MEvent.button = AnyButton; |
290 | MEvent.button = AnyButton; |
236 | options = DEFAULT_OPTIONS; |
|
|
237 | want_refresh = 1; |
291 | want_refresh = 1; |
238 | priv_modes = SavedModes = PrivMode_Default; |
292 | priv_modes = SavedModes = PrivMode_Default; |
239 | focus = 0; |
|
|
240 | ncol = 80; |
293 | ncol = 80; |
241 | nrow = 24; |
294 | nrow = 24; |
242 | int_bwidth = INTERNALBORDERWIDTH; |
295 | int_bwidth = INTERNALBORDERWIDTH; |
243 | ext_bwidth = EXTERNALBORDERWIDTH; |
296 | ext_bwidth = EXTERNALBORDERWIDTH; |
244 | lineSpace = LINESPACE; |
297 | lineSpace = LINESPACE; |
245 | saveLines = SAVELINES; |
298 | saveLines = SAVELINES; |
246 | numpix_colors = TOTAL_COLORS; |
|
|
247 | |
299 | |
248 | refresh_limit = 1; |
|
|
249 | refresh_type = SLOW_REFRESH; |
300 | refresh_type = SLOW_REFRESH; |
250 | prev_nrow = prev_ncol = 0; |
|
|
251 | |
301 | |
252 | oldcursor.row = oldcursor.col = -1; |
302 | oldcursor.row = oldcursor.col = -1; |
253 | #ifdef XPM_BACKGROUND |
|
|
254 | /* bgPixmap.w = bgPixmap.h = 0; */ |
|
|
255 | bgPixmap.x = bgPixmap.y = 50; |
|
|
256 | bgPixmap.pixmap = None; |
|
|
257 | #endif |
|
|
258 | |
303 | |
259 | last_bot = last_state = -1; |
304 | set_option (Opt_scrollBar); |
260 | |
305 | set_option (Opt_scrollTtyOutput); |
261 | return true; |
306 | set_option (Opt_jumpScroll); |
|
|
307 | set_option (Opt_skipScroll); |
|
|
308 | set_option (Opt_secondaryScreen); |
|
|
309 | set_option (Opt_secondaryScroll); |
|
|
310 | set_option (Opt_pastableTabs); |
|
|
311 | set_option (Opt_intensityStyles); |
|
|
312 | set_option (Opt_iso14755_52); |
|
|
313 | set_option (Opt_buffered); |
262 | } |
314 | } |
263 | |
315 | |
264 | void |
316 | static void |
265 | rxvt_term::init_secondary () |
317 | init_secondary () |
266 | { |
318 | { |
267 | int i; |
319 | int i; |
268 | |
320 | |
269 | /* |
|
|
270 | * Close all unused file descriptors |
|
|
271 | * We don't want them, we don't need them. |
|
|
272 | */ |
|
|
273 | if ((i = open ("/dev/null", O_RDONLY)) < 0) |
321 | if ((i = open ("/dev/null", O_RDONLY)) < 0) |
274 | { |
322 | { |
275 | /* TODO: BOO HISS */ |
|
|
276 | dup2 (STDERR_FILENO, STDIN_FILENO); |
323 | dup2 (STDERR_FILENO, STDIN_FILENO); |
277 | } |
324 | } |
278 | else if (i > STDIN_FILENO) |
325 | else if (i != STDIN_FILENO) |
279 | { |
326 | { |
280 | dup2 (i, STDIN_FILENO); |
327 | dup2 (i, STDIN_FILENO); |
281 | close (i); |
328 | close (i); |
282 | } |
329 | } |
283 | |
330 | |
284 | dup2 (STDERR_FILENO, STDOUT_FILENO); |
331 | dup2 (STDERR_FILENO, STDOUT_FILENO); |
285 | |
|
|
286 | #if 0 // schmorp sayz closing filies is murder |
|
|
287 | for (i = STDERR_FILENO + 1; i < num_fds; i++) |
|
|
288 | { |
|
|
289 | #ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ |
|
|
290 | if (i == 4 || i == 7) |
|
|
291 | continue; |
|
|
292 | #endif |
|
|
293 | close (i); |
|
|
294 | } |
|
|
295 | #endif |
|
|
296 | } |
332 | } |
297 | |
333 | |
298 | /*----------------------------------------------------------------------*/ |
334 | /*----------------------------------------------------------------------*/ |
299 | const char ** |
335 | const char ** |
300 | rxvt_term::init_resources (int argc, const char *const *argv) |
336 | rxvt_term::init_resources (int argc, const char *const *argv) |
301 | { |
337 | { |
302 | int i, r_argc; |
338 | int i, r_argc; |
303 | char *val; |
|
|
304 | const char **cmd_argv, **r_argv; |
339 | const char **cmd_argv, **r_argv; |
305 | |
340 | |
306 | /* |
341 | /* |
307 | * Look for -exec option. Find => split and make cmd_argv[] of command args |
342 | * Look for -e option. Find => split and make cmd_argv[] of command args |
308 | */ |
343 | */ |
309 | for (r_argc = 0; r_argc < argc; r_argc++) |
344 | for (r_argc = 0; r_argc < argc; r_argc++) |
310 | if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) |
345 | if (!strcmp (argv[r_argc], "-e")) |
311 | break; |
346 | break; |
|
|
347 | |
|
|
348 | if (r_argc == argc) |
|
|
349 | cmd_argv = NULL; |
|
|
350 | else if (!argv[r_argc + 1]) |
|
|
351 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
352 | else |
|
|
353 | { |
|
|
354 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
|
|
355 | |
|
|
356 | for (i = 0; i < argc - r_argc - 1; i++) |
|
|
357 | cmd_argv[i] = (const char *)argv[i + r_argc + 1]; |
|
|
358 | |
|
|
359 | cmd_argv[i] = NULL; |
|
|
360 | } |
312 | |
361 | |
313 | r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); |
362 | r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); |
314 | |
363 | |
315 | for (i = 0; i < r_argc; i++) |
364 | for (i = 0; i < r_argc; i++) |
316 | r_argv[i] = (const char *)argv[i]; |
365 | r_argv[i] = (const char *)argv[i]; |
317 | |
366 | |
318 | r_argv[i] = NULL; |
367 | r_argv[i] = NULL; |
319 | |
368 | |
320 | if (r_argc == argc) |
|
|
321 | cmd_argv = NULL; |
|
|
322 | else |
|
|
323 | { |
|
|
324 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
|
|
325 | |
|
|
326 | for (i = 0; i < argc - r_argc - 1; i++) |
|
|
327 | cmd_argv[i] = (const char *)argv[i + r_argc + 1]; |
|
|
328 | |
|
|
329 | cmd_argv[i] = NULL; |
|
|
330 | } |
|
|
331 | |
|
|
332 | rs[Rs_name] = rxvt_r_basename (argv[0]); |
369 | rs[Rs_name] = rxvt_basename (argv[0]); |
333 | |
370 | |
334 | /* |
371 | /* |
335 | * Open display, get options/resources and create the window |
372 | * Open display, get options/resources and create the window |
336 | */ |
373 | */ |
337 | |
374 | |
… | |
… | |
339 | rs[Rs_display_name] = ":0"; |
376 | rs[Rs_display_name] = ":0"; |
340 | |
377 | |
341 | get_options (r_argc, r_argv); |
378 | get_options (r_argc, r_argv); |
342 | |
379 | |
343 | if (!(display = displays.get (rs[Rs_display_name]))) |
380 | if (!(display = displays.get (rs[Rs_display_name]))) |
|
|
381 | { |
|
|
382 | free (r_argv); |
344 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
383 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
|
|
384 | } |
345 | |
385 | |
|
|
386 | // using a local pointer decreases code size a lot |
|
|
387 | xa = display->xa; |
|
|
388 | |
|
|
389 | set (display); |
346 | extract_resources (); |
390 | extract_resources (); |
347 | |
391 | |
|
|
392 | #if XFT |
|
|
393 | if (rs[Rs_depth]) |
|
|
394 | select_visual (strtol (rs[Rs_depth], 0, 0)); |
|
|
395 | #endif |
|
|
396 | |
348 | free (r_argv); |
397 | free (r_argv); |
|
|
398 | |
|
|
399 | for (int i = NUM_RESOURCES; i--; ) |
|
|
400 | if (rs [i] == resval_undef) |
|
|
401 | rs [i] = 0; |
|
|
402 | |
|
|
403 | #ifdef HAVE_AFTERIMAGE |
|
|
404 | set_application_name ((char *)rs[Rs_name]); |
|
|
405 | set_output_threshold (OUTPUT_LEVEL_WARNING); |
|
|
406 | #endif |
|
|
407 | |
|
|
408 | #if ENABLE_PERL |
|
|
409 | if (!rs[Rs_perl_ext_1]) |
|
|
410 | rs[Rs_perl_ext_1] = "default"; |
|
|
411 | |
|
|
412 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
|
|
413 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
|
|
414 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
415 | { |
|
|
416 | rxvt_perl.init (this); |
|
|
417 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
|
|
418 | } |
|
|
419 | #endif |
349 | |
420 | |
350 | /* |
421 | /* |
351 | * set any defaults not already set |
422 | * set any defaults not already set |
352 | */ |
423 | */ |
353 | if (cmd_argv && cmd_argv[0]) |
424 | if (cmd_argv && cmd_argv[0]) |
354 | { |
425 | { |
355 | if (!rs[Rs_title]) |
426 | if (!rs[Rs_title]) |
356 | rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); |
427 | rs[Rs_title] = rxvt_basename (cmd_argv[0]); |
|
|
428 | |
357 | if (!rs[Rs_iconName]) |
429 | if (!rs[Rs_iconName]) |
358 | rs[Rs_iconName] = rs[Rs_title]; |
430 | rs[Rs_iconName] = rs[Rs_title]; |
359 | } |
431 | } |
360 | else |
432 | else |
361 | { |
433 | { |
362 | if (!rs[Rs_title]) |
434 | if (!rs[Rs_title]) |
363 | rs[Rs_title] = rs[Rs_name]; |
435 | rs[Rs_title] = rs[Rs_name]; |
|
|
436 | |
364 | if (!rs[Rs_iconName]) |
437 | if (!rs[Rs_iconName]) |
365 | rs[Rs_iconName] = rs[Rs_name]; |
438 | rs[Rs_iconName] = rs[Rs_name]; |
366 | } |
439 | } |
367 | |
440 | |
368 | if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) |
441 | if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) |
… | |
… | |
388 | |
461 | |
389 | /* no point having a scrollbar without having any scrollback! */ |
462 | /* no point having a scrollbar without having any scrollback! */ |
390 | if (!saveLines) |
463 | if (!saveLines) |
391 | set_option (Opt_scrollBar, 0); |
464 | set_option (Opt_scrollBar, 0); |
392 | |
465 | |
393 | #ifdef PRINTPIPE |
|
|
394 | if (!rs[Rs_print_pipe]) |
|
|
395 | rs[Rs_print_pipe] = PRINTPIPE; |
|
|
396 | #endif |
|
|
397 | |
|
|
398 | if (!rs[Rs_cutchars]) |
466 | if (!rs[Rs_cutchars]) |
399 | rs[Rs_cutchars] = CUTCHARS; |
467 | rs[Rs_cutchars] = CUTCHARS; |
400 | |
468 | |
401 | #ifndef NO_BACKSPACE_KEY |
469 | #ifndef NO_BACKSPACE_KEY |
402 | if (!rs[Rs_backspace_key]) |
470 | if (!rs[Rs_backspace_key]) |
403 | # ifdef DEFAULT_BACKSPACE |
471 | # ifdef DEFAULT_BACKSPACE |
404 | key_backspace = DEFAULT_BACKSPACE; |
472 | rs[Rs_backspace_key] = DEFAULT_BACKSPACE; |
405 | # else |
473 | # else |
406 | key_backspace = "DEC"; /* can toggle between \010 or \177 */ |
474 | rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */ |
407 | # endif |
475 | # endif |
408 | else |
|
|
409 | { |
|
|
410 | val = strdup (rs[Rs_backspace_key]); |
|
|
411 | rxvt_Str_trim (val); |
|
|
412 | rxvt_Str_escaped (val); |
|
|
413 | key_backspace = val; |
|
|
414 | } |
|
|
415 | #endif |
476 | #endif |
416 | |
477 | |
417 | #ifndef NO_DELETE_KEY |
478 | #ifndef NO_DELETE_KEY |
418 | if (!rs[Rs_delete_key]) |
479 | if (!rs[Rs_delete_key]) |
419 | # ifdef DEFAULT_DELETE |
480 | # ifdef DEFAULT_DELETE |
420 | key_delete = DEFAULT_DELETE; |
481 | rs[Rs_delete_key] = DEFAULT_DELETE; |
421 | # else |
482 | # else |
422 | key_delete = "\033[3~"; |
483 | rs[Rs_delete_key] = "\033[3~"; |
423 | # endif |
|
|
424 | else |
|
|
425 | { |
|
|
426 | val = strdup (rs[Rs_delete_key]); |
|
|
427 | rxvt_Str_trim (val); |
|
|
428 | rxvt_Str_escaped (val); |
|
|
429 | key_delete = val; |
|
|
430 | } |
|
|
431 | #endif |
484 | # endif |
432 | if (rs[Rs_answerbackstring]) |
|
|
433 | { |
|
|
434 | rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); |
|
|
435 | rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); |
|
|
436 | } |
|
|
437 | |
|
|
438 | #ifdef HAVE_SCROLLBARS |
|
|
439 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
|
|
440 | #endif |
485 | #endif |
|
|
486 | |
|
|
487 | scrollBar.setup (this); |
441 | |
488 | |
442 | #ifdef XTERM_REVERSE_VIDEO |
489 | #ifdef XTERM_REVERSE_VIDEO |
443 | /* this is how xterm implements reverseVideo */ |
490 | /* this is how xterm implements reverseVideo */ |
444 | if (OPTION (Opt_reverseVideo)) |
491 | if (option (Opt_reverseVideo)) |
445 | { |
492 | { |
446 | if (!rs[Rs_color + Color_fg]) |
493 | if (!rs[Rs_color + Color_fg]) |
447 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
494 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
|
|
495 | |
448 | if (!rs[Rs_color + Color_bg]) |
496 | if (!rs[Rs_color + Color_bg]) |
449 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
497 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
450 | } |
498 | } |
451 | #endif |
499 | #endif |
452 | |
500 | |
… | |
… | |
454 | if (!rs[Rs_color + i]) |
502 | if (!rs[Rs_color + i]) |
455 | rs[Rs_color + i] = def_colorName[i]; |
503 | rs[Rs_color + i] = def_colorName[i]; |
456 | |
504 | |
457 | #ifndef XTERM_REVERSE_VIDEO |
505 | #ifndef XTERM_REVERSE_VIDEO |
458 | /* this is how we implement reverseVideo */ |
506 | /* this is how we implement reverseVideo */ |
459 | if (OPTION (Opt_reverseVideo)) |
507 | if (option (Opt_reverseVideo)) |
460 | ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); |
508 | ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); |
461 | #endif |
509 | #endif |
462 | |
510 | |
463 | /* convenient aliases for setting fg/bg to colors */ |
511 | /* convenient aliases for setting fg/bg to colors */ |
464 | color_aliases (Color_fg); |
512 | color_aliases (Color_fg); |
465 | color_aliases (Color_bg); |
513 | color_aliases (Color_bg); |
466 | #ifndef NO_CURSORCOLOR |
514 | #ifndef NO_CURSORCOLOR |
467 | color_aliases (Color_cursor); |
515 | color_aliases (Color_cursor); |
468 | color_aliases (Color_cursor2); |
516 | color_aliases (Color_cursor2); |
469 | #endif /* NO_CURSORCOLOR */ |
517 | #endif /* NO_CURSORCOLOR */ |
470 | color_aliases (Color_pointer_fg); |
518 | color_aliases (Color_pointer_fg); |
471 | color_aliases (Color_pointer_bg); |
519 | color_aliases (Color_pointer_bg); |
472 | color_aliases (Color_border); |
520 | color_aliases (Color_border); |
473 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
521 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
474 | color_aliases (Color_BD); |
522 | color_aliases (Color_BD); |
475 | color_aliases (Color_UL); |
523 | color_aliases (Color_UL); |
476 | color_aliases (Color_RV); |
524 | color_aliases (Color_RV); |
477 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
525 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
478 | |
526 | |
479 | if (!rs[Rs_color + Color_border]) |
527 | if (!rs[Rs_color + Color_border]) |
480 | rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; |
528 | rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; |
481 | |
529 | |
482 | return cmd_argv; |
530 | return cmd_argv; |
|
|
531 | } |
|
|
532 | |
|
|
533 | /*----------------------------------------------------------------------*/ |
|
|
534 | void |
|
|
535 | rxvt_term::init (int argc, const char *const *argv, stringvec *envv) |
|
|
536 | { |
|
|
537 | this->envv = envv; |
|
|
538 | |
|
|
539 | SET_R (this); |
|
|
540 | set_locale (""); |
|
|
541 | set_environ (envv); // a few things in X do not call setlocale :( |
|
|
542 | |
|
|
543 | init_vars (); |
|
|
544 | |
|
|
545 | init_secondary (); |
|
|
546 | |
|
|
547 | const char **cmd_argv = init_resources (argc, argv); |
|
|
548 | |
|
|
549 | #ifdef KEYSYM_RESOURCE |
|
|
550 | keyboard->register_done (); |
|
|
551 | #endif |
|
|
552 | |
|
|
553 | if (const char *path = rs[Rs_chdir]) |
|
|
554 | if (*path) // ignored if empty |
|
|
555 | { |
|
|
556 | if (*path != '/') |
|
|
557 | rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n"); |
|
|
558 | |
|
|
559 | if (chdir (path)) |
|
|
560 | rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); |
|
|
561 | } |
|
|
562 | |
|
|
563 | if (option (Opt_scrollBar)) |
|
|
564 | scrollBar.state = STATE_IDLE; /* set existence for size calculations */ |
|
|
565 | |
|
|
566 | pty = ptytty::create (); |
|
|
567 | |
|
|
568 | create_windows (argc, argv); |
|
|
569 | |
|
|
570 | init_xlocale (); |
|
|
571 | |
|
|
572 | scr_poweron (); // initialize screen |
|
|
573 | |
|
|
574 | #if 0 |
|
|
575 | XSynchronize (dpy, True); |
|
|
576 | #endif |
|
|
577 | |
|
|
578 | if (option (Opt_scrollBar)) |
|
|
579 | scrollBar.resize (); /* create and map scrollbar */ |
|
|
580 | #ifdef HAVE_BG_PIXMAP |
|
|
581 | { |
|
|
582 | bgPixmap.set_target (this); |
|
|
583 | bgPixmap.invalidate (); |
|
|
584 | |
|
|
585 | #ifdef ENABLE_TRANSPARENCY |
|
|
586 | if (option (Opt_transparent)) |
|
|
587 | { |
|
|
588 | bgPixmap.set_transparent (); |
|
|
589 | |
|
|
590 | #ifdef HAVE_AFTERIMAGE |
|
|
591 | if (rs [Rs_blurradius]) |
|
|
592 | bgPixmap.set_blur_radius (rs [Rs_blurradius]); |
|
|
593 | #endif |
|
|
594 | if (ISSET_PIXCOLOR (Color_tint)) |
|
|
595 | bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
|
|
596 | |
|
|
597 | if (rs [Rs_shade]) |
|
|
598 | bgPixmap.set_shade (rs [Rs_shade]); |
|
|
599 | |
|
|
600 | bgPixmap.set_root_pixmap (); |
|
|
601 | XSelectInput (dpy, display->root, PropertyChangeMask); |
|
|
602 | rootwin_ev.start (display, display->root); |
|
|
603 | } |
|
|
604 | #endif |
|
|
605 | |
|
|
606 | #ifdef BG_IMAGE_FROM_FILE |
|
|
607 | if (rs[Rs_backgroundPixmap]) |
|
|
608 | { |
|
|
609 | const char *p = rs[Rs_backgroundPixmap]; |
|
|
610 | |
|
|
611 | if ((p = strchr (p, ';')) != 0) |
|
|
612 | { |
|
|
613 | p++; |
|
|
614 | bgPixmap.set_geometry (p); |
|
|
615 | } |
|
|
616 | else |
|
|
617 | bgPixmap.set_defaultGeometry (); |
|
|
618 | |
|
|
619 | if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) |
|
|
620 | if (!bgPixmap.window_position_sensitive ()) |
|
|
621 | update_background (); |
|
|
622 | } |
|
|
623 | #endif |
|
|
624 | } |
|
|
625 | #endif |
|
|
626 | |
|
|
627 | #if ENABLE_PERL |
|
|
628 | rootwin_ev.start (display, display->root); |
|
|
629 | #endif |
|
|
630 | |
|
|
631 | set_colorfgbg (); |
|
|
632 | |
|
|
633 | init_command (cmd_argv); |
|
|
634 | |
|
|
635 | free (cmd_argv); |
|
|
636 | |
|
|
637 | if (pty->pty >= 0) |
|
|
638 | pty_ev.start (pty->pty, ev::READ); |
|
|
639 | |
|
|
640 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
|
|
641 | |
|
|
642 | #if ENABLE_XEMBED |
|
|
643 | if (rs[Rs_embed]) |
|
|
644 | { |
|
|
645 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
646 | |
|
|
647 | XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
648 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
649 | } |
|
|
650 | #endif |
|
|
651 | |
|
|
652 | XMapWindow (dpy, vt); |
|
|
653 | XMapWindow (dpy, parent[0]); |
|
|
654 | |
|
|
655 | refresh_check (); |
483 | } |
656 | } |
484 | |
657 | |
485 | /*----------------------------------------------------------------------*/ |
658 | /*----------------------------------------------------------------------*/ |
486 | void |
659 | void |
487 | rxvt_term::init_env () |
660 | rxvt_term::init_env () |
488 | { |
661 | { |
489 | int i; |
662 | int i; |
490 | unsigned int u; |
|
|
491 | char *val; |
663 | char *val; |
492 | |
664 | |
493 | #ifdef DISPLAY_IS_IP |
665 | #ifdef DISPLAY_IS_IP |
494 | /* Fixup display_name for export over pty to any interested terminal |
666 | /* Fixup display_name for export over pty to any interested terminal |
495 | * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number |
667 | * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number |
… | |
… | |
503 | */ |
675 | */ |
504 | val = rxvt_network_display (rs[Rs_display_name]); |
676 | val = rxvt_network_display (rs[Rs_display_name]); |
505 | rs[Rs_display_name] = (const char *)val; |
677 | rs[Rs_display_name] = (const char *)val; |
506 | |
678 | |
507 | if (val == NULL) |
679 | if (val == NULL) |
508 | #endif /* DISPLAY_IS_IP */ |
680 | #endif /* DISPLAY_IS_IP */ |
509 | val = XDisplayString (display->display); |
681 | val = XDisplayString (dpy); |
510 | |
682 | |
511 | if (rs[Rs_display_name] == NULL) |
683 | if (rs[Rs_display_name] == NULL) |
512 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
684 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
513 | |
685 | |
514 | i = strlen (val); |
686 | i = strlen (val); |
515 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
687 | env_display = (char *)rxvt_malloc (i + 9); |
516 | |
688 | |
517 | sprintf (env_display, "DISPLAY=%s", val); |
689 | sprintf (env_display, "DISPLAY=%s", val); |
518 | |
690 | |
519 | /* avoiding the math library: |
691 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); |
520 | * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */ |
|
|
521 | for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++) |
|
|
522 | ; |
|
|
523 | max_it (i, 1); |
|
|
524 | env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); |
|
|
525 | |
|
|
526 | sprintf (env_windowid, "WINDOWID=%u", |
|
|
527 | (unsigned int)parent[0]); |
|
|
528 | |
692 | |
529 | /* add entries to the environment: |
693 | /* add entries to the environment: |
530 | * @ DISPLAY: in case we started with -display |
694 | * @ DISPLAY: in case we started with -display |
531 | * @ WINDOWID: X window id number of the window |
695 | * @ WINDOWID: X window id number of the window |
532 | * @ COLORTERM: terminal sub-name and also indicates its color |
696 | * @ COLORTERM: terminal sub-name and also indicates its color |
… | |
… | |
534 | * @ TERMINFO: path to terminfo directory |
698 | * @ TERMINFO: path to terminfo directory |
535 | * @ COLORFGBG: fg;bg color codes |
699 | * @ COLORFGBG: fg;bg color codes |
536 | */ |
700 | */ |
537 | putenv (env_display); |
701 | putenv (env_display); |
538 | putenv (env_windowid); |
702 | putenv (env_windowid); |
|
|
703 | |
539 | if (env_colorfgbg) |
704 | if (env_colorfgbg) |
540 | putenv (env_colorfgbg); |
705 | putenv (env_colorfgbg); |
541 | |
706 | |
542 | #ifdef RXVT_TERMINFO |
707 | #ifdef RXVT_TERMINFO |
543 | putenv ("TERMINFO=" RXVT_TERMINFO); |
708 | putenv ("TERMINFO=" RXVT_TERMINFO); |
544 | #endif |
709 | #endif |
545 | |
710 | |
546 | if (display->depth <= 2) |
711 | if (depth <= 2) |
547 | putenv ("COLORTERM=" COLORTERMENV "-mono"); |
712 | putenv ("COLORTERM=" COLORTERMENV "-mono"); |
548 | else |
713 | else |
549 | putenv ("COLORTERM=" COLORTERMENVFULL); |
714 | putenv ("COLORTERM=" COLORTERMENVFULL); |
550 | |
715 | |
551 | if (rs[Rs_term_name] != NULL) |
716 | if (rs[Rs_term_name] != NULL) |
552 | { |
717 | { |
553 | env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); |
718 | env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); |
554 | sprintf (env_term, "TERM=%s", rs[Rs_term_name]); |
719 | sprintf (env_term, "TERM=%s", rs[Rs_term_name]); |
555 | putenv (env_term); |
720 | putenv (env_term); |
556 | } |
721 | } |
557 | else |
722 | else |
558 | putenv ("TERM=" TERMENV); |
723 | putenv ("TERM=" TERMENV); |
… | |
… | |
560 | #ifdef HAVE_UNSETENV |
725 | #ifdef HAVE_UNSETENV |
561 | /* avoid passing old settings and confusing term size */ |
726 | /* avoid passing old settings and confusing term size */ |
562 | unsetenv ("LINES"); |
727 | unsetenv ("LINES"); |
563 | unsetenv ("COLUMNS"); |
728 | unsetenv ("COLUMNS"); |
564 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
729 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
565 | #endif /* HAVE_UNSETENV */ |
730 | #endif /* HAVE_UNSETENV */ |
566 | } |
731 | } |
567 | |
732 | |
568 | /*----------------------------------------------------------------------*/ |
733 | /*----------------------------------------------------------------------*/ |
569 | /* |
734 | /* |
570 | * This is more or less stolen straight from XFree86 xterm. |
735 | * This is more or less stolen straight from XFree86 xterm. |
… | |
… | |
591 | |
756 | |
592 | this->locale = "C"; |
757 | this->locale = "C"; |
593 | } |
758 | } |
594 | |
759 | |
595 | |
760 | |
596 | this->locale = rxvt_strdup (this->locale); |
761 | this->locale = strdup (this->locale); |
597 | SET_LOCALE (this->locale); |
762 | SET_LOCALE (this->locale); |
598 | mbstate.reset (); |
763 | mbstate.reset (); |
599 | #endif |
764 | #endif |
600 | |
765 | |
601 | #if HAVE_NL_LANGINFO |
766 | #if HAVE_NL_LANGINFO |
… | |
… | |
645 | * Initialize the command connection. |
810 | * Initialize the command connection. |
646 | * This should be called after the X server connection is established. |
811 | * This should be called after the X server connection is established. |
647 | */ |
812 | */ |
648 | |
813 | |
649 | #ifdef META8_OPTION |
814 | #ifdef META8_OPTION |
650 | meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; |
815 | meta_char = option (Opt_meta8) ? 0x80 : C0_ESC; |
651 | #endif |
816 | #endif |
652 | |
817 | |
653 | get_ourmods (); |
818 | get_ourmods (); |
654 | |
819 | |
655 | if (!OPTION (Opt_scrollTtyOutput)) |
820 | if (!option (Opt_scrollTtyOutput)) |
656 | priv_modes |= PrivMode_TtyOutputInh; |
821 | priv_modes |= PrivMode_TtyOutputInh; |
657 | if (OPTION (Opt_scrollTtyKeypress)) |
822 | if (option (Opt_scrollTtyKeypress)) |
658 | priv_modes |= PrivMode_Keypress; |
823 | priv_modes |= PrivMode_Keypress; |
659 | if (!OPTION (Opt_jumpScroll)) |
824 | if (!option (Opt_jumpScroll)) |
660 | priv_modes |= PrivMode_smoothScroll; |
825 | priv_modes |= PrivMode_smoothScroll; |
661 | |
826 | |
662 | #ifndef NO_BACKSPACE_KEY |
827 | #ifndef NO_BACKSPACE_KEY |
663 | if (strcmp (key_backspace, "DEC") == 0) |
828 | if (strcmp (rs[Rs_backspace_key], "DEC") == 0) |
664 | priv_modes |= PrivMode_HaveBackSpace; |
829 | priv_modes |= PrivMode_HaveBackSpace; |
665 | #endif |
830 | #endif |
666 | |
831 | |
667 | /* add value for scrollBar */ |
832 | /* add value for scrollBar */ |
668 | if (scrollBar.state) |
833 | if (scrollBar.state) |
… | |
… | |
674 | run_command (argv); |
839 | run_command (argv); |
675 | } |
840 | } |
676 | |
841 | |
677 | /*----------------------------------------------------------------------*/ |
842 | /*----------------------------------------------------------------------*/ |
678 | void |
843 | void |
679 | rxvt_term::Get_Colours () |
844 | rxvt_term::get_colours () |
680 | { |
845 | { |
681 | int i; |
846 | int i; |
682 | |
847 | |
683 | #ifdef OFF_FOCUS_FADING |
848 | #ifdef OFF_FOCUS_FADING |
684 | pix_colors = pix_colors_focused; |
849 | pix_colors = pix_colors_focused; |
685 | #endif |
850 | #endif |
686 | |
851 | |
687 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
852 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
688 | { |
853 | { |
|
|
854 | const char *name = rs[Rs_color + i]; |
|
|
855 | |
|
|
856 | if (!name) |
|
|
857 | continue; |
|
|
858 | |
689 | rxvt_color xcol; |
859 | rxvt_color xcol; |
690 | |
860 | |
691 | if (!rs[Rs_color + i]) |
861 | if (!set_color (xcol, name)) |
692 | continue; |
|
|
693 | |
|
|
694 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
|
|
695 | { |
862 | { |
696 | #ifndef XTERM_REVERSE_VIDEO |
863 | #ifndef XTERM_REVERSE_VIDEO |
697 | if (i < 2 && OPTION (Opt_reverseVideo)) |
864 | if (i < 2 && option (Opt_reverseVideo)) |
698 | rs[Rs_color + i] = def_colorName[!i]; |
865 | name = def_colorName [1 - i]; |
699 | else |
866 | else |
700 | #endif |
867 | #endif |
701 | rs[Rs_color + i] = def_colorName[i]; |
868 | name = def_colorName [i]; |
702 | |
869 | |
703 | if (!rs[Rs_color + i]) |
870 | if (!name) |
704 | continue; |
871 | continue; |
705 | |
872 | |
706 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
873 | if (!set_color (xcol, name)) |
707 | { |
874 | { |
708 | switch (i) |
875 | switch (i) |
709 | { |
876 | { |
710 | case Color_fg: |
877 | case Color_fg: |
711 | case Color_bg: |
878 | case Color_bg: |
712 | /* fatal: need bg/fg color */ |
|
|
713 | rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); |
879 | rxvt_warn ("unable to get foreground/background colour, continuing.\n"); |
714 | /* NOTREACHED */ |
880 | name = ""; |
715 | break; |
881 | break; |
716 | #ifndef NO_CURSORCOLOR |
882 | #ifndef NO_CURSORCOLOR |
717 | case Color_cursor2: |
883 | case Color_cursor2: |
718 | xcol = pix_colors[Color_fg]; |
884 | #endif |
719 | break; |
|
|
720 | #endif /* ! NO_CURSORCOLOR */ |
|
|
721 | case Color_pointer_fg: |
885 | case Color_pointer_fg: |
722 | xcol = pix_colors[Color_fg]; |
886 | name = rs[Rs_color + Color_fg]; |
|
|
887 | xcol.set (this, name); |
723 | break; |
888 | break; |
724 | default: |
889 | default: |
725 | xcol = pix_colors[Color_bg]; /* None */ |
890 | name = rs[Rs_color + Color_bg]; |
|
|
891 | xcol.set (this, name); |
726 | break; |
892 | break; |
727 | } |
893 | } |
728 | } |
894 | } |
729 | } |
895 | } |
730 | |
896 | |
731 | pix_colors[i] = xcol; |
897 | pix_colors[i] = xcol; |
732 | SET_PIXCOLOR (i); |
898 | rs[Rs_color + i] = name; |
733 | } |
|
|
734 | |
|
|
735 | #ifdef OFF_FOCUS_FADING |
|
|
736 | if (rs[Rs_fade]) |
|
|
737 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
|
|
738 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
|
|
739 | #endif |
|
|
740 | |
|
|
741 | if (display->depth <= 2) |
|
|
742 | { |
899 | } |
|
|
900 | |
|
|
901 | if (depth <= 2) |
|
|
902 | { |
743 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
903 | if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg); |
744 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
904 | if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg); |
745 | if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; |
905 | if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg); |
746 | } |
906 | } |
747 | |
907 | |
748 | /* |
908 | /* |
749 | * get scrollBar shadow colors |
909 | * get scrollBar shadow colors |
750 | * |
910 | * |
751 | * The calculations of topShadow/bottomShadow values are adapted |
911 | * The calculations of topShadow/bottomShadow values are adapted |
752 | * from the fvwm window manager. |
912 | * from the fvwm window manager. |
753 | */ |
913 | */ |
754 | #ifdef KEEP_SCROLLCOLOR |
914 | #ifdef RXVT_SCROLLBAR |
755 | |
|
|
756 | if (display->depth <= 2) |
915 | if (depth <= 2) |
757 | { |
916 | { |
758 | /* Monochrome */ |
917 | /* Monochrome */ |
759 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
918 | alias_color (Color_scroll, Color_fg); |
760 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
919 | alias_color (Color_topShadow, Color_bg); |
761 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
920 | alias_color (Color_bottomShadow, Color_bg); |
762 | } |
921 | } |
763 | else |
922 | else |
764 | { |
923 | { |
765 | rxvt_color xcol[2]; |
924 | pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); |
766 | /* xcol[0] == white |
|
|
767 | * xcol[1] == top shadow |
|
|
768 | * xcol[2] == bot shadow */ |
|
|
769 | |
925 | |
770 | xcol[1] = pix_colors[Color_scroll]; |
926 | rgba cscroll; |
771 | xcol[0].set (display, 65535, 65535, 65535); |
927 | pix_colors [Color_scroll].get (cscroll); |
772 | |
|
|
773 | unsigned short pr1, pg1, pb1, pr0, pg0, pb0; |
|
|
774 | |
|
|
775 | xcol[0].get (display, pr0, pg0, pb0); |
|
|
776 | xcol[1].get (display, pr1, pg1, pb1); |
|
|
777 | |
|
|
778 | pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); |
|
|
779 | |
928 | |
780 | /* topShadowColor */ |
929 | /* topShadowColor */ |
781 | if (!xcol[1].set (display, |
930 | if (!pix_colors[Color_topShadow].set (this, |
782 | min (pr0, max (pr0 / 5, pr1) * 7 / 5), |
931 | rgba ( |
783 | min (pg0, max (pg0 / 5, pg1) * 7 / 5), |
932 | min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), |
784 | min (pb0, max (pb0 / 5, pb1) * 7 / 5))) |
933 | min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), |
785 | xcol[1] = pix_colors[Color_White]; |
934 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
786 | |
935 | cscroll.a) |
787 | pix_colors[Color_topShadow] = xcol[1]; |
936 | )) |
|
|
937 | alias_color (Color_topShadow, Color_White); |
788 | } |
938 | } |
789 | #endif /* KEEP_SCROLLCOLOR */ |
939 | #endif |
|
|
940 | |
|
|
941 | #ifdef OFF_FOCUS_FADING |
|
|
942 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
|
|
943 | update_fade_color (i); |
|
|
944 | #endif |
790 | } |
945 | } |
791 | |
946 | |
792 | /*----------------------------------------------------------------------*/ |
947 | /*----------------------------------------------------------------------*/ |
793 | /* color aliases, fg/bg bright-bold */ |
948 | /* color aliases, fg/bg bright-bold */ |
794 | void |
949 | void |
… | |
… | |
797 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
952 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
798 | { |
953 | { |
799 | int i = atoi (rs[Rs_color + idx]); |
954 | int i = atoi (rs[Rs_color + idx]); |
800 | |
955 | |
801 | if (i >= 8 && i <= 15) |
956 | if (i >= 8 && i <= 15) |
802 | { /* bright colors */ |
957 | /* bright colors */ |
803 | i -= 8; |
|
|
804 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; |
958 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8]; |
805 | return; |
959 | else if (i >= 0 && i <= 7) |
806 | } |
960 | /* normal colors */ |
807 | |
|
|
808 | if (i >= 0 && i <= 7) /* normal colors */ |
|
|
809 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
961 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
810 | } |
962 | } |
811 | } |
963 | } |
812 | |
964 | |
813 | /*----------------------------------------------------------------------*/ |
965 | /*----------------------------------------------------------------------*/ |
… | |
… | |
833 | |
985 | |
834 | if (rsmod |
986 | if (rsmod |
835 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
987 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
836 | requestedmeta = rsmod[3] - '0'; |
988 | requestedmeta = rsmod[3] - '0'; |
837 | |
989 | |
838 | map = XGetModifierMapping (display->display); |
990 | map = XGetModifierMapping (dpy); |
839 | kc = map->modifiermap; |
991 | kc = map->modifiermap; |
840 | |
992 | |
841 | for (i = 1; i < 6; i++) |
993 | for (i = 1; i < 6; i++) |
842 | { |
994 | { |
843 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
995 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
… | |
… | |
845 | for (j = map->max_keypermod; j--; k++) |
997 | for (j = map->max_keypermod; j--; k++) |
846 | { |
998 | { |
847 | if (kc[k] == 0) |
999 | if (kc[k] == 0) |
848 | break; |
1000 | break; |
849 | |
1001 | |
850 | switch (XKeycodeToKeysym (display->display, kc[k], 0)) |
1002 | switch (XKeycodeToKeysym (dpy, kc[k], 0)) |
851 | { |
1003 | { |
852 | case XK_Num_Lock: |
1004 | case XK_Num_Lock: |
853 | ModNumLockMask = modmasks[i - 1]; |
1005 | ModNumLockMask = modmasks[i - 1]; |
854 | continue; |
1006 | continue; |
855 | |
1007 | |
… | |
… | |
905 | rxvt_term::create_windows (int argc, const char *const *argv) |
1057 | rxvt_term::create_windows (int argc, const char *const *argv) |
906 | { |
1058 | { |
907 | XClassHint classHint; |
1059 | XClassHint classHint; |
908 | XWMHints wmHint; |
1060 | XWMHints wmHint; |
909 | #if ENABLE_FRILLS |
1061 | #if ENABLE_FRILLS |
910 | Atom prop = None; |
|
|
911 | MWMHints mwmhints; |
1062 | MWMHints mwmhints = { }; |
912 | #endif |
1063 | #endif |
913 | XGCValues gcvalue; |
1064 | XGCValues gcvalue; |
914 | XSetWindowAttributes attributes; |
1065 | XSetWindowAttributes attributes; |
915 | XWindowAttributes gattr; |
|
|
916 | Window top, parent; |
1066 | Window top, parent; |
917 | dDisp; |
|
|
918 | |
1067 | |
919 | #ifdef USING_W11LIB |
1068 | dLocal (Display *, dpy); |
920 | /* enable W11 callbacks */ |
|
|
921 | W11AddEventHandler (disp, rxvt_W11_process_x_event); |
|
|
922 | #endif |
|
|
923 | |
|
|
924 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
|
|
925 | XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); |
|
|
926 | |
|
|
927 | if (OPTION (Opt_transparent)) |
|
|
928 | { |
|
|
929 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
|
|
930 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
|
|
931 | } |
|
|
932 | |
1069 | |
933 | /* grab colors before netscape does */ |
1070 | /* grab colors before netscape does */ |
934 | Get_Colours (); |
1071 | get_colours (); |
935 | |
1072 | |
936 | if (!set_fonts ()) |
1073 | if (!set_fonts ()) |
937 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
1074 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
938 | |
1075 | |
939 | parent = DefaultRootWindow (disp); |
1076 | parent = display->root; |
940 | |
1077 | |
941 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
1078 | attributes.override_redirect = !!option (Opt_override_redirect); |
942 | |
1079 | |
943 | #if ENABLE_FRILLS |
1080 | #if ENABLE_FRILLS |
944 | if (OPTION (Opt_borderLess)) |
1081 | if (option (Opt_borderLess)) |
945 | { |
1082 | { |
946 | prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); |
1083 | if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) |
947 | |
|
|
948 | if (prop == None) |
|
|
949 | { |
1084 | { |
950 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
1085 | // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n"); |
951 | attributes.override_redirect = TRUE; |
1086 | attributes.override_redirect = true; |
952 | mwmhints.flags = 0; |
|
|
953 | } |
1087 | } |
954 | else |
1088 | else |
955 | { |
1089 | { |
956 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
1090 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
957 | mwmhints.decorations = 0; |
|
|
958 | } |
1091 | } |
959 | } |
1092 | } |
960 | else |
|
|
961 | mwmhints.flags = 0; |
|
|
962 | #endif |
1093 | #endif |
963 | |
1094 | |
964 | #if ENABLE_XEMBED |
1095 | #if ENABLE_XEMBED |
965 | if (rs[Rs_embed]) |
1096 | if (rs[Rs_embed]) |
966 | { |
1097 | { |
967 | XWindowAttributes wattr; |
1098 | XWindowAttributes wattr; |
968 | |
1099 | |
969 | parent = strtol (rs[Rs_embed], 0, 0); |
1100 | parent = strtol (rs[Rs_embed], 0, 0); |
970 | |
1101 | |
971 | if (!XGetWindowAttributes (disp, parent, &wattr)) |
1102 | if (!XGetWindowAttributes (dpy, parent, &wattr)) |
972 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
1103 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
973 | |
1104 | |
974 | window_calc (wattr.width, wattr.height); |
1105 | window_calc (wattr.width, wattr.height); |
975 | } |
1106 | } |
976 | #endif |
1107 | #endif |
977 | |
1108 | |
978 | window_calc (0, 0); |
1109 | window_calc (0, 0); |
979 | |
1110 | |
980 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
1111 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
981 | attributes.background_pixel = pix_colors_focused[Color_border]; |
1112 | attributes.background_pixel = pix_colors_focused [Color_border]; |
982 | attributes.border_pixel = pix_colors_focused[Color_border]; |
1113 | attributes.border_pixel = pix_colors_focused [Color_border]; |
983 | attributes.colormap = display->cmap; |
1114 | attributes.colormap = cmap; |
|
|
1115 | |
984 | top = XCreateWindow (disp, parent, |
1116 | top = XCreateWindow (dpy, parent, |
985 | szHint.x, szHint.y, |
1117 | szHint.x, szHint.y, |
986 | szHint.width, szHint.height, |
1118 | szHint.width, szHint.height, |
987 | ext_bwidth, |
1119 | ext_bwidth, |
988 | display->depth, InputOutput, |
1120 | depth, InputOutput, visual, |
989 | display->visual, |
|
|
990 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
1121 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
991 | &attributes); |
1122 | &attributes); |
992 | |
1123 | |
993 | this->parent[0] = top; |
1124 | this->parent[0] = top; |
994 | |
1125 | |
995 | old_width = szHint.width; |
1126 | old_width = szHint.width; |
996 | old_height = szHint.height; |
1127 | old_height = szHint.height; |
997 | |
1128 | |
998 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
1129 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
999 | process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); |
1130 | process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); |
1000 | |
1131 | |
1001 | classHint.res_name = (char *)rs[Rs_name]; |
1132 | classHint.res_name = (char *)rs[Rs_name]; |
1002 | classHint.res_class = (char *)RESCLASS; |
1133 | classHint.res_class = (char *)RESCLASS; |
1003 | |
1134 | |
1004 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1135 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1005 | wmHint.input = True; |
1136 | wmHint.input = True; |
1006 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
1137 | wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; |
1007 | wmHint.window_group = top; |
1138 | wmHint.window_group = top; |
1008 | |
1139 | |
1009 | XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, |
1140 | XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, |
1010 | &szHint, &wmHint, &classHint); |
1141 | &szHint, &wmHint, &classHint); |
|
|
1142 | #if ENABLE_EWMH |
|
|
1143 | # ifdef HAVE_AFTERIMAGE |
|
|
1144 | /* |
|
|
1145 | * set up icon hint |
|
|
1146 | * rs [Rs_iconfile] is path to icon, asv has been created in init_resources |
|
|
1147 | */ |
|
|
1148 | |
|
|
1149 | if (rs [Rs_iconfile]) |
|
|
1150 | { |
|
|
1151 | init_asv (); |
|
|
1152 | |
|
|
1153 | ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL); |
|
|
1154 | if (asv && im) |
|
|
1155 | { |
|
|
1156 | int w = im->width; |
|
|
1157 | int h = im->height; |
|
|
1158 | long* buffer = (long *)malloc ((2 + w * h) * sizeof (long)); |
|
|
1159 | ASImage *result = scale_asimage (asv, im, |
|
|
1160 | w, h, ASA_ARGB32, |
|
|
1161 | 100, ASIMAGE_QUALITY_DEFAULT); |
|
|
1162 | destroy_asimage (&im); |
|
|
1163 | |
|
|
1164 | if (buffer && result) |
|
|
1165 | { |
|
|
1166 | ARGB32 *asbuf = result->alt.argb32; |
|
|
1167 | buffer [0] = w; |
|
|
1168 | buffer [1] = h; |
|
|
1169 | |
|
|
1170 | for (unsigned int i = 0; i < w * h; ++i) |
|
|
1171 | buffer [i + 2] = asbuf [i]; |
|
|
1172 | |
|
|
1173 | destroy_asimage (&result); |
|
|
1174 | XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32, |
|
|
1175 | PropModeReplace, (const unsigned char*) buffer, 2 + w * h); |
|
|
1176 | free (buffer); |
|
|
1177 | } |
|
|
1178 | else |
|
|
1179 | { |
|
|
1180 | if (!buffer) |
|
|
1181 | rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); |
|
|
1182 | |
|
|
1183 | if (!result) |
|
|
1184 | rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n"); |
|
|
1185 | } |
|
|
1186 | } |
|
|
1187 | else |
|
|
1188 | rxvt_warn ("Loading image icon failed, continuing without.\n"); |
|
|
1189 | } |
|
|
1190 | # endif |
|
|
1191 | #endif |
|
|
1192 | |
|
|
1193 | #if ENABLE_FRILLS |
|
|
1194 | if (mwmhints.flags) |
|
|
1195 | XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
|
|
1196 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
|
|
1197 | #endif |
1011 | |
1198 | |
1012 | Atom protocols[] = { |
1199 | Atom protocols[] = { |
1013 | xa[XA_WM_DELETE_WINDOW], |
1200 | xa[XA_WM_DELETE_WINDOW], |
1014 | #if ENABLE_EWMH |
1201 | #if ENABLE_EWMH |
1015 | xa[XA_NET_WM_PING], |
1202 | xa[XA_NET_WM_PING], |
1016 | #endif |
1203 | #endif |
1017 | }; |
1204 | }; |
1018 | |
1205 | |
1019 | XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
1206 | XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
1020 | |
1207 | |
1021 | #if ENABLE_FRILLS |
1208 | #if ENABLE_FRILLS |
1022 | if (rs[Rs_transient_for]) |
1209 | if (rs[Rs_transient_for]) |
1023 | XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
1210 | XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
1024 | #endif |
1211 | #endif |
1025 | |
1212 | |
1026 | #if ENABLE_EWMH |
1213 | #if ENABLE_EWMH |
1027 | long pid = getpid (); |
1214 | long pid = getpid (); |
1028 | |
1215 | |
1029 | XChangeProperty (disp, top, |
1216 | XChangeProperty (dpy, top, |
1030 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1217 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1031 | PropModeReplace, (unsigned char *)&pid, 1); |
1218 | PropModeReplace, (unsigned char *)&pid, 1); |
1032 | |
1219 | |
1033 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
1220 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
1034 | #endif |
1221 | #endif |
1035 | |
1222 | |
1036 | XSelectInput (disp, top, |
1223 | XSelectInput (dpy, top, |
1037 | KeyPressMask |
1224 | KeyPressMask |
1038 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1225 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1039 | | KeyReleaseMask |
1226 | | KeyReleaseMask |
1040 | #endif |
1227 | #endif |
1041 | | FocusChangeMask | VisibilityChangeMask |
1228 | | FocusChangeMask | VisibilityChangeMask |
1042 | | ExposureMask | StructureNotifyMask); |
1229 | | ExposureMask | StructureNotifyMask); |
1043 | |
1230 | |
1044 | termwin_ev.start (display, top); |
1231 | termwin_ev.start (display, top); |
1045 | |
1232 | |
1046 | #if ENABLE_FRILLS |
|
|
1047 | if (mwmhints.flags) |
|
|
1048 | XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
|
|
1049 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
|
|
1050 | #endif |
|
|
1051 | |
|
|
1052 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1233 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1053 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1234 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1054 | |
|
|
1055 | #ifdef HAVE_SCROLLBARS |
|
|
1056 | /* cursor scrollBar: Black-on-White */ |
|
|
1057 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
|
|
1058 | #endif |
|
|
1059 | |
1235 | |
1060 | /* the vt window */ |
1236 | /* the vt window */ |
1061 | vt = XCreateSimpleWindow (disp, top, |
1237 | vt = XCreateSimpleWindow (dpy, top, |
1062 | window_vt_x, |
|
|
1063 | window_vt_y, |
1238 | window_vt_x, window_vt_y, |
1064 | width, |
|
|
1065 | height, |
1239 | width, height, |
1066 | 0, |
1240 | 0, |
1067 | pix_colors_focused[Color_fg], |
1241 | pix_colors_focused[Color_fg], |
1068 | pix_colors_focused[Color_bg]); |
1242 | pix_colors_focused[Color_bg]); |
1069 | #ifdef DEBUG_X |
|
|
1070 | XStoreName (disp, vt, "vt window"); |
|
|
1071 | #endif |
|
|
1072 | |
1243 | |
1073 | attributes.bit_gravity = NorthWestGravity; |
1244 | attributes.bit_gravity = NorthWestGravity; |
1074 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
1245 | XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); |
1075 | |
1246 | |
1076 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1247 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1077 | |
1248 | |
1078 | if (OPTION (Opt_pointerBlank)) |
1249 | if (option (Opt_pointerBlank)) |
1079 | vt_emask |= PointerMotionMask; |
1250 | vt_emask |= PointerMotionMask; |
1080 | else |
1251 | else |
1081 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1252 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1082 | |
1253 | |
1083 | vt_select_input (); |
1254 | vt_select_input (); |
1084 | |
1255 | |
1085 | vt_ev.start (display, vt); |
1256 | vt_ev.start (display, vt); |
1086 | |
1257 | |
1087 | #ifdef XPM_BACKGROUND |
|
|
1088 | if (rs[Rs_backgroundPixmap] != NULL |
|
|
1089 | && ! OPTION (Opt_transparent)) |
|
|
1090 | { |
|
|
1091 | const char *p = rs[Rs_backgroundPixmap]; |
|
|
1092 | |
|
|
1093 | if ((p = strchr (p, ';')) != NULL) |
|
|
1094 | { |
|
|
1095 | p++; |
|
|
1096 | scale_pixmap (p); |
|
|
1097 | } |
|
|
1098 | |
|
|
1099 | set_bgPixmap (rs[Rs_backgroundPixmap]); |
|
|
1100 | scr_touch (true); |
|
|
1101 | } |
|
|
1102 | #endif |
|
|
1103 | |
|
|
1104 | /* graphics context for the vt window */ |
1258 | /* graphics context for the vt window */ |
1105 | gcvalue.foreground = pix_colors[Color_fg]; |
1259 | gcvalue.foreground = pix_colors[Color_fg]; |
1106 | gcvalue.background = pix_colors[Color_bg]; |
1260 | gcvalue.background = pix_colors[Color_bg]; |
1107 | gcvalue.graphics_exposures = 1; |
1261 | gcvalue.graphics_exposures = 0; |
|
|
1262 | |
1108 | gc = XCreateGC (disp, vt, |
1263 | gc = XCreateGC (dpy, vt, |
1109 | GCForeground | GCBackground | GCGraphicsExposures, |
1264 | GCForeground | GCBackground | GCGraphicsExposures, |
1110 | &gcvalue); |
1265 | &gcvalue); |
1111 | |
1266 | |
1112 | drawable = new rxvt_drawable (display, vt); |
1267 | drawable = new rxvt_drawable (this, vt); |
1113 | |
|
|
1114 | #ifdef RXVT_SCROLLBAR |
|
|
1115 | gcvalue.foreground = pix_colors[Color_topShadow]; |
|
|
1116 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
|
|
1117 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
|
|
1118 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
|
|
1119 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
|
|
1120 | scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
|
|
1121 | #endif |
|
|
1122 | |
1268 | |
1123 | #ifdef OFF_FOCUS_FADING |
1269 | #ifdef OFF_FOCUS_FADING |
1124 | // initially we are in unfocused state |
1270 | // initially we are in unfocused state |
1125 | if (rs[Rs_fade]) |
1271 | if (rs[Rs_fade]) |
1126 | pix_colors = pix_colors_unfocused; |
1272 | pix_colors = pix_colors_unfocused; |
1127 | #endif |
1273 | #endif |
1128 | |
1274 | |
1129 | pointer_unblank (); |
1275 | pointer_unblank (); |
1130 | scr_recolour (); |
1276 | scr_recolour (); |
1131 | |
|
|
1132 | #if ENABLE_XEMBED |
|
|
1133 | if (rs[Rs_embed]) |
|
|
1134 | { |
|
|
1135 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
1136 | |
|
|
1137 | XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
1138 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
1139 | } |
|
|
1140 | #endif |
|
|
1141 | } |
1277 | } |
1142 | |
1278 | |
1143 | /* ------------------------------------------------------------------------- * |
1279 | /* ------------------------------------------------------------------------- * |
1144 | * GET TTY CURRENT STATE * |
1280 | * GET TTY CURRENT STATE * |
1145 | * ------------------------------------------------------------------------- */ |
1281 | * ------------------------------------------------------------------------- */ |
1146 | void |
1282 | void |
1147 | rxvt_get_ttymode (ttymode_t *tio, int erase) |
1283 | rxvt_get_ttymode (struct termios *tio, int erase) |
1148 | { |
1284 | { |
1149 | #ifdef HAVE_TERMIOS_H |
|
|
1150 | /* |
1285 | /* |
1151 | * standard System V termios interface |
1286 | * standard System V termios interface |
1152 | */ |
1287 | */ |
1153 | if (GET_TERMIOS (STDIN_FILENO, tio) < 0) |
1288 | if (tcgetattr (STDIN_FILENO, tio) < 0) |
1154 | { |
1289 | { |
1155 | // return error - use system defaults, |
1290 | // return error - use system defaults, |
1156 | // where possible, and zero elsewhere |
1291 | // where possible, and zero elsewhere |
1157 | memset (tio, 0, sizeof (ttymode_t)); |
1292 | memset (tio, 0, sizeof (struct termios)); |
1158 | |
1293 | |
1159 | tio->c_cc[VINTR] = CINTR; |
1294 | tio->c_cc[VINTR] = CINTR; |
1160 | tio->c_cc[VQUIT] = CQUIT; |
1295 | tio->c_cc[VQUIT] = CQUIT; |
1161 | tio->c_cc[VERASE] = CERASE; |
1296 | tio->c_cc[VERASE] = CERASE; |
1162 | #ifdef VERASE2 |
1297 | #ifdef VERASE2 |
… | |
… | |
1221 | tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO |
1356 | tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO |
1222 | # if defined (ECHOCTL) && defined (ECHOKE) |
1357 | # if defined (ECHOCTL) && defined (ECHOKE) |
1223 | | ECHOCTL | ECHOKE |
1358 | | ECHOCTL | ECHOKE |
1224 | # endif |
1359 | # endif |
1225 | | ECHOE | ECHOK); |
1360 | | ECHOE | ECHOK); |
1226 | # else /* HAVE_TERMIOS_H */ |
|
|
1227 | |
|
|
1228 | /* |
|
|
1229 | * sgtty interface |
|
|
1230 | */ |
|
|
1231 | |
|
|
1232 | /* get parameters -- gtty */ |
|
|
1233 | if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) |
|
|
1234 | { |
|
|
1235 | tio->sg.sg_erase = CERASE; /* ^H */ |
|
|
1236 | tio->sg.sg_kill = CKILL; /* ^U */ |
|
|
1237 | } |
|
|
1238 | |
|
|
1239 | if (erase != -1) |
|
|
1240 | tio->sg.sg_erase = (char)erase; |
|
|
1241 | |
|
|
1242 | tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); |
|
|
1243 | |
|
|
1244 | /* get special characters */ |
|
|
1245 | if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0) |
|
|
1246 | { |
|
|
1247 | tio->tc.t_intrc = CINTR; /* ^C */ |
|
|
1248 | tio->tc.t_quitc = CQUIT; /* ^\ */ |
|
|
1249 | tio->tc.t_startc = CSTART; /* ^Q */ |
|
|
1250 | tio->tc.t_stopc = CSTOP; /* ^S */ |
|
|
1251 | tio->tc.t_eofc = CEOF; /* ^D */ |
|
|
1252 | tio->tc.t_brkc = -1; |
|
|
1253 | } |
|
|
1254 | |
|
|
1255 | /* get local special chars */ |
|
|
1256 | if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) |
|
|
1257 | { |
|
|
1258 | tio->lc.t_suspc = CSUSP; /* ^Z */ |
|
|
1259 | tio->lc.t_dsuspc = CDSUSP; /* ^Y */ |
|
|
1260 | tio->lc.t_rprntc = CRPRNT; /* ^R */ |
|
|
1261 | tio->lc.t_flushc = CFLUSH; /* ^O */ |
|
|
1262 | tio->lc.t_werasc = CWERASE; /* ^W */ |
|
|
1263 | tio->lc.t_lnextc = CLNEXT; /* ^V */ |
|
|
1264 | } |
|
|
1265 | /* get line discipline */ |
|
|
1266 | ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); |
|
|
1267 | # ifdef NTTYDISC |
|
|
1268 | tio->line = NTTYDISC; |
|
|
1269 | # endif /* NTTYDISC */ |
|
|
1270 | |
|
|
1271 | tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); |
|
|
1272 | #endif /* HAVE_TERMIOS_H */ |
|
|
1273 | |
1361 | |
1274 | /* |
1362 | /* |
1275 | * Debugging |
1363 | * Debugging |
1276 | */ |
1364 | */ |
1277 | #ifdef DEBUG_TTYMODE |
1365 | #ifdef DEBUG_TTYMODE |
1278 | #ifdef HAVE_TERMIOS_H |
|
|
1279 | /* c_iflag bits */ |
1366 | /* c_iflag bits */ |
1280 | fprintf (stderr, "Input flags\n"); |
1367 | fprintf (stderr, "Input flags\n"); |
1281 | |
1368 | |
1282 | /* cpp token stringize doesn't work on all machines <sigh> */ |
1369 | /* cpp token stringize doesn't work on all machines <sigh> */ |
1283 | # define FOO(flag,name) \ |
1370 | # define FOO(flag,name) \ |
… | |
… | |
1346 | FOO (VLNEXT, "VLNEXT"); |
1433 | FOO (VLNEXT, "VLNEXT"); |
1347 | # endif |
1434 | # endif |
1348 | |
1435 | |
1349 | fprintf (stderr, "\n"); |
1436 | fprintf (stderr, "\n"); |
1350 | # undef FOO |
1437 | # undef FOO |
1351 | # endif /* HAVE_TERMIOS_H */ |
1438 | #endif /* DEBUG_TTYMODE */ |
1352 | #endif /* DEBUG_TTYMODE */ |
|
|
1353 | } |
1439 | } |
1354 | |
1440 | |
1355 | /*----------------------------------------------------------------------*/ |
1441 | /*----------------------------------------------------------------------*/ |
1356 | /* |
1442 | /* |
1357 | * Run the command in a subprocess and return a file descriptor for the |
1443 | * Run the command in a subprocess and return a file descriptor for the |
… | |
… | |
1378 | else |
1464 | else |
1379 | #endif |
1465 | #endif |
1380 | if (!pty->get ()) |
1466 | if (!pty->get ()) |
1381 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1467 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1382 | |
1468 | |
|
|
1469 | int er; |
|
|
1470 | |
|
|
1471 | #ifndef NO_BACKSPACE_KEY |
|
|
1472 | if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) |
|
|
1473 | er = rs[Rs_backspace_key][0]; |
|
|
1474 | else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) |
|
|
1475 | er = '\177'; /* the initial state anyway */ |
|
|
1476 | else |
|
|
1477 | #endif |
|
|
1478 | er = -1; |
|
|
1479 | |
|
|
1480 | rxvt_get_ttymode (&tio, er); |
|
|
1481 | /* init terminal attributes */ |
|
|
1482 | cfsetospeed (&tio, BAUDRATE); |
|
|
1483 | cfsetispeed (&tio, BAUDRATE); |
|
|
1484 | tcsetattr (pty->tty, TCSANOW, &tio); |
1383 | pty->set_utf8_mode (enc_utf8); |
1485 | pty->set_utf8_mode (enc_utf8); |
1384 | |
1486 | |
1385 | /* set initial window size */ |
1487 | /* set initial window size */ |
1386 | tt_winch (); |
1488 | tt_winch (); |
1387 | |
|
|
1388 | int er; |
|
|
1389 | |
|
|
1390 | #ifndef NO_BACKSPACE_KEY |
|
|
1391 | if (key_backspace[0] && !key_backspace[1]) |
|
|
1392 | er = key_backspace[0]; |
|
|
1393 | else if (strcmp (key_backspace, "DEC") == 0) |
|
|
1394 | er = '\177'; /* the initial state anyway */ |
|
|
1395 | else |
|
|
1396 | #endif |
|
|
1397 | er = -1; |
|
|
1398 | |
|
|
1399 | rxvt_get_ttymode (&tio, er); |
|
|
1400 | |
1489 | |
1401 | #if ENABLE_FRILLS |
1490 | #if ENABLE_FRILLS |
1402 | if (rs[Rs_pty_fd]) |
1491 | if (rs[Rs_pty_fd]) |
1403 | return; |
1492 | return; |
1404 | #endif |
1493 | #endif |
… | |
… | |
1435 | } |
1524 | } |
1436 | |
1525 | |
1437 | _exit (EXIT_FAILURE); |
1526 | _exit (EXIT_FAILURE); |
1438 | |
1527 | |
1439 | default: |
1528 | default: |
1440 | #if UTMP_SUPPORT |
|
|
1441 | if (!OPTION (Opt_utmpInhibit)) |
1529 | if (!option (Opt_utmpInhibit)) |
1442 | pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); |
1530 | pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); |
1443 | #endif |
|
|
1444 | |
1531 | |
1445 | pty->close_tty (); |
1532 | pty->close_tty (); |
|
|
1533 | |
|
|
1534 | child_ev.start (cmd_pid); |
|
|
1535 | |
|
|
1536 | HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END)); |
1446 | break; |
1537 | break; |
1447 | } |
1538 | } |
1448 | } |
1539 | } |
1449 | |
1540 | |
1450 | /* ------------------------------------------------------------------------- * |
1541 | /* ------------------------------------------------------------------------- * |
… | |
… | |
1457 | int |
1548 | int |
1458 | rxvt_term::run_child (const char *const *argv) |
1549 | rxvt_term::run_child (const char *const *argv) |
1459 | { |
1550 | { |
1460 | char *login; |
1551 | char *login; |
1461 | |
1552 | |
1462 | SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ |
|
|
1463 | |
|
|
1464 | if (OPTION (Opt_console)) |
1553 | if (option (Opt_console)) |
|
|
1554 | { |
1465 | { /* be virtual console, fail silently */ |
1555 | /* be virtual console, fail silently */ |
1466 | #ifdef TIOCCONS |
1556 | #ifdef TIOCCONS |
1467 | unsigned int on = 1; |
1557 | unsigned int on = 1; |
1468 | |
1558 | |
1469 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1559 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1470 | #elif defined (SRIOCSREDIR) |
1560 | #elif defined (SRIOCSREDIR) |
… | |
… | |
1472 | |
1562 | |
1473 | fd = open (CONSOLE, O_WRONLY, 0); |
1563 | fd = open (CONSOLE, O_WRONLY, 0); |
1474 | if (fd >= 0) |
1564 | if (fd >= 0) |
1475 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1565 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1476 | close (fd); |
1566 | close (fd); |
1477 | #endif /* SRIOCSREDIR */ |
1567 | #endif /* SRIOCSREDIR */ |
1478 | } |
1568 | } |
1479 | |
1569 | |
1480 | /* reset signals and spin off the command interpreter */ |
1570 | /* reset signals and spin off the command interpreter */ |
1481 | signal (SIGINT, SIG_DFL); |
1571 | signal (SIGINT, SIG_DFL); |
1482 | signal (SIGQUIT, SIG_DFL); |
1572 | signal (SIGQUIT, SIG_DFL); |
… | |
… | |
1489 | */ |
1579 | */ |
1490 | #ifdef SIGTSTP |
1580 | #ifdef SIGTSTP |
1491 | signal (SIGTSTP, SIG_IGN); |
1581 | signal (SIGTSTP, SIG_IGN); |
1492 | signal (SIGTTIN, SIG_IGN); |
1582 | signal (SIGTTIN, SIG_IGN); |
1493 | signal (SIGTTOU, SIG_IGN); |
1583 | signal (SIGTTOU, SIG_IGN); |
1494 | #endif /* SIGTSTP */ |
1584 | #endif /* SIGTSTP */ |
1495 | |
|
|
1496 | // unblock signals (signals are blocked by iom.C |
|
|
1497 | sigset_t ss; |
|
|
1498 | sigemptyset (&ss); |
|
|
1499 | sigprocmask (SIG_SETMASK, &ss, 0); |
|
|
1500 | |
1585 | |
1501 | /* command interpreter path */ |
1586 | /* command interpreter path */ |
1502 | if (argv != NULL) |
1587 | if (argv) |
1503 | { |
1588 | { |
1504 | # ifdef DEBUG_CMD |
1589 | # ifdef DEBUG_CMD |
1505 | int i; |
1590 | int i; |
1506 | |
1591 | |
1507 | for (i = 0; argv[i]; i++) |
1592 | for (i = 0; argv[i]; i++) |
… | |
… | |
1516 | const char *argv0, *shell; |
1601 | const char *argv0, *shell; |
1517 | |
1602 | |
1518 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1603 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1519 | shell = "/bin/sh"; |
1604 | shell = "/bin/sh"; |
1520 | |
1605 | |
1521 | argv0 = (const char *)rxvt_r_basename (shell); |
1606 | argv0 = (const char *)rxvt_basename (shell); |
1522 | |
1607 | |
1523 | if (OPTION (Opt_loginShell)) |
1608 | if (option (Opt_loginShell)) |
1524 | { |
1609 | { |
1525 | login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); |
1610 | login = (char *)rxvt_malloc (strlen (argv0) + 2); |
1526 | |
1611 | |
1527 | login[0] = '-'; |
1612 | login[0] = '-'; |
1528 | strcpy (&login[1], argv0); |
1613 | strcpy (&login[1], argv0); |
1529 | argv0 = login; |
1614 | argv0 = login; |
1530 | } |
1615 | } |
1531 | |
1616 | |
1532 | execlp (shell, argv0, NULL); |
1617 | execlp (shell, argv0, (char *)0); |
1533 | /* no error message: STDERR is closed! */ |
1618 | /* no error message: STDERR is closed! */ |
1534 | } |
1619 | } |
1535 | |
1620 | |
1536 | return -1; |
1621 | return -1; |
1537 | } |
1622 | } |