1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: main.C |
2 | * File: main.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> |
… | |
… | |
48 | # include <termios.h> |
48 | # include <termios.h> |
49 | #endif |
49 | #endif |
50 | |
50 | |
51 | vector<rxvt_term *> rxvt_term::termlist; |
51 | vector<rxvt_term *> rxvt_term::termlist; |
52 | |
52 | |
|
|
53 | // used to tell global functions which terminal instance is "active" |
|
|
54 | rxvt_t rxvt_current_term; |
|
|
55 | |
53 | static char curlocale[128], savelocale[128]; |
56 | static char curlocale[128], savelocale[128]; |
54 | |
57 | |
55 | bool |
58 | bool |
56 | rxvt_set_locale (const char *locale) |
59 | rxvt_set_locale (const char *locale) NOTHROW |
57 | { |
60 | { |
|
|
61 | int size = strlen (locale) + 1; |
|
|
62 | |
|
|
63 | if (size > sizeof (curlocale)) |
|
|
64 | rxvt_fatal ("locale string too long, aborting.\n"); |
|
|
65 | |
58 | if (!locale || !strncmp (locale, curlocale, 128)) |
66 | if (!locale || !memcmp (locale, curlocale, size)) |
59 | return false; |
67 | return false; |
60 | |
68 | |
61 | strncpy (curlocale, locale, 128); |
69 | memcpy (curlocale, locale, size); |
62 | setlocale (LC_CTYPE, curlocale); |
70 | setlocale (LC_CTYPE, curlocale); |
63 | return true; |
71 | return true; |
64 | } |
72 | } |
65 | |
73 | |
66 | void |
74 | void |
67 | rxvt_push_locale (const char *locale) |
75 | rxvt_push_locale (const char *locale) NOTHROW |
68 | { |
76 | { |
69 | strcpy (savelocale, curlocale); |
77 | strcpy (savelocale, curlocale); |
70 | rxvt_set_locale (locale); |
78 | rxvt_set_locale (locale); |
71 | } |
79 | } |
72 | |
80 | |
73 | void |
81 | void |
74 | rxvt_pop_locale () |
82 | rxvt_pop_locale () NOTHROW |
75 | { |
83 | { |
76 | rxvt_set_locale (savelocale); |
84 | rxvt_set_locale (savelocale); |
77 | } |
85 | } |
78 | |
86 | |
79 | #if ENABLE_COMBINING |
87 | #if ENABLE_COMBINING |
… | |
… | |
140 | } |
148 | } |
141 | #endif |
149 | #endif |
142 | |
150 | |
143 | rxvt_term::rxvt_term () |
151 | rxvt_term::rxvt_term () |
144 | : |
152 | : |
145 | #if TRANSPARENT |
153 | #if TRANSPARENT || ENABLE_PERL |
146 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
154 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
147 | #endif |
155 | #endif |
148 | #ifdef HAVE_SCROLLBARS |
156 | #ifdef HAVE_SCROLLBARS |
149 | scrollbar_ev (this, &rxvt_term::x_cb), |
157 | scrollbar_ev (this, &rxvt_term::x_cb), |
150 | #endif |
158 | #endif |
… | |
… | |
167 | pointer_ev (this, &rxvt_term::pointer_cb), |
175 | pointer_ev (this, &rxvt_term::pointer_cb), |
168 | #endif |
176 | #endif |
169 | #ifdef USE_XIM |
177 | #ifdef USE_XIM |
170 | im_ev (this, &rxvt_term::im_cb), |
178 | im_ev (this, &rxvt_term::im_cb), |
171 | #endif |
179 | #endif |
|
|
180 | #ifndef NO_BELL |
|
|
181 | bell_ev (this, &rxvt_term::bell_cb), |
|
|
182 | #endif |
172 | termwin_ev (this, &rxvt_term::x_cb), |
183 | termwin_ev (this, &rxvt_term::x_cb), |
173 | vt_ev (this, &rxvt_term::x_cb), |
184 | vt_ev (this, &rxvt_term::x_cb), |
|
|
185 | child_ev (this, &rxvt_term::child_cb), |
174 | check_ev (this, &rxvt_term::check_cb), |
186 | check_ev (this, &rxvt_term::check_cb), |
175 | flush_ev (this, &rxvt_term::flush_cb), |
187 | flush_ev (this, &rxvt_term::flush_cb), |
176 | destroy_ev (this, &rxvt_term::destroy_cb), |
188 | destroy_ev (this, &rxvt_term::destroy_cb), |
177 | pty_ev (this, &rxvt_term::pty_cb), |
189 | pty_ev (this, &rxvt_term::pty_cb), |
178 | incr_ev (this, &rxvt_term::incr_cb) |
190 | incr_ev (this, &rxvt_term::incr_cb) |
… | |
… | |
181 | |
193 | |
182 | termlist.push_back (this); |
194 | termlist.push_back (this); |
183 | |
195 | |
184 | #ifdef KEYSYM_RESOURCE |
196 | #ifdef KEYSYM_RESOURCE |
185 | keyboard = new keyboard_manager; |
197 | keyboard = new keyboard_manager; |
186 | |
|
|
187 | if (!keyboard) |
|
|
188 | rxvt_fatal ("out of memory, aborting.\n"); |
|
|
189 | #endif |
198 | #endif |
190 | } |
199 | } |
191 | |
200 | |
192 | // clean up the most important stuff, do *not* call x or free mem etc. |
201 | // clean up the most important stuff, do *not* call x or free mem etc. |
193 | // for use before an emergency exit |
202 | // for use before an emergency exit |
194 | void rxvt_term::emergency_cleanup () |
203 | void rxvt_term::emergency_cleanup () |
195 | { |
204 | { |
196 | if (cmd_pid) |
205 | if (cmd_pid) |
197 | kill (-cmd_pid, SIGHUP); |
206 | kill (-cmd_pid, SIGHUP); |
198 | |
207 | |
|
|
208 | pty_ev.stop (); |
199 | delete pty; pty = 0; |
209 | delete pty; pty = 0; |
200 | } |
210 | } |
201 | |
211 | |
202 | rxvt_term::~rxvt_term () |
212 | rxvt_term::~rxvt_term () |
203 | { |
213 | { |
204 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
|
|
205 | |
|
|
206 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
214 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
207 | |
215 | |
208 | emergency_cleanup (); |
216 | emergency_cleanup (); |
209 | |
217 | |
210 | #if ENABLE_STYLES |
218 | #if ENABLE_STYLES |
… | |
… | |
214 | #endif |
222 | #endif |
215 | delete fontset[0]; |
223 | delete fontset[0]; |
216 | |
224 | |
217 | if (display) |
225 | if (display) |
218 | { |
226 | { |
219 | dDisp; |
|
|
220 | |
|
|
221 | selection_clear (); |
227 | selection_clear (); |
222 | |
228 | |
223 | #ifdef USE_XIM |
229 | #ifdef USE_XIM |
224 | im_destroy (); |
230 | im_destroy (); |
225 | #endif |
231 | #endif |
226 | #ifdef XTERM_SCROLLBAR |
232 | #ifdef XTERM_SCROLLBAR |
227 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
233 | if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); |
228 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
234 | if (ShadowGC) XFreeGC (dpy, ShadowGC); |
229 | #endif |
235 | #endif |
230 | #ifdef PLAIN_SCROLLBAR |
236 | #ifdef PLAIN_SCROLLBAR |
231 | if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); |
237 | if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC); |
232 | #endif |
238 | #endif |
233 | #ifdef NEXT_SCROLLBAR |
239 | #ifdef NEXT_SCROLLBAR |
234 | if (blackGC) XFreeGC (disp, blackGC); |
240 | if (blackGC) XFreeGC (dpy, blackGC); |
235 | if (whiteGC) XFreeGC (disp, whiteGC); |
241 | if (whiteGC) XFreeGC (dpy, whiteGC); |
236 | if (grayGC) XFreeGC (disp, grayGC); |
242 | if (grayGC) XFreeGC (dpy, grayGC); |
237 | if (darkGC) XFreeGC (disp, darkGC); |
243 | if (darkGC) XFreeGC (dpy, darkGC); |
238 | if (stippleGC) XFreeGC (disp, stippleGC); |
244 | if (stippleGC) XFreeGC (dpy, stippleGC); |
239 | if (dimple) XFreePixmap (disp, dimple); |
245 | if (dimple) XFreePixmap (dpy, dimple); |
240 | if (upArrow) XFreePixmap (disp, upArrow); |
246 | if (upArrow) XFreePixmap (dpy, upArrow); |
241 | if (downArrow) XFreePixmap (disp, downArrow); |
247 | if (downArrow) XFreePixmap (dpy, downArrow); |
242 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
248 | if (upArrowHi) XFreePixmap (dpy, upArrowHi); |
243 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
249 | if (downArrowHi) XFreePixmap (dpy, downArrowHi); |
244 | #endif |
250 | #endif |
245 | #ifdef RXVT_SCROLLBAR |
251 | #ifdef RXVT_SCROLLBAR |
246 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
252 | if (topShadowGC) XFreeGC (dpy, topShadowGC); |
247 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
253 | if (botShadowGC) XFreeGC (dpy, botShadowGC); |
248 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
254 | if (scrollbarGC) XFreeGC (dpy, scrollbarGC); |
249 | #endif |
255 | #endif |
250 | if (gc) XFreeGC (disp, gc); |
256 | if (gc) XFreeGC (dpy, gc); |
251 | |
257 | |
252 | delete drawable; |
258 | delete drawable; |
253 | // destroy all windows |
259 | // destroy all windows |
254 | if (parent[0]) |
260 | if (parent[0]) |
255 | XDestroyWindow (disp, parent[0]); |
261 | XDestroyWindow (dpy, parent[0]); |
256 | } |
|
|
257 | |
262 | |
258 | // TODO: free pixcolours, colours should become part of rxvt_display |
263 | for (int i = 0; i < TOTAL_COLORS; i++) |
259 | delete pix_colors_focused; |
264 | if (ISSET_PIXCOLOR (i)) |
|
|
265 | { |
|
|
266 | pix_colors_focused [i].free (this); |
260 | #if OFF_FOCUS_FADING |
267 | #if OFF_FOCUS_FADING |
|
|
268 | pix_colors_unfocused [i].free (this); |
|
|
269 | #endif |
|
|
270 | } |
|
|
271 | |
|
|
272 | clear (); |
|
|
273 | } |
|
|
274 | |
|
|
275 | delete [] pix_colors_focused; |
|
|
276 | #if OFF_FOCUS_FADING |
261 | delete pix_colors_unfocused; |
277 | delete [] pix_colors_unfocused; |
262 | #endif |
278 | #endif |
263 | |
279 | |
264 | displays.put (display); |
280 | displays.put (display); |
265 | |
281 | |
266 | scr_release (); |
282 | scr_release (); |
… | |
… | |
269 | for (int i = 0; i < allocated.size (); i++) |
285 | for (int i = 0; i < allocated.size (); i++) |
270 | free (allocated [i]); |
286 | free (allocated [i]); |
271 | |
287 | |
272 | free (selection.text); |
288 | free (selection.text); |
273 | // TODO: manage env vars in child only(!) |
289 | // TODO: manage env vars in child only(!) |
274 | free (env_windowid); |
|
|
275 | free (env_display); |
290 | free (env_display); |
276 | free (env_term); |
291 | free (env_term); |
277 | free (env_colorfgbg); |
|
|
278 | free (locale); |
292 | free (locale); |
279 | free (v_buffer); |
293 | free (v_buffer); |
280 | free (incr_buf); |
294 | free (incr_buf); |
281 | |
295 | |
282 | delete envv; |
296 | delete envv; |
… | |
… | |
285 | #ifdef KEYSYM_RESOURCE |
299 | #ifdef KEYSYM_RESOURCE |
286 | delete keyboard; |
300 | delete keyboard; |
287 | #endif |
301 | #endif |
288 | } |
302 | } |
289 | |
303 | |
|
|
304 | // child has exited, usually destroys |
290 | void |
305 | void |
291 | rxvt_term::child_exit () |
306 | rxvt_term::child_cb (child_watcher &w, int status) |
292 | { |
307 | { |
|
|
308 | HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); |
|
|
309 | |
293 | cmd_pid = 0; |
310 | cmd_pid = 0; |
294 | |
311 | |
295 | if (!OPTION (Opt_hold)) |
312 | if (!OPTION (Opt_hold)) |
296 | destroy (); |
313 | destroy (); |
297 | } |
314 | } |
… | |
… | |
300 | rxvt_term::destroy () |
317 | rxvt_term::destroy () |
301 | { |
318 | { |
302 | if (destroy_ev.active) |
319 | if (destroy_ev.active) |
303 | return; |
320 | return; |
304 | |
321 | |
|
|
322 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
|
|
323 | |
305 | #if ENABLE_OVERLAY |
324 | #if ENABLE_OVERLAY |
306 | scr_overlay_off (); |
325 | scr_overlay_off (); |
307 | #endif |
326 | #endif |
308 | |
327 | |
309 | if (display) |
328 | if (display) |
… | |
… | |
312 | im_ev.stop (display); |
331 | im_ev.stop (display); |
313 | #endif |
332 | #endif |
314 | #if HAVE_SCROLLBARS |
333 | #if HAVE_SCROLLBARS |
315 | scrollbar_ev.stop (display); |
334 | scrollbar_ev.stop (display); |
316 | #endif |
335 | #endif |
317 | #if TRANSPARENT |
336 | #if TRANSPARENT || ENABLE_PERL |
318 | rootwin_ev.stop (display); |
337 | rootwin_ev.stop (display); |
319 | #endif |
338 | #endif |
320 | incr_ev.stop (); |
339 | incr_ev.stop (); |
321 | termwin_ev.stop (display); |
340 | termwin_ev.stop (display); |
322 | vt_ev.stop (display); |
341 | vt_ev.stop (display); |
… | |
… | |
363 | { |
382 | { |
364 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
383 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
365 | (*t)->emergency_cleanup (); |
384 | (*t)->emergency_cleanup (); |
366 | } |
385 | } |
367 | |
386 | |
368 | #if ENABLE_FRILLS |
387 | #if !ENABLE_MINIMAL |
369 | static void |
388 | static void |
370 | print_x_error (Display *dpy, XErrorEvent *event) |
389 | print_x_error (Display *dpy, XErrorEvent *event) |
371 | { |
390 | { |
372 | char buffer[BUFSIZ]; |
391 | char buffer[BUFSIZ]; |
373 | char mesg[BUFSIZ]; |
392 | char mesg[BUFSIZ]; |
… | |
… | |
421 | GET_R->allowedxerror = event->error_code; |
440 | GET_R->allowedxerror = event->error_code; |
422 | else |
441 | else |
423 | { |
442 | { |
424 | // GET_R is most likely not the terminal which caused the error, |
443 | // GET_R is most likely not the terminal which caused the error, |
425 | // so just output the error and continue |
444 | // so just output the error and continue |
426 | #if ENABLE_FRILLS |
445 | #if ENABLE_MINIMAL |
|
|
446 | old_xerror_handler (display, event); |
|
|
447 | #else |
427 | print_x_error (display, event); |
448 | print_x_error (display, event); |
428 | #else |
|
|
429 | old_xerror_handler (display, event); |
|
|
430 | #endif |
449 | #endif |
431 | } |
450 | } |
432 | |
451 | |
433 | return 0; |
452 | return 0; |
434 | } |
453 | } |
… | |
… | |
442 | _exit (EXIT_FAILURE); |
461 | _exit (EXIT_FAILURE); |
443 | } |
462 | } |
444 | |
463 | |
445 | /*----------------------------------------------------------------------*/ |
464 | /*----------------------------------------------------------------------*/ |
446 | bool |
465 | bool |
447 | rxvt_term::init (int argc, const char *const *argv) |
466 | rxvt_term::init (int argc, const char *const *argv, stringvec *envv) |
448 | { |
467 | { |
|
|
468 | this->envv = envv; |
|
|
469 | |
449 | SET_R (this); |
470 | SET_R (this); |
450 | set_locale (""); |
471 | set_locale (""); |
451 | set_environ (envv); // few things in X do not call setlocale :( |
472 | set_environ (envv); // few things in X do not call setlocale :( |
452 | |
473 | |
453 | if (!init_vars ()) |
474 | if (!init_vars ()) |
… | |
… | |
464 | #ifdef HAVE_SCROLLBARS |
485 | #ifdef HAVE_SCROLLBARS |
465 | if (OPTION (Opt_scrollBar)) |
486 | if (OPTION (Opt_scrollBar)) |
466 | scrollBar.setIdle (); /* set existence for size calculations */ |
487 | scrollBar.setIdle (); /* set existence for size calculations */ |
467 | #endif |
488 | #endif |
468 | |
489 | |
469 | #if ENABLE_PERL |
490 | pty = ptytty::create (); |
470 | if (!rs[Rs_perl_ext_1]) |
|
|
471 | rs[Rs_perl_ext_1] = "default"; |
|
|
472 | |
|
|
473 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
|
|
474 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
|
|
475 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
476 | { |
|
|
477 | rxvt_perl.init (this); |
|
|
478 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
|
|
479 | } |
|
|
480 | #endif |
|
|
481 | |
|
|
482 | pty = rxvt_new_ptytty (); |
|
|
483 | |
491 | |
484 | create_windows (argc, argv); |
492 | create_windows (argc, argv); |
485 | |
493 | |
486 | dDisp; |
|
|
487 | |
|
|
488 | init_xlocale (); |
494 | init_xlocale (); |
489 | |
495 | |
490 | scr_reset (); // initialize screen |
496 | scr_reset (); // initialize screen |
491 | |
497 | |
492 | #if 0 |
498 | #if 0 |
493 | XSynchronize (disp, True); |
499 | XSynchronize (dpy, True); |
494 | #endif |
500 | #endif |
495 | |
501 | |
496 | #ifdef HAVE_SCROLLBARS |
502 | #ifdef HAVE_SCROLLBARS |
497 | if (OPTION (Opt_scrollBar)) |
503 | if (OPTION (Opt_scrollBar)) |
498 | resize_scrollbar (); /* create and map scrollbar */ |
504 | resize_scrollbar (); /* create and map scrollbar */ |
499 | #endif |
505 | #endif |
500 | #ifdef TRANSPARENT |
506 | #ifdef TRANSPARENT |
501 | if (OPTION (Opt_transparent)) |
507 | if (OPTION (Opt_transparent)) |
502 | { |
508 | { |
503 | XSelectInput (disp, display->root, PropertyChangeMask); |
509 | XSelectInput (dpy, display->root, PropertyChangeMask); |
504 | check_our_parents (); |
510 | check_our_parents (); |
505 | rootwin_ev.start (display, display->root); |
511 | rootwin_ev.start (display, display->root); |
506 | } |
512 | } |
507 | #endif |
513 | #endif |
508 | |
514 | #if ENABLE_PERL |
509 | XMapWindow (disp, vt); |
515 | rootwin_ev.start (display, display->root); |
510 | XMapWindow (disp, parent[0]); |
516 | #endif |
511 | |
517 | |
512 | set_colorfgbg (); |
518 | set_colorfgbg (); |
513 | |
519 | |
514 | init_command (cmd_argv); |
520 | init_command (cmd_argv); |
515 | |
521 | |
… | |
… | |
520 | |
526 | |
521 | check_ev.start (); |
527 | check_ev.start (); |
522 | |
528 | |
523 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
529 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
524 | |
530 | |
|
|
531 | #if ENABLE_XEMBED |
|
|
532 | if (rs[Rs_embed]) |
|
|
533 | { |
|
|
534 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
535 | |
|
|
536 | XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
537 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
538 | } |
|
|
539 | #endif |
|
|
540 | |
|
|
541 | XMapWindow (dpy, vt); |
|
|
542 | XMapWindow (dpy, parent[0]); |
|
|
543 | |
525 | return true; |
544 | return true; |
526 | } |
545 | } |
527 | |
546 | |
528 | static struct sig_handlers |
547 | static struct sig_handlers |
529 | { |
548 | { |
530 | sig_watcher sw_chld, sw_term, sw_int; |
549 | sig_watcher sw_term, sw_int; |
531 | |
550 | |
532 | void sig_chld (sig_watcher &w) |
|
|
533 | { |
|
|
534 | // we are being called for every SIGCHLD, find the corresponding term |
|
|
535 | int pid; |
|
|
536 | |
|
|
537 | while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) |
|
|
538 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
|
|
539 | if (pid == (*t)->cmd_pid) |
|
|
540 | { |
|
|
541 | (*t)->child_exit (); |
|
|
542 | break; |
|
|
543 | } |
|
|
544 | } |
|
|
545 | |
|
|
546 | /* |
551 | /* |
547 | * Catch a fatal signal and tidy up before quitting |
552 | * Catch a fatal signal and tidy up before quitting |
548 | */ |
553 | */ |
549 | void |
554 | void |
550 | sig_term (sig_watcher &w) |
555 | sig_term (sig_watcher &w) |
551 | { |
556 | { |
552 | #ifdef DEBUG_CMD |
|
|
553 | rxvt_warn ("caught signal %d, exiting.\n", w.signum); |
|
|
554 | #endif |
|
|
555 | rxvt_emergency_cleanup (); |
557 | rxvt_emergency_cleanup (); |
556 | signal (w.signum, SIG_DFL); |
558 | signal (w.signum, SIG_DFL); |
557 | kill (getpid (), w.signum); |
559 | kill (getpid (), w.signum); |
558 | } |
560 | } |
559 | |
561 | |
560 | sig_handlers () |
562 | sig_handlers () |
561 | : sw_chld (this, &sig_handlers::sig_chld), |
|
|
562 | sw_term (this, &sig_handlers::sig_term), |
563 | : sw_term (this, &sig_handlers::sig_term), |
563 | sw_int (this, &sig_handlers::sig_term) |
564 | sw_int (this, &sig_handlers::sig_term) |
564 | { |
565 | { |
565 | } |
566 | } |
566 | } sig_handlers; |
567 | } sig_handlers; |
567 | |
568 | |
568 | char **rxvt_environ; // startup environment |
569 | char **rxvt_environ; // startup environment |
569 | |
570 | |
570 | void |
571 | void |
571 | rxvt_init () |
572 | rxvt_init () |
572 | { |
573 | { |
573 | uid_t uid = getuid (); |
574 | ptytty::init (); |
574 | gid_t gid = getgid (); |
|
|
575 | |
|
|
576 | // before doing anything else, check for setuid/setgid operation, |
|
|
577 | // start the helper process and drop privileges |
|
|
578 | if (uid != geteuid () |
|
|
579 | || gid != getegid ()) |
|
|
580 | { |
|
|
581 | #if PTYTTY_HELPER |
|
|
582 | rxvt_ptytty_server (); |
|
|
583 | #else |
|
|
584 | rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n"); |
|
|
585 | #endif |
|
|
586 | |
|
|
587 | // drop privileges |
|
|
588 | #if HAVE_SETRESUID |
|
|
589 | setresgid (gid, gid, gid); |
|
|
590 | setresuid (uid, uid, uid); |
|
|
591 | #elif HAVE_SETREUID |
|
|
592 | setregid (gid, gid); |
|
|
593 | setreuid (uid, uid); |
|
|
594 | #elif HAVE_SETUID |
|
|
595 | setgid (gid); |
|
|
596 | setuid (uid); |
|
|
597 | #endif |
|
|
598 | |
|
|
599 | if (uid != geteuid () |
|
|
600 | || gid != getegid ()) |
|
|
601 | rxvt_fatal ("unable to drop privileges, aborting.\n"); |
|
|
602 | } |
|
|
603 | |
575 | |
604 | rxvt_environ = environ; |
576 | rxvt_environ = environ; |
605 | |
577 | |
606 | signal (SIGHUP, SIG_IGN); |
578 | signal (SIGHUP, SIG_IGN); |
607 | signal (SIGPIPE, SIG_IGN); |
579 | signal (SIGPIPE, SIG_IGN); |
608 | |
580 | |
609 | sig_handlers.sw_chld.start (SIGCHLD); |
|
|
610 | sig_handlers.sw_term.start (SIGTERM); |
581 | sig_handlers.sw_term.start (SIGTERM); |
611 | sig_handlers.sw_int.start (SIGINT); |
582 | sig_handlers.sw_int.start (SIGINT); |
612 | |
583 | |
613 | /* need to trap SIGURG for SVR4 (Unixware) rlogin */ |
584 | /* need to trap SIGURG for SVR4 (Unixware) rlogin */ |
614 | /* signal (SIGURG, SIG_DFL); */ |
585 | /* signal (SIGURG, SIG_DFL); */ |
… | |
… | |
643 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
614 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
644 | |
615 | |
645 | return p; |
616 | return p; |
646 | } |
617 | } |
647 | |
618 | |
648 | void * |
619 | void * |
649 | rxvt_realloc (void *ptr, size_t size) |
620 | rxvt_realloc (void *ptr, size_t size) |
650 | { |
621 | { |
651 | void *p = realloc (ptr, size); |
622 | void *p = realloc (ptr, size); |
652 | |
623 | |
653 | if (!p) |
624 | if (!p) |
… | |
… | |
666 | { |
637 | { |
667 | short recalc_x, recalc_y; |
638 | short recalc_x, recalc_y; |
668 | int x, y, sb_w, flags; |
639 | int x, y, sb_w, flags; |
669 | unsigned int w, h; |
640 | unsigned int w, h; |
670 | unsigned int max_width, max_height; |
641 | unsigned int max_width, max_height; |
671 | dDisp; |
|
|
672 | |
|
|
673 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
|
|
674 | ncol, nrow, szHint.width, szHint.height)); |
|
|
675 | |
642 | |
676 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
643 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
677 | szHint.win_gravity = NorthWestGravity; |
644 | szHint.win_gravity = NorthWestGravity; |
678 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
645 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
679 | |
646 | |
… | |
… | |
741 | |
708 | |
742 | if (scrollBar.state) |
709 | if (scrollBar.state) |
743 | { |
710 | { |
744 | sb_w = scrollbar_TotalWidth (); |
711 | sb_w = scrollbar_TotalWidth (); |
745 | szHint.base_width += sb_w; |
712 | szHint.base_width += sb_w; |
|
|
713 | |
746 | if (!OPTION (Opt_scrollBar_right)) |
714 | if (!OPTION (Opt_scrollBar_right)) |
747 | window_vt_x += sb_w; |
715 | window_vt_x += sb_w; |
748 | } |
716 | } |
749 | |
717 | |
750 | szHint.width_inc = fwidth; |
718 | szHint.width_inc = fwidth; |
751 | szHint.height_inc = fheight; |
719 | szHint.height_inc = fheight; |
752 | szHint.min_width = szHint.base_width + szHint.width_inc; |
720 | szHint.min_width = szHint.base_width + szHint.width_inc; |
753 | szHint.min_height = szHint.base_height + szHint.height_inc; |
721 | szHint.min_height = szHint.base_height + szHint.height_inc; |
754 | |
722 | |
755 | if (newwidth && newwidth - szHint.base_width < max_width) |
723 | if (newwidth && newwidth - szHint.base_width < max_width) |
756 | { |
724 | { |
757 | szHint.width = newwidth; |
725 | szHint.width = newwidth; |
… | |
… | |
776 | |
744 | |
777 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
745 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
778 | window_sb_x = szHint.width - sb_w; |
746 | window_sb_x = szHint.width - sb_w; |
779 | |
747 | |
780 | if (recalc_x) |
748 | if (recalc_x) |
781 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
749 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
|
|
750 | |
782 | if (recalc_y) |
751 | if (recalc_y) |
783 | szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; |
752 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
784 | |
753 | |
785 | ncol = width / fwidth; |
754 | ncol = width / fwidth; |
786 | nrow = height / fheight; |
755 | nrow = height / fheight; |
787 | D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
|
|
788 | ncol, nrow, szHint.width, |
|
|
789 | szHint.height)); |
|
|
790 | return; |
|
|
791 | } |
756 | } |
792 | |
757 | |
793 | /*----------------------------------------------------------------------*/ |
758 | /*----------------------------------------------------------------------*/ |
794 | /* |
759 | /* |
795 | * Tell the teletype handler what size the window is. |
760 | * Tell the teletype handler what size the window is. |
… | |
… | |
847 | delete fontset[0]; |
812 | delete fontset[0]; |
848 | fontset[0] = fs; |
813 | fontset[0] = fs; |
849 | |
814 | |
850 | prop = (*fs)[1]->properties (); |
815 | prop = (*fs)[1]->properties (); |
851 | prop.height += lineSpace; |
816 | prop.height += lineSpace; |
|
|
817 | |
852 | fs->set_prop (prop); |
818 | fs->set_prop (prop, false); |
853 | |
819 | |
854 | fwidth = prop.width; |
820 | fwidth = prop.width; |
855 | fheight = prop.height; |
821 | fheight = prop.height; |
856 | fbase = prop.ascent; |
822 | fbase = prop.ascent; |
857 | |
823 | |
… | |
… | |
876 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
842 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
877 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
843 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
878 | } |
844 | } |
879 | |
845 | |
880 | fs->populate (res); |
846 | fs->populate (res); |
881 | fs->set_prop (prop2); |
847 | fs->set_prop (prop2, true); |
882 | } |
848 | } |
883 | #else |
849 | #else |
884 | fontset[style] = fontset[0]; |
850 | fontset[style] = fontset[0]; |
885 | #endif |
851 | #endif |
886 | } |
852 | } |
… | |
… | |
895 | return true; |
861 | return true; |
896 | } |
862 | } |
897 | |
863 | |
898 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
864 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
899 | { |
865 | { |
900 | XChangeProperty (display->display, parent[0], |
866 | XChangeProperty (dpy, parent[0], |
901 | prop, XA_STRING, 8, PropModeReplace, |
867 | prop, XA_STRING, 8, PropModeReplace, |
902 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
868 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
903 | } |
869 | } |
904 | |
870 | |
905 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
871 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
906 | { |
872 | { |
907 | wchar_t *ws = rxvt_mbstowcs (str, len); |
873 | wchar_t *ws = rxvt_mbstowcs (str, len); |
908 | char *s = rxvt_wcstoutf8 (ws); |
874 | char *s = rxvt_wcstoutf8 (ws); |
909 | |
875 | |
910 | XChangeProperty (display->display, parent[0], |
876 | XChangeProperty (dpy, parent[0], |
911 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
877 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
912 | (const unsigned char *)s, strlen (s)); |
878 | (const unsigned char *)s, strlen (s)); |
913 | |
879 | |
914 | free (s); |
880 | free (s); |
915 | free (ws); |
881 | free (ws); |
… | |
… | |
940 | void |
906 | void |
941 | rxvt_term::set_window_color (int idx, const char *color) |
907 | rxvt_term::set_window_color (int idx, const char *color) |
942 | { |
908 | { |
943 | rxvt_color xcol; |
909 | rxvt_color xcol; |
944 | int i; |
910 | int i; |
945 | |
911 | |
946 | if (color == NULL || *color == '\0') |
912 | if (color == NULL || *color == '\0') |
947 | return; |
913 | return; |
|
|
914 | |
|
|
915 | color = strdup (color); |
|
|
916 | allocated.push_back ((void *)color); |
|
|
917 | rs[Rs_color + idx] = color; |
948 | |
918 | |
949 | /* handle color aliases */ |
919 | /* handle color aliases */ |
950 | if (isdigit (*color)) |
920 | if (isdigit (*color)) |
951 | { |
921 | { |
952 | i = atoi (color); |
922 | i = atoi (color); |
953 | |
923 | |
954 | if (i >= 8 && i <= 15) |
924 | if (i >= 8 && i <= 15) |
955 | { /* bright colors */ |
925 | { /* bright colors */ |
956 | i -= 8; |
926 | i -= 8; |
957 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
927 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
958 | SET_PIXCOLOR (idx); |
|
|
959 | goto done; |
928 | goto done; |
960 | } |
929 | } |
961 | |
930 | |
962 | if (i >= 0 && i <= 7) |
931 | if (i >= 0 && i <= 7) |
963 | { /* normal colors */ |
932 | { /* normal colors */ |
964 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
933 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
965 | SET_PIXCOLOR (idx); |
|
|
966 | goto done; |
934 | goto done; |
967 | } |
935 | } |
968 | } |
936 | } |
969 | |
937 | |
970 | if (!rXParseAllocColor (&xcol, color)) |
938 | set_color (xcol, color); |
971 | return; |
|
|
972 | |
|
|
973 | /* XStoreColor (display->display, display->cmap, XColor*); */ |
|
|
974 | |
939 | |
975 | /* |
940 | /* |
976 | * FIXME: should free colors here, but no idea how to do it so instead, |
941 | * FIXME: should free colors here, but no idea how to do it so instead, |
977 | * so just keep gobbling up the colormap |
942 | * so just keep gobbling up the colormap |
978 | */ |
943 | */ |
979 | # if 0 |
|
|
980 | for (i = Color_Black; i <= Color_White; i++) |
|
|
981 | if (pix_colors[idx] == pix_colors[i]) |
|
|
982 | break; |
|
|
983 | if (i > Color_White) |
|
|
984 | { |
|
|
985 | /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ |
|
|
986 | XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, |
|
|
987 | DisplayPlanes (display->display, display->screen)); |
|
|
988 | } |
|
|
989 | # endif |
|
|
990 | |
944 | |
991 | pix_colors_focused[idx] = xcol; |
945 | pix_colors_focused[idx] = xcol; |
992 | SET_PIXCOLOR (idx); |
|
|
993 | |
946 | |
994 | /* XSetWindowAttributes attr; */ |
947 | /* XSetWindowAttributes attr; */ |
995 | /* Cursor cursor; */ |
948 | /* Cursor cursor; */ |
996 | done: |
949 | done: |
997 | |
|
|
998 | #if OFF_FOCUS_FADING |
|
|
999 | if (rs[Rs_fade]) |
|
|
1000 | pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
|
|
1001 | #endif |
|
|
1002 | |
|
|
1003 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
950 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
1004 | |
951 | |
|
|
952 | update_fade_color (idx); |
1005 | recolour_cursor (); |
953 | recolour_cursor (); |
1006 | scr_recolour (); |
954 | scr_recolour (); |
1007 | } |
955 | } |
1008 | |
956 | |
1009 | #else |
957 | #else |
… | |
… | |
1011 | #endif /* XTERM_COLOR_CHANGE */ |
959 | #endif /* XTERM_COLOR_CHANGE */ |
1012 | |
960 | |
1013 | void |
961 | void |
1014 | rxvt_term::recolour_cursor () |
962 | rxvt_term::recolour_cursor () |
1015 | { |
963 | { |
1016 | XColor xcol[2]; |
964 | XColor fg, bg; |
1017 | |
965 | |
1018 | xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) |
966 | (ISSET_PIXCOLOR (Color_pointer_fg) |
1019 | ? pix_colors_focused[Color_pointer_fg] |
967 | ? pix_colors_focused[Color_pointer_fg] |
1020 | : pix_colors_focused[Color_fg]; |
968 | : pix_colors_focused[Color_fg]).get (fg); |
|
|
969 | |
1021 | xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) |
970 | (ISSET_PIXCOLOR (Color_pointer_bg) |
1022 | ? pix_colors_focused[Color_pointer_bg] |
971 | ? pix_colors_focused[Color_pointer_bg] |
1023 | : pix_colors_focused[Color_bg]; |
972 | : pix_colors_focused[Color_bg]).get (bg); |
1024 | |
973 | |
1025 | XQueryColors (display->display, display->cmap, xcol, 2); |
974 | XRecolorCursor (dpy, TermWin_cursor, &fg, &bg); |
1026 | XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); |
|
|
1027 | } |
975 | } |
1028 | |
976 | |
1029 | /*----------------------------------------------------------------------*/ |
977 | /*----------------------------------------------------------------------*/ |
1030 | /* |
978 | /* |
1031 | * find if fg/bg matches any of the normal (low-intensity) colors |
979 | * find if fg/bg matches any of the normal (low-intensity) colors |
… | |
… | |
1035 | { |
983 | { |
1036 | unsigned int i; |
984 | unsigned int i; |
1037 | const char *xpmb = "\0"; |
985 | const char *xpmb = "\0"; |
1038 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
986 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
1039 | |
987 | |
1040 | env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); |
|
|
1041 | strcpy (fstr, "default"); |
988 | strcpy (fstr, "default"); |
1042 | strcpy (bstr, "default"); |
989 | strcpy (bstr, "default"); |
1043 | for (i = Color_Black; i <= Color_White; i++) |
990 | for (i = Color_Black; i <= Color_White; i++) |
1044 | if (pix_colors[Color_fg] == pix_colors[i]) |
991 | if (pix_colors[Color_fg] == pix_colors[i]) |
1045 | { |
992 | { |
… | |
… | |
1060 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
1007 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
1061 | } |
1008 | } |
1062 | |
1009 | |
1063 | /*----------------------------------------------------------------------*/ |
1010 | /*----------------------------------------------------------------------*/ |
1064 | |
1011 | |
1065 | int |
1012 | bool |
1066 | rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) |
1013 | rxvt_term::set_color (rxvt_color &color, const char *name) |
1067 | { |
1014 | { |
1068 | if (!screen_in_out->set (display, colour)) |
1015 | if (color.set (this, name)) |
1069 | { |
|
|
1070 | rxvt_warn ("can't get colour '%s', continuing without.\n", colour); |
|
|
1071 | return false; |
|
|
1072 | } |
|
|
1073 | |
|
|
1074 | return true; |
1016 | return true; |
|
|
1017 | |
|
|
1018 | rxvt_warn ("can't get colour '%s', continuing without.\n", name); |
|
|
1019 | return false; |
|
|
1020 | } |
|
|
1021 | |
|
|
1022 | void |
|
|
1023 | rxvt_term::alias_color (int dst, int src) |
|
|
1024 | { |
|
|
1025 | pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); |
1075 | } |
1026 | } |
1076 | |
1027 | |
1077 | /* -------------------------------------------------------------------- * |
1028 | /* -------------------------------------------------------------------- * |
1078 | * - WINDOW RESIZING - * |
1029 | * - WINDOW RESIZING - * |
1079 | * -------------------------------------------------------------------- */ |
1030 | * -------------------------------------------------------------------- */ |
1080 | void |
1031 | void |
1081 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1032 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1082 | { |
1033 | { |
1083 | int fix_screen; |
1034 | int fix_screen; |
1084 | int old_width = szHint.width, old_height = szHint.height; |
1035 | int old_width = szHint.width; |
1085 | dDisp; |
1036 | int old_height = szHint.height; |
1086 | |
1037 | |
1087 | window_calc (newwidth, newheight); |
1038 | window_calc (newwidth, newheight); |
|
|
1039 | |
|
|
1040 | if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) |
1088 | XSetWMNormalHints (disp, parent[0], &szHint); |
1041 | XSetWMNormalHints (dpy, parent[0], &szHint); |
1089 | |
1042 | |
1090 | if (!ignoreparent) |
1043 | if (!ignoreparent) |
1091 | { |
1044 | { |
1092 | #ifdef SMART_RESIZE |
1045 | #ifdef SMART_RESIZE |
1093 | /* |
1046 | /* |
… | |
… | |
1097 | int x, y, x1, y1; |
1050 | int x, y, x1, y1; |
1098 | int dx, dy; |
1051 | int dx, dy; |
1099 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1052 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1100 | Window unused_cr; |
1053 | Window unused_cr; |
1101 | |
1054 | |
1102 | XTranslateCoordinates (disp, parent[0], display->root, |
1055 | XTranslateCoordinates (dpy, parent[0], display->root, |
1103 | 0, 0, &x, &y, &unused_cr); |
1056 | 0, 0, &x, &y, &unused_cr); |
1104 | XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, |
1057 | XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, |
1105 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1058 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1106 | /* |
1059 | /* |
1107 | * if display->root isn't the parent window, a WM will probably have offset |
1060 | * if display->root isn't the parent window, a WM will probably have offset |
1108 | * our position for handles and decorations. Counter it |
1061 | * our position for handles and decorations. Counter it |
1109 | */ |
1062 | */ |
… | |
… | |
1111 | { |
1064 | { |
1112 | x -= x1; |
1065 | x -= x1; |
1113 | y -= y1; |
1066 | y -= y1; |
1114 | } |
1067 | } |
1115 | |
1068 | |
1116 | x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; |
1069 | x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; |
1117 | y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; |
1070 | y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; |
1118 | dx = old_width - szHint.width; |
1071 | dx = old_width - szHint.width; |
1119 | dy = old_height - szHint.height; |
1072 | dy = old_height - szHint.height; |
1120 | |
1073 | |
1121 | /* Check position of the center of the window */ |
1074 | /* Check position of the center of the window */ |
1122 | if (x < x1) /* left half */ |
1075 | if (x < x1) /* left half */ |
1123 | dx = 0; |
1076 | dx = 0; |
… | |
… | |
1126 | if (y < y1) /* top half */ |
1079 | if (y < y1) /* top half */ |
1127 | dy = 0; |
1080 | dy = 0; |
1128 | else if (y == y1) /* exact center */ |
1081 | else if (y == y1) /* exact center */ |
1129 | dy /= 2; |
1082 | dy /= 2; |
1130 | |
1083 | |
1131 | XMoveResizeWindow (disp, parent[0], x + dx, y + dy, |
1084 | XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, |
1132 | szHint.width, szHint.height); |
1085 | szHint.width, szHint.height); |
1133 | #else |
1086 | #else |
1134 | XResizeWindow (disp, parent[0], szHint.width, szHint.height); |
1087 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
1135 | #endif |
1088 | #endif |
1136 | } |
1089 | } |
1137 | |
1090 | |
1138 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1091 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1139 | |
1092 | |
1140 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1093 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1141 | { |
1094 | { |
1142 | if (scrollBar.state) |
1095 | if (scrollBar.state) |
1143 | { |
1096 | { |
1144 | XMoveResizeWindow (disp, scrollBar.win, |
1097 | XMoveResizeWindow (dpy, scrollBar.win, |
1145 | window_sb_x, 0, |
1098 | window_sb_x, 0, |
1146 | scrollbar_TotalWidth (), szHint.height); |
1099 | scrollbar_TotalWidth (), szHint.height); |
1147 | resize_scrollbar (); |
1100 | resize_scrollbar (); |
1148 | } |
1101 | } |
1149 | |
1102 | |
1150 | XMoveResizeWindow (disp, vt, |
1103 | XMoveResizeWindow (dpy, vt, |
1151 | window_vt_x, window_vt_y, |
1104 | window_vt_x, window_vt_y, |
1152 | width, height); |
1105 | width, height); |
1153 | |
1106 | |
1154 | scr_clear (); |
1107 | scr_clear (); |
1155 | #ifdef XPM_BACKGROUND |
1108 | #ifdef XPM_BACKGROUND |
1156 | resize_pixmap (); |
1109 | resize_pixmap (); |
1157 | #endif |
1110 | #endif |
1158 | } |
1111 | } |
1159 | |
1112 | |
1160 | if (fix_screen || old_height == 0) |
1113 | if (fix_screen || old_height == 0) |
1161 | { |
|
|
1162 | int curr_screen = -1; |
|
|
1163 | int old_ncol = prev_ncol; |
|
|
1164 | |
|
|
1165 | /* scr_reset only works on the primary screen */ |
|
|
1166 | if (old_height) /* this is not the first time through */ |
|
|
1167 | { |
|
|
1168 | unsigned int ocol = ncol; |
|
|
1169 | ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
|
|
1170 | curr_screen = scr_change_screen (PRIMARY); |
|
|
1171 | ncol = ocol; |
|
|
1172 | } |
|
|
1173 | |
|
|
1174 | scr_reset (); |
1114 | scr_reset (); |
1175 | |
1115 | |
1176 | if (curr_screen >= 0) /* this is not the first time through */ |
1116 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
1177 | { |
1117 | //scr_touch (false); |
1178 | scr_change_screen (curr_screen); |
|
|
1179 | selection_check (old_ncol != ncol ? 4 : 0); |
|
|
1180 | } |
|
|
1181 | } |
|
|
1182 | |
|
|
1183 | old_width = szHint.width; |
|
|
1184 | old_height = szHint.height; |
|
|
1185 | |
1118 | |
1186 | #ifdef XPM_BACKGROUND |
1119 | #ifdef XPM_BACKGROUND |
1187 | if (pixmap) |
1120 | if (pixmap) |
1188 | scr_touch (false); |
1121 | scr_touch (false); |
1189 | #endif |
1122 | #endif |
1190 | |
1123 | |
1191 | #ifdef USE_XIM |
1124 | #ifdef USE_XIM |
1192 | IMSetStatusPosition (); |
1125 | IMSetPosition (); |
1193 | #endif |
1126 | #endif |
1194 | } |
1127 | } |
1195 | |
1128 | |
1196 | /* |
1129 | /* |
1197 | * Set the width/height of the vt window in characters. Units are pixels. |
1130 | * Set the width/height of the vt window in characters. Units are pixels. |
… | |
… | |
1202 | { |
1135 | { |
1203 | XWindowAttributes wattr; |
1136 | XWindowAttributes wattr; |
1204 | |
1137 | |
1205 | if (newwidth == 0 || newheight == 0) |
1138 | if (newwidth == 0 || newheight == 0) |
1206 | { |
1139 | { |
1207 | XGetWindowAttributes (display->display, display->root, &wattr); |
1140 | XGetWindowAttributes (dpy, display->root, &wattr); |
1208 | |
1141 | |
1209 | if (newwidth == 0) |
1142 | if (newwidth == 0) |
1210 | newwidth = wattr.width - szHint.base_width; |
1143 | newwidth = wattr.width - szHint.base_width; |
1211 | if (newheight == 0) |
1144 | if (newheight == 0) |
1212 | newheight = wattr.height - szHint.base_height; |
1145 | newheight = wattr.height - szHint.base_height; |
… | |
… | |
1226 | #ifdef USE_XIM |
1159 | #ifdef USE_XIM |
1227 | |
1160 | |
1228 | void |
1161 | void |
1229 | rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) |
1162 | rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) |
1230 | { |
1163 | { |
1231 | fg = pix_colors[Color_fg]; |
1164 | fg = pix_colors [Color_fg]; |
1232 | bg = pix_colors[Color_bg]; |
1165 | bg = pix_colors [Color_bg]; |
1233 | } |
1166 | } |
1234 | |
1167 | |
1235 | void |
1168 | void |
1236 | rxvt_term::im_set_size (XRectangle &size) |
1169 | rxvt_term::im_set_size (XRectangle &size) |
1237 | { |
1170 | { |
… | |
… | |
1274 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1207 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1275 | |
1208 | |
1276 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1209 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1277 | *p = '\0'; |
1210 | *p = '\0'; |
1278 | |
1211 | |
1279 | atom = XInternAtom (display->display, server, False); |
1212 | atom = XInternAtom (dpy, server, False); |
1280 | win = XGetSelectionOwner (display->display, atom); |
1213 | win = XGetSelectionOwner (dpy, atom); |
1281 | |
1214 | |
1282 | if (win != None) |
1215 | if (win != None) |
1283 | return True; |
1216 | return True; |
1284 | } |
1217 | } |
1285 | |
1218 | |
… | |
… | |
1292 | XPoint nspot; |
1225 | XPoint nspot; |
1293 | XVaNestedList preedit_attr; |
1226 | XVaNestedList preedit_attr; |
1294 | |
1227 | |
1295 | if (!Input_Context |
1228 | if (!Input_Context |
1296 | || !focus |
1229 | || !focus |
1297 | || !(input_style & XIMPreeditPosition)) |
1230 | || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks))) |
1298 | return; |
1231 | return; |
1299 | |
1232 | |
1300 | im_set_position (nspot); |
1233 | im_set_position (nspot); |
1301 | |
1234 | |
1302 | if (nspot.x == spot.x && nspot.y == spot.y) |
1235 | if (nspot.x == spot.x && nspot.y == spot.y) |
… | |
… | |
1321 | input_method = 0; |
1254 | input_method = 0; |
1322 | } |
1255 | } |
1323 | |
1256 | |
1324 | Input_Context = 0; |
1257 | Input_Context = 0; |
1325 | } |
1258 | } |
|
|
1259 | |
|
|
1260 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1261 | |
|
|
1262 | static void |
|
|
1263 | xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data) |
|
|
1264 | { |
|
|
1265 | ((rxvt_term *)client_data)->make_current (); |
|
|
1266 | HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END)); |
|
|
1267 | } |
|
|
1268 | |
|
|
1269 | static void |
|
|
1270 | xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data) |
|
|
1271 | { |
|
|
1272 | ((rxvt_term *)client_data)->make_current (); |
|
|
1273 | HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END)); |
|
|
1274 | } |
|
|
1275 | |
|
|
1276 | static void |
|
|
1277 | xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data) |
|
|
1278 | { |
|
|
1279 | rxvt_term *term = (rxvt_term *)client_data; |
|
|
1280 | XIMText *text = call_data->text; |
|
|
1281 | |
|
|
1282 | term->make_current (); |
|
|
1283 | |
|
|
1284 | if (text) |
|
|
1285 | { |
|
|
1286 | void *str; |
|
|
1287 | |
|
|
1288 | if (!text->encoding_is_wchar && text->string.multi_byte) |
|
|
1289 | { |
|
|
1290 | // of course, X makes it ugly again |
|
|
1291 | if (term->rs[Rs_imLocale]) |
|
|
1292 | SET_LOCALE (term->rs[Rs_imLocale]); |
|
|
1293 | |
|
|
1294 | str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); |
|
|
1295 | mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); |
|
|
1296 | |
|
|
1297 | if (term->rs[Rs_imLocale]) |
|
|
1298 | SET_LOCALE (term->locale); |
|
|
1299 | } |
|
|
1300 | else |
|
|
1301 | str = (void *)text->string.wide_char; |
|
|
1302 | |
|
|
1303 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
|
|
1304 | DT_INT, call_data->caret, |
|
|
1305 | DT_INT, call_data->chg_first, |
|
|
1306 | DT_INT, call_data->chg_length, |
|
|
1307 | DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, |
|
|
1308 | DT_WCS_LEN, str, str ? (int)text->length : 0, |
|
|
1309 | DT_END)); |
|
|
1310 | } |
|
|
1311 | else |
|
|
1312 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
|
|
1313 | DT_INT, call_data->caret, |
|
|
1314 | DT_INT, call_data->chg_first, |
|
|
1315 | DT_INT, call_data->chg_length, |
|
|
1316 | DT_END)); |
|
|
1317 | } |
|
|
1318 | |
|
|
1319 | #if 0 |
|
|
1320 | static void |
|
|
1321 | xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data) |
|
|
1322 | { |
|
|
1323 | ((rxvt_term *)client_data)->make_current (); |
|
|
1324 | HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET, |
|
|
1325 | DT_INT, call_data->position, |
|
|
1326 | DT_INT, call_data->direction, |
|
|
1327 | DT_INT, call_data->style, |
|
|
1328 | DT_END)); |
|
|
1329 | } |
|
|
1330 | #endif |
|
|
1331 | |
|
|
1332 | #endif |
1326 | |
1333 | |
1327 | /* |
1334 | /* |
1328 | * Try to open a XIM with the current modifiers, then see if we can |
1335 | * Try to open a XIM with the current modifiers, then see if we can |
1329 | * open a suitable preedit type |
1336 | * open a suitable preedit type |
1330 | */ |
1337 | */ |
… | |
… | |
1337 | XRectangle rect, status_rect, needed_rect; |
1344 | XRectangle rect, status_rect, needed_rect; |
1338 | unsigned long fg, bg; |
1345 | unsigned long fg, bg; |
1339 | const char *p; |
1346 | const char *p; |
1340 | char **s; |
1347 | char **s; |
1341 | XIMStyles *xim_styles; |
1348 | XIMStyles *xim_styles; |
|
|
1349 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1350 | XIMCallback xcb[4]; |
|
|
1351 | #endif |
1342 | |
1352 | |
1343 | set_environ (envv); |
1353 | set_environ (envv); |
1344 | |
1354 | |
1345 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1355 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1346 | return false; |
1356 | return false; |
1347 | |
1357 | |
1348 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
|
|
1349 | input_method = display->get_xim (locale, modifiers); |
1358 | input_method = display->get_xim (locale, modifiers); |
1350 | if (input_method == NULL) |
1359 | if (input_method == NULL) |
1351 | return false; |
1360 | return false; |
1352 | |
1361 | |
1353 | xim = input_method->xim; |
1362 | xim = input_method->xim; |
… | |
… | |
1373 | s = rxvt_splitcommastring (p); |
1382 | s = rxvt_splitcommastring (p); |
1374 | |
1383 | |
1375 | for (i = found = 0; !found && s[i]; i++) |
1384 | for (i = found = 0; !found && s[i]; i++) |
1376 | { |
1385 | { |
1377 | if (!strcmp (s[i], "OverTheSpot")) |
1386 | if (!strcmp (s[i], "OverTheSpot")) |
1378 | input_style = (XIMPreeditPosition | XIMStatusNothing); |
1387 | input_style = XIMPreeditPosition | XIMStatusNothing; |
1379 | else if (!strcmp (s[i], "OffTheSpot")) |
1388 | else if (!strcmp (s[i], "OffTheSpot")) |
1380 | input_style = (XIMPreeditArea | XIMStatusArea); |
1389 | input_style = XIMPreeditArea | XIMStatusArea; |
1381 | else if (!strcmp (s[i], "Root")) |
1390 | else if (!strcmp (s[i], "Root")) |
1382 | input_style = (XIMPreeditNothing | XIMStatusNothing); |
1391 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1383 | else if (!strcmp (s[i], "None")) |
1392 | else if (!strcmp (s[i], "None")) |
1384 | input_style = (XIMPreeditNone | XIMStatusNone); |
1393 | input_style = XIMPreeditNone | XIMStatusNone; |
|
|
1394 | #ifdef ENABLE_XIM_ONTHESPOT |
|
|
1395 | else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot")) |
|
|
1396 | input_style = XIMPreeditCallbacks | XIMStatusNothing; |
|
|
1397 | #endif |
|
|
1398 | else |
|
|
1399 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1385 | |
1400 | |
1386 | for (j = 0; j < xim_styles->count_styles; j++) |
1401 | for (j = 0; j < xim_styles->count_styles; j++) |
1387 | if (input_style == xim_styles->supported_styles[j]) |
1402 | if (input_style == xim_styles->supported_styles[j]) |
1388 | { |
1403 | { |
1389 | rxvt_freecommastring (s); |
1404 | rxvt_freecommastring (s); |
… | |
… | |
1427 | "*", |
1442 | "*", |
1428 | fheight, |
1443 | fheight, |
1429 | fheight + 1, fheight - 1, |
1444 | fheight + 1, fheight - 1, |
1430 | fheight - 2, fheight + 2); |
1445 | fheight - 2, fheight + 2); |
1431 | |
1446 | |
1432 | fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1447 | fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1433 | &missing_charset_list, &missing_charset_count, &def_string); |
1448 | &missing_charset_list, &missing_charset_count, &def_string); |
1434 | |
1449 | |
1435 | if (missing_charset_list) |
1450 | if (missing_charset_list) |
1436 | XFreeStringList (missing_charset_list); |
1451 | XFreeStringList (missing_charset_list); |
1437 | |
1452 | |
… | |
… | |
1478 | XNBackground, bg, |
1493 | XNBackground, bg, |
1479 | XNArea, &status_rect, |
1494 | XNArea, &status_rect, |
1480 | XNFontSet, fs, |
1495 | XNFontSet, fs, |
1481 | NULL); |
1496 | NULL); |
1482 | } |
1497 | } |
|
|
1498 | #if ENABLE_XIM_ONTHESPOT |
|
|
1499 | else if (input_style & XIMPreeditCallbacks) |
|
|
1500 | { |
|
|
1501 | im_set_position (spot); |
|
|
1502 | |
|
|
1503 | xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; |
|
|
1504 | xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; |
|
|
1505 | xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; |
|
|
1506 | # if 0 |
|
|
1507 | xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; |
|
|
1508 | # endif |
|
|
1509 | |
|
|
1510 | preedit_attr = XVaCreateNestedList (0, |
|
|
1511 | XNSpotLocation, &spot, |
|
|
1512 | XNPreeditStartCallback, &xcb[0], |
|
|
1513 | XNPreeditDoneCallback , &xcb[1], |
|
|
1514 | XNPreeditDrawCallback , &xcb[2], |
|
|
1515 | # if 0 |
|
|
1516 | XNPreeditCaretCallback, &xcb[3], |
|
|
1517 | # endif |
|
|
1518 | NULL); |
|
|
1519 | } |
|
|
1520 | #endif |
1483 | |
1521 | |
1484 | Input_Context = XCreateIC (xim, |
1522 | Input_Context = XCreateIC (xim, |
1485 | XNInputStyle, input_style, |
1523 | XNInputStyle, input_style, |
1486 | XNClientWindow, vt, |
1524 | XNClientWindow, vt, |
1487 | XNFocusWindow, parent[0], |
1525 | XNFocusWindow, parent[0], |
… | |
… | |
1489 | preedit_attr, |
1527 | preedit_attr, |
1490 | status_attr ? XNStatusAttributes : NULL, |
1528 | status_attr ? XNStatusAttributes : NULL, |
1491 | status_attr, NULL); |
1529 | status_attr, NULL); |
1492 | |
1530 | |
1493 | if (preedit_attr) XFree (preedit_attr); |
1531 | if (preedit_attr) XFree (preedit_attr); |
1494 | if (status_attr) XFree (status_attr); |
1532 | if (status_attr) XFree (status_attr); |
1495 | if (fs) XFreeFontSet (display->display, fs); |
1533 | if (fs) XFreeFontSet (dpy, fs); |
1496 | |
1534 | |
1497 | if (Input_Context == NULL) |
1535 | if (Input_Context == NULL) |
1498 | { |
1536 | { |
1499 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1537 | rxvt_warn ("failed to create input context, continuing without XIM.\n"); |
1500 | im_destroy (); |
1538 | im_destroy (); |
1501 | return false; |
1539 | return false; |
1502 | } |
1540 | } |
1503 | |
1541 | |
1504 | if (input_style & XIMPreeditArea) |
1542 | #if 0 |
|
|
1543 | // unfortunately, only the focus window is used by XIM, hard to fix |
|
|
1544 | if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) |
|
|
1545 | vt_select_input (); |
|
|
1546 | #endif |
|
|
1547 | |
1505 | IMSetStatusPosition (); |
1548 | IMSetPosition (); |
1506 | |
1549 | |
1507 | D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection")); |
|
|
1508 | return true; |
1550 | return true; |
1509 | } |
1551 | } |
1510 | |
1552 | |
1511 | void |
1553 | void |
1512 | rxvt_term::im_cb () |
1554 | rxvt_term::im_cb () |
… | |
… | |
1518 | |
1560 | |
1519 | make_current (); |
1561 | make_current (); |
1520 | |
1562 | |
1521 | im_destroy (); |
1563 | im_destroy (); |
1522 | |
1564 | |
1523 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
|
|
1524 | if (Input_Context) |
1565 | if (Input_Context) |
1525 | return; |
1566 | return; |
1526 | |
1567 | |
1527 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1568 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1528 | if (rs[Rs_imLocale]) |
1569 | if (rs[Rs_imLocale]) |
… | |
… | |
1570 | SET_LOCALE (locale); |
1611 | SET_LOCALE (locale); |
1571 | #endif |
1612 | #endif |
1572 | } |
1613 | } |
1573 | |
1614 | |
1574 | void |
1615 | void |
1575 | rxvt_term::IMSetStatusPosition () |
1616 | rxvt_term::IMSetPosition () |
1576 | { |
1617 | { |
1577 | XRectangle preedit_rect, status_rect, *needed_rect; |
1618 | XRectangle preedit_rect, status_rect, *needed_rect; |
1578 | XVaNestedList preedit_attr, status_attr; |
1619 | XVaNestedList preedit_attr, status_attr; |
1579 | |
1620 | |
1580 | if (!Input_Context |
1621 | if (!Input_Context |
1581 | || !focus |
1622 | || !focus |
1582 | || !(input_style & XIMPreeditArea) |
1623 | || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) |
1583 | || !IMisRunning ()) |
1624 | || !IMisRunning ()) |
1584 | return; |
1625 | return; |
1585 | |
1626 | |
|
|
1627 | if (input_style & XIMPreeditPosition) |
|
|
1628 | { |
|
|
1629 | im_set_size (preedit_rect); |
|
|
1630 | preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); |
|
|
1631 | |
|
|
1632 | XSetICValues (Input_Context, |
|
|
1633 | XNPreeditAttributes, preedit_attr, NULL); |
|
|
1634 | } |
|
|
1635 | else |
|
|
1636 | { |
1586 | /* Getting the necessary width of preedit area */ |
1637 | /* Getting the necessary width of preedit area */ |
1587 | status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); |
1638 | status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); |
1588 | XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); |
1639 | XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); |
1589 | XFree (status_attr); |
1640 | XFree (status_attr); |
1590 | |
1641 | |
1591 | im_set_preedit_area (preedit_rect, status_rect, *needed_rect); |
1642 | im_set_preedit_area (preedit_rect, status_rect, *needed_rect); |
1592 | XFree (needed_rect); |
1643 | XFree (needed_rect); |
1593 | |
1644 | |
1594 | preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); |
1645 | preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); |
1595 | status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); |
1646 | status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); |
1596 | |
1647 | |
1597 | XSetICValues (Input_Context, |
1648 | XSetICValues (Input_Context, |
1598 | XNPreeditAttributes, preedit_attr, |
1649 | XNPreeditAttributes, preedit_attr, |
1599 | XNStatusAttributes, status_attr, NULL); |
1650 | XNStatusAttributes, status_attr, |
|
|
1651 | NULL); |
1600 | |
1652 | |
|
|
1653 | XFree (status_attr); |
|
|
1654 | } |
|
|
1655 | |
1601 | XFree (preedit_attr); |
1656 | XFree (preedit_attr); |
1602 | XFree (status_attr); |
|
|
1603 | } |
1657 | } |
1604 | #endif /* USE_XIM */ |
1658 | #endif /* USE_XIM */ |
1605 | |
1659 | |
1606 | /*----------------------------------------------------------------------*/ |
|
|
1607 | rxvt_t rxvt_current_term; |
|
|
1608 | |
|
|
1609 | /*----------------------- end-of-file (C source) -----------------------*/ |
1660 | /*----------------------- end-of-file (C source) -----------------------*/ |