ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.108 by root, Wed Aug 25 05:03:33 2004 UTC vs.
Revision 1.184 by root, Tue Jan 17 12:22:59 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "keyboard.h"
36#include "rxvtperl.h"
36 37
38#include <limits>
39
37#include <signal.h> 40#include <csignal>
41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
40# include <grp.h> 44# include <grp.h>
41#endif 45#endif
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#include <cstring> 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
52static uid_t saved_euid;
53static gid_t saved_egid;
54#endif
55
56bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
48 65
49vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
50 67
51static char curlocale[128]; 68static char curlocale[128], savelocale[128];
52 69
53bool 70bool
54rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
55{ 72{
56 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
57 return false; 74 return false;
58 75
59 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
60 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
61 return true; 78 return true;
79}
80
81void
82rxvt_push_locale (const char *locale)
83{
84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale);
86}
87
88void
89rxvt_pop_locale ()
90{
91 rxvt_set_locale (savelocale);
62} 92}
63 93
64#if ENABLE_COMBINING 94#if ENABLE_COMBINING
65class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
66 96
… …
130#if TRANSPARENT 160#if TRANSPARENT
131 rootwin_ev (this, &rxvt_term::rootwin_cb), 161 rootwin_ev (this, &rxvt_term::rootwin_cb),
132#endif 162#endif
133#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
134 scrollbar_ev (this, &rxvt_term::x_cb), 164 scrollbar_ev (this, &rxvt_term::x_cb),
135#endif
136#ifdef MENUBAR
137 menubar_ev (this, &rxvt_term::x_cb),
138#endif 165#endif
139#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
140 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
141#endif 168#endif
142#ifdef TEXT_BLINK 169#ifdef TEXT_BLINK
… …
166 incr_ev (this, &rxvt_term::incr_cb) 193 incr_ev (this, &rxvt_term::incr_cb)
167{ 194{
168 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
169 196
170 termlist.push_back (this); 197 termlist.push_back (this);
171}
172 198
173rxvt_term::~rxvt_term () 199#ifdef KEYSYM_RESOURCE
174{ 200 keyboard = new keyboard_manager;
175 termlist.erase (find (termlist.begin (), termlist.end(), this));
176 201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif
205}
206
207// clean up the most important stuff, do *not* call x or free mem etc.
208// for use before an emergency exit
209void rxvt_term::emergency_cleanup ()
210{
177 if (cmd_pid) 211 if (cmd_pid)
178 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
179 213
180 pty.put ();
181
182#ifdef UTMP_SUPPORT 214#ifdef UTMP_SUPPORT
183 privileged_utmp (RESTORE); 215 privileged_utmp (RESTORE);
184#endif 216#endif
185 217
218 delete pty; pty = 0;
219}
220
221rxvt_term::~rxvt_term ()
222{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this));
226
227 emergency_cleanup ();
228
186#if ENABLE_STYLES 229#if ENABLE_STYLES
187 for (int i = RS_styleCount; --i; ) 230 for (int i = RS_styleCount; --i; )
188 if (TermWin.fontset[i] != TermWin.fontset[0]) 231 if (fontset[i] != fontset[0])
189 delete TermWin.fontset[i]; 232 delete fontset[i];
190#endif 233#endif
191 delete TermWin.fontset[0]; 234 delete fontset[0];
192 235
193 if (display) 236 if (display)
194 { 237 {
238 dDisp;
239
195 selection_clear (); 240 selection_clear ();
196 241
197#ifdef USE_XIM 242#ifdef USE_XIM
198 im_destroy (); 243 im_destroy ();
199#endif 244#endif
200#ifdef MENUBAR
201 if (menubarGC) XFreeGC (display->display, menubarGC);
202#endif
203#ifdef XTERM_SCROLLBAR 245#ifdef XTERM_SCROLLBAR
204 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
205 if (ShadowGC) XFreeGC (display->display, ShadowGC); 247 if (ShadowGC) XFreeGC (disp, ShadowGC);
206#endif 248#endif
207#ifdef PLAIN_SCROLLBAR 249#ifdef PLAIN_SCROLLBAR
208 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
209#endif 251#endif
210#ifdef NEXT_SCROLLBAR 252#ifdef NEXT_SCROLLBAR
211 if (blackGC) XFreeGC (display->display, blackGC); 253 if (blackGC) XFreeGC (disp, blackGC);
212 if (whiteGC) XFreeGC (display->display, whiteGC); 254 if (whiteGC) XFreeGC (disp, whiteGC);
213 if (grayGC) XFreeGC (display->display, grayGC); 255 if (grayGC) XFreeGC (disp, grayGC);
214 if (darkGC) XFreeGC (display->display, darkGC); 256 if (darkGC) XFreeGC (disp, darkGC);
215 if (stippleGC) XFreeGC (display->display, stippleGC); 257 if (stippleGC) XFreeGC (disp, stippleGC);
216 if (dimple) XFreePixmap (display->display, dimple); 258 if (dimple) XFreePixmap (disp, dimple);
217 if (upArrow) XFreePixmap (display->display, upArrow); 259 if (upArrow) XFreePixmap (disp, upArrow);
218 if (downArrow) XFreePixmap (display->display, downArrow); 260 if (downArrow) XFreePixmap (disp, downArrow);
219 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 261 if (upArrowHi) XFreePixmap (disp, upArrowHi);
220 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 262 if (downArrowHi) XFreePixmap (disp, downArrowHi);
221#endif 263#endif
222#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 264#ifdef RXVT_SCROLLBAR
223 if (topShadowGC) XFreeGC (display->display, topShadowGC); 265 if (topShadowGC) XFreeGC (disp, topShadowGC);
224 if (botShadowGC) XFreeGC (display->display, botShadowGC); 266 if (botShadowGC) XFreeGC (disp, botShadowGC);
225 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 267 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
226#endif 268#endif
227 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 269 if (gc) XFreeGC (disp, gc);
228 270
229#if defined(MENUBAR) && (MENUBAR_MAX > 1)
230 delete menuBar.drawable; 271 delete drawable;
231 //if (menuBar.win)
232 // XDestroyWindow (display->display, menuBar.win);
233#endif
234 delete TermWin.drawable;
235 // destroy all windows 272 // destroy all windows
236 if (TermWin.parent[0]) 273 if (parent[0])
237 XDestroyWindow (display->display, TermWin.parent[0]); 274 XDestroyWindow (disp, parent[0]);
238 } 275 }
239 276
240 // TODO: free pixcolours, colours should become part of rxvt_display 277 // TODO: free pixcolours, colours should become part of rxvt_display
241
242 delete pix_colors_focused; 278 delete pix_colors_focused;
243#ifdef OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
244 delete pix_colors_unfocused; 280 delete pix_colors_unfocused;
245#endif 281#endif
246 282
247 displays.put (display); 283 displays.put (display);
248 284
249 scr_release (); 285 scr_release ();
250 286
251 /* clear all resources */ 287 /* clear all resources */
252 for (int i = 0; i < allocated.size (); i++) 288 for (int i = 0; i < allocated.size (); i++)
253 free (allocated[i]); 289 free (allocated [i]);
254 290
255 free (selection.text); 291 free (selection.text);
256 // TODO: manage env vars in child only(!) 292 // TODO: manage env vars in child only(!)
257 free (env_windowid); 293 free (env_windowid);
258 free (env_display); 294 free (env_display);
259 free (env_term); 295 free (env_term);
260 free (env_colorfgbg); 296 free (env_colorfgbg);
261 free (locale); 297 free (locale);
262#if 0 298 free (v_buffer);
263 free (codeset); 299 free (incr_buf);
264#endif
265 300
266 delete envv; 301 delete envv;
267 delete argv; 302 delete argv;
303
304#ifdef KEYSYM_RESOURCE
305 delete keyboard;
306#endif
307}
308
309void
310rxvt_term::child_exit ()
311{
312 cmd_pid = 0;
313
314 if (!OPTION (Opt_hold))
315 destroy ();
268} 316}
269 317
270void 318void
271rxvt_term::destroy () 319rxvt_term::destroy ()
272{ 320{
… …
282#if USE_XIM 330#if USE_XIM
283 im_ev.stop (display); 331 im_ev.stop (display);
284#endif 332#endif
285#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
286 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
287#endif
288#if MENUBAR
289 menubar_ev.stop (display);
290#endif 335#endif
291#if TRANSPARENT 336#if TRANSPARENT
292 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
293#endif 338#endif
294 incr_ev.stop (); 339 incr_ev.stop ();
… …
318} 363}
319 364
320void 365void
321rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
322{ 367{
323 SET_R (this); 368 make_current ();
324 369
325 delete this; 370 delete this;
326} 371}
327 372
328/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
329/* rxvt_init () */ 374/*
375 * Exit gracefully, clearing the utmp entry and restoring tty attributes
376 * TODO: if debugging, this should free up any known resources if we can
377 */
378static XErrorHandler old_xerror_handler;
379
380static void
381rxvt_emergency_cleanup ()
382{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup ();
385}
386
387#if ENABLE_FRILLS
388static void
389print_x_error (Display *dpy, XErrorEvent *event)
390{
391 char buffer[BUFSIZ];
392 char mesg[BUFSIZ];
393 char number[32];
394 char *mtype = "XlibMessage";
395 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
396 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
397 rxvt_warn ("An X Error occured, trying to continue after report.\n");
398 rxvt_warn ("%s: %s\n", mesg, buffer);
399 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
401 sprintf(number, "%d", event->request_code);
402 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
403 rxvt_warn ("(which is %s)\n", buffer);
404 if (event->request_code >= 128) {
405 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
406 mesg, BUFSIZ);
407 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
408 }
409 if ((event->error_code == BadWindow) ||
410 (event->error_code == BadPixmap) ||
411 (event->error_code == BadCursor) ||
412 (event->error_code == BadFont) ||
413 (event->error_code == BadDrawable) ||
414 (event->error_code == BadColor) ||
415 (event->error_code == BadGC) ||
416 (event->error_code == BadIDChoice) ||
417 (event->error_code == BadValue) ||
418 (event->error_code == BadAtom)) {
419 if (event->error_code == BadValue)
420 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
421 mesg, BUFSIZ);
422 else if (event->error_code == BadAtom)
423 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
424 mesg, BUFSIZ);
425 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429 }
430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433}
434#endif
435
436int
437rxvt_xerror_handler (Display *display, XErrorEvent *event)
438{
439 if (GET_R->allowedxerror == -1)
440 GET_R->allowedxerror = event->error_code;
441 else
442 {
443 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue
445#if ENABLE_FRILLS
446 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif
450 }
451
452 return 0;
453}
454
455int
456rxvt_xioerror_handler (Display *display)
457{
458 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
459 DisplayString (display));
460 rxvt_emergency_cleanup ();
461 _exit (EXIT_FAILURE);
462}
463
464/*----------------------------------------------------------------------*/
330bool 465bool
331rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
332{ 467{
333 SET_R (this); 468 SET_R (this);
469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
334 471
335 if (!init_vars ()) 472 if (!init_vars ())
336 return false; 473 return false;
337 474
338 init_secondary (); 475 init_secondary ();
339 476
340 const char **cmd_argv = init_resources (argc, argv); 477 const char **cmd_argv = init_resources (argc, argv);
341 478
342 set_locale (""); 479#ifdef KEYSYM_RESOURCE
343 480 keyboard->register_done ();
344#if MENUBAR_MAX
345 menubar_read (rs[Rs_menu]);
346#endif 481#endif
482
347#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
348 if (options & Opt_scrollBar) 484 if (OPTION (Opt_scrollBar))
349 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
350#endif 486#endif
351 487
488#if ENABLE_PERL
489 if (!rs[Rs_perl_ext_1])
490 rs[Rs_perl_ext_1] = "default";
491
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
509 rxvt_perl.init (this);
510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
513
514 pty = rxvt_new_ptytty ();
515
352 create_windows (argc, argv); 516 create_windows (argc, argv);
353 517
518 dDisp;
519
354 init_xlocale (); 520 init_xlocale ();
355 521
356 scr_reset (); /* initialize screen */ 522 scr_reset (); // initialize screen
357 523
358#if 0 524#if 0
359 XSynchronize (display->display, True); 525 XSynchronize (disp, True);
360#endif 526#endif
361 527
362#ifdef HAVE_SCROLLBARS 528#ifdef HAVE_SCROLLBARS
363 if (options & Opt_scrollBar) 529 if (OPTION (Opt_scrollBar))
364 resize_scrollbar (); /* create and map scrollbar */ 530 resize_scrollbar (); /* create and map scrollbar */
365#endif 531#endif
366#if (MENUBAR_MAX)
367 if (menubar_visible ())
368 XMapWindow (display->display, menuBar.win);
369#endif
370#ifdef TRANSPARENT 532#ifdef TRANSPARENT
371 if (options & Opt_transparent) 533 if (OPTION (Opt_transparent))
372 { 534 {
373 XSelectInput (display->display, display->root, PropertyChangeMask); 535 XSelectInput (disp, display->root, PropertyChangeMask);
374 check_our_parents (); 536 check_our_parents ();
375 rootwin_ev.start (display, display->root); 537 rootwin_ev.start (display, display->root);
376 } 538 }
377#endif 539#endif
378 540
379 XMapWindow (display->display, TermWin.vt); 541 XMapWindow (disp, vt);
380 XMapWindow (display->display, TermWin.parent[0]); 542 XMapWindow (disp, parent[0]);
381 543
382 set_colorfgbg (); 544 set_colorfgbg ();
383 545
384 init_command (cmd_argv); 546 init_command (cmd_argv);
385 547
548 free (cmd_argv);
549
550 if (pty->pty >= 0)
386 pty_ev.start (pty.pty, EVENT_READ); 551 pty_ev.start (pty->pty, EVENT_READ);
387 552
388 check_ev.start (); 553 check_ev.start ();
389 554
555 HOOK_INVOKE ((this, HOOK_START, DT_END));
556
390 return true; 557 return true;
391} 558}
392 559
393static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 560static struct sig_handlers
561{
562 sig_watcher sw_chld, sw_term, sw_int;
563
564 void sig_chld (sig_watcher &w)
565 {
566 // we are being called for every SIGCHLD, find the corresponding term
567 int pid;
568
569 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
570 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
571 if (pid == (*t)->cmd_pid)
572 {
573 (*t)->child_exit ();
574 break;
575 }
576 }
577
578 /*
579 * Catch a fatal signal and tidy up before quitting
580 */
581 void
582 sig_term (sig_watcher &w)
583 {
584#ifdef DEBUG_CMD
585 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586#endif
587 rxvt_emergency_cleanup ();
588 signal (w.signum, SIG_DFL);
589 kill (getpid (), w.signum);
590 }
591
592 sig_handlers ()
593 : sw_chld (this, &sig_handlers::sig_chld),
594 sw_term (this, &sig_handlers::sig_term),
595 sw_int (this, &sig_handlers::sig_term)
596 {
597 }
598} sig_handlers;
599
600char **rxvt_environ; // startup environment
394 601
395void 602void
396rxvt_init () 603rxvt_init ()
397{ 604{
398 /* install exit handler for cleanup */ 605 rxvt_environ = environ;
399#if 0 606
400#ifdef HAVE_ATEXIT
401 atexit (rxvt_clean_exit);
402#else
403#endif
404#endif
405 /* 607 /*
406 * Save and then give up any super-user privileges 608 * Save and then give up any super-user privileges
407 * If we need privileges in any area then we must specifically request it. 609 * If we need privileges in any area then we must specifically request it.
408 * We should only need to be root in these cases: 610 * We should only need to be root in these cases:
409 * 1. write utmp entries on some systems 611 * 1. write utmp entries on some systems
410 * 2. chown tty on some systems 612 * 2. chown tty on some systems
411 */ 613 */
412 rxvt_privileges (SAVE); 614 rxvt_privileges (SAVE);
413 rxvt_privileges (IGNORE); 615 rxvt_privileges (IGNORE);
414 616
415 struct sigaction sa; 617 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN);
416 619
417 sigfillset (&sa.sa_mask); 620 sig_handlers.sw_chld.start (SIGCHLD);
418 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 621 sig_handlers.sw_term.start (SIGTERM);
419 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0); 622 sig_handlers.sw_int.start (SIGINT);
420 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
421 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
422 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
423 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
424 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
425 623
426 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
427 /* signal (SIGURG, SIG_DFL); */ 625 /* signal (SIGURG, SIG_DFL); */
428 626
429 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
628 // TODO: handle this with exceptions and tolerate the memory loss
430 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 629 XSetIOErrorHandler (rxvt_xioerror_handler);
431}
432 630
433/* ------------------------------------------------------------------------- * 631 XrmInitialize ();
434 * SIGNAL HANDLING & EXIT HANDLER *
435 * ------------------------------------------------------------------------- */
436/*
437 * Catch a SIGCHLD signal and exit if the direct child has died
438 */
439
440void rxvt_term::child_exited (int pid)
441{
442 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
443 if (pid == (*t)->cmd_pid)
444 {
445 (*t)->destroy ();
446 break;
447 }
448}
449
450/* ARGSUSED */
451/* INTPROTO */
452RETSIGTYPE
453rxvt_Child_signal (int sig __attribute__ ((unused)))
454{
455 int pid, save_errno = errno;
456
457 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
458 rxvt_term::child_exited (pid);
459
460 errno = save_errno;
461}
462
463/*
464 * Catch a fatal signal and tidy up before quitting
465 */
466/* INTPROTO */
467RETSIGTYPE
468rxvt_Exit_signal (int sig)
469{
470 signal (sig, SIG_DFL);
471#ifdef DEBUG_CMD
472 rxvt_warn ("caught signal %d, exiting.\n", sig);
473#endif
474 rxvt_clean_exit ();
475 kill (getpid (), sig);
476}
477
478/* INTPROTO */
479int
480rxvt_xerror_handler (Display *display, XErrorEvent *event)
481{
482 if (GET_R->allowedxerror == -1)
483 GET_R->allowedxerror = event->error_code;
484 else
485 {
486 old_xerror_handler (display, event);
487 GET_R->destroy ();
488 }
489
490 return 0;
491}
492
493/*----------------------------------------------------------------------*/
494/*
495 * Exit gracefully, clearing the utmp entry and restoring tty attributes
496 * TODO: if debugging, this should free up any known resources if we can
497 */
498/* INTPROTO */
499void
500rxvt_clean_exit ()
501{
502 // TODO: rxvtd should clean up all ressources
503 if (GET_R)
504 GET_R->destroy ();
505} 632}
506 633
507/* ------------------------------------------------------------------------- * 634/* ------------------------------------------------------------------------- *
508 * MEMORY ALLOCATION WRAPPERS * 635 * MEMORY ALLOCATION WRAPPERS *
509 * ------------------------------------------------------------------------- */ 636 * ------------------------------------------------------------------------- */
510/* INTPROTO */ 637void *
511void *
512rxvt_malloc (size_t size) 638rxvt_malloc (size_t size)
513{ 639{
514 void *p;
515
516 p = malloc (size); 640 void *p = malloc (size);
641
517 if (p) 642 if (!p)
518 return p;
519
520 rxvt_fatal ("memory allocation failure. aborting.\n"); 643 rxvt_fatal ("memory allocation failure. aborting.\n");
521 /* NOTREACHED */
522}
523 644
524/* INTPROTO */ 645 return p;
525void * 646}
647
648void *
526rxvt_calloc (size_t number, size_t size) 649rxvt_calloc (size_t number, size_t size)
527{ 650{
528 void *p;
529
530 p = calloc (number, size); 651 void *p = calloc (number, size);
652
531 if (p) 653 if (!p)
532 return p;
533
534 rxvt_fatal ("memory allocation failure. aborting.\n"); 654 rxvt_fatal ("memory allocation failure. aborting.\n");
535 /* NOTREACHED */
536}
537 655
538/* INTPROTO */ 656 return p;
657}
658
539void * 659void *
540rxvt_realloc (void *ptr, size_t size) 660rxvt_realloc (void *ptr, size_t size)
541{ 661{
542 void *p;
543
544 if (ptr)
545 p = realloc (ptr, size); 662 void *p = realloc (ptr, size);
546 else
547 p = malloc (size);
548 663
549 if (p) 664 if (!p)
550 return p;
551
552 rxvt_fatal ("memory allocation failure. aborting.\n"); 665 rxvt_fatal ("memory allocation failure. aborting.\n");
553 /* NOTREACHED */ 666
667 return p;
554} 668}
555 669
556/* ------------------------------------------------------------------------- * 670/* ------------------------------------------------------------------------- *
557 * PRIVILEGED OPERATIONS * 671 * PRIVILEGED OPERATIONS *
558 * ------------------------------------------------------------------------- */ 672 * ------------------------------------------------------------------------- */
559/* take care of suid/sgid super-user (root) privileges */ 673/* take care of suid/sgid super-user (root) privileges */
560void 674void
561rxvt_privileges (rxvt_privaction action) 675rxvt_privileges (rxvt_privaction action)
562{ 676{
563#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
564 static uid_t euid;
565 static gid_t egid;
566#endif
567
568#if ! defined(__CYGWIN32__) 677#if ! defined(__CYGWIN32__)
569# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 678# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
570 /* setreuid () is the poor man's setuid (), seteuid () */ 679 /* setreuid () is the poor man's setuid (), seteuid () */
571# define seteuid(a) setreuid(-1, (a)) 680# define seteuid(a) setreuid(-1, (a))
572# define setegid(a) setregid(-1, (a)) 681# define setegid(a) setregid(-1, (a))
… …
578 case IGNORE: 687 case IGNORE:
579 /* 688 /*
580 * change effective uid/gid - not real uid/gid - so we can switch 689 * change effective uid/gid - not real uid/gid - so we can switch
581 * back to root later, as required 690 * back to root later, as required
582 */ 691 */
692 setegid (getgid ());
583 seteuid (getuid ()); 693 seteuid (getuid ());
584 setegid (getgid ());
585 break; 694 break;
586 case SAVE: 695 case SAVE:
587 euid = geteuid ();
588 egid = getegid (); 696 saved_egid = getegid ();
697 saved_euid = geteuid ();
589 break; 698 break;
590 case RESTORE: 699 case RESTORE:
591 seteuid (euid);
592 setegid (egid); 700 setegid (saved_egid);
701 seteuid (saved_euid);
593 break; 702 break;
594 } 703 }
595# else 704# else
596 switch (action) 705 switch (action)
597 { 706 {
598 case IGNORE: 707 case IGNORE:
708 setgid (getgid ());
599 setuid (getuid ()); 709 setuid (getuid ());
600 setgid (getgid ());
601 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
602 case SAVE: 711 case SAVE:
603 /* FALLTHROUGH */ 712 /* FALLTHROUGH */
604 case RESTORE: 713 case RESTORE:
605 break; 714 break;
… …
610 719
611#ifdef UTMP_SUPPORT 720#ifdef UTMP_SUPPORT
612void 721void
613rxvt_term::privileged_utmp (rxvt_privaction action) 722rxvt_term::privileged_utmp (rxvt_privaction action)
614{ 723{
615 if ((options & Opt_utmpInhibit) 724 if (OPTION (Opt_utmpInhibit))
616 || !pty.name || !*pty.name)
617 return; 725 return;
618 726
619 rxvt_privileges (RESTORE); 727 rxvt_privileges (RESTORE);
620 728
621 if (action == SAVE) 729 if (action == SAVE)
622 makeutent (pty.name, rs[Rs_display_name]); 730 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
623 else 731 else
624 cleanutent (); 732 pty->logout ();
625 733
626 rxvt_privileges (IGNORE); 734 rxvt_privileges (IGNORE);
627} 735}
628#endif 736#endif
629 737
… …
631/* 739/*
632 * window size/position calculcations for XSizeHint and other storage. 740 * window size/position calculcations for XSizeHint and other storage.
633 * if width/height are non-zero then override calculated width/height 741 * if width/height are non-zero then override calculated width/height
634 */ 742 */
635void 743void
636rxvt_term::window_calc (unsigned int width, unsigned int height) 744rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637{ 745{
638 short recalc_x, recalc_y; 746 short recalc_x, recalc_y;
639 int x, y, sb_w, mb_h, flags; 747 int x, y, sb_w, flags;
640 unsigned int w, h; 748 unsigned int w, h;
641 unsigned int max_width, max_height; 749 unsigned int max_width, max_height;
750 dDisp;
642 751
643 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 752 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
644 TermWin.ncol, TermWin.nrow, szHint.width, 753 ncol, nrow, szHint.width, szHint.height));
645 szHint.height)); 754
646 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 755 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
647 szHint.win_gravity = NorthWestGravity; 756 szHint.win_gravity = NorthWestGravity;
648 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 757 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
649 758
650 recalc_x = recalc_y = 0; 759 recalc_x = recalc_y = 0;
651 flags = 0; 760 flags = 0;
761
652 if (!parsed_geometry) 762 if (!parsed_geometry)
653 { 763 {
654 parsed_geometry = 1; 764 parsed_geometry = 1;
765
655 if (rs[Rs_geometry]) 766 if (rs[Rs_geometry])
656 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 767 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
768
657 if (flags & WidthValue) 769 if (flags & WidthValue)
658 { 770 {
659 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 771 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
660 szHint.flags |= USSize; 772 szHint.flags |= USSize;
661 } 773 }
774
662 if (flags & HeightValue) 775 if (flags & HeightValue)
663 { 776 {
664 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 777 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
665 szHint.flags |= USSize; 778 szHint.flags |= USSize;
666 } 779 }
780
667 if (flags & XValue) 781 if (flags & XValue)
668 { 782 {
669 szHint.x = x; 783 szHint.x = x;
670 szHint.flags |= USPosition; 784 szHint.flags |= USPosition;
785
671 if (flags & XNegative) 786 if (flags & XNegative)
672 { 787 {
673 recalc_x = 1; 788 recalc_x = 1;
674 szHint.win_gravity = NorthEastGravity; 789 szHint.win_gravity = NorthEastGravity;
675 } 790 }
676 } 791 }
792
677 if (flags & YValue) 793 if (flags & YValue)
678 { 794 {
679 szHint.y = y; 795 szHint.y = y;
680 szHint.flags |= USPosition; 796 szHint.flags |= USPosition;
797
681 if (flags & YNegative) 798 if (flags & YNegative)
682 { 799 {
683 recalc_y = 1; 800 recalc_y = 1;
801
684 if (szHint.win_gravity == NorthEastGravity) 802 if (szHint.win_gravity == NorthEastGravity)
685 szHint.win_gravity = SouthEastGravity; 803 szHint.win_gravity = SouthEastGravity;
686 else 804 else
687 szHint.win_gravity = SouthWestGravity; 805 szHint.win_gravity = SouthWestGravity;
688 } 806 }
689 } 807 }
690 } 808 }
691 809
692 /* TODO: BOUNDS */ 810 /* TODO: BOUNDS */
693 TermWin.width = TermWin.ncol * TermWin.fwidth; 811 width = ncol * fwidth;
694 TermWin.height = TermWin.nrow * TermWin.fheight; 812 height = nrow * fheight;
695 max_width = MAX_COLS * TermWin.fwidth; 813 max_width = MAX_COLS * fwidth;
696 max_height = MAX_ROWS * TermWin.fheight; 814 max_height = MAX_ROWS * fheight;
697 815
698 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 816 szHint.base_width = szHint.base_height = 2 * int_bwidth;
699 817
700 sb_w = mb_h = 0; 818 sb_w = 0;
701 window_vt_x = window_vt_y = TermWin.int_bwidth; 819 window_vt_x = window_vt_y = int_bwidth;
702 820
703 if (scrollbar_visible ()) 821 if (scrollBar.state)
704 { 822 {
705 sb_w = scrollbar_TotalWidth (); 823 sb_w = scrollbar_TotalWidth ();
706 szHint.base_width += sb_w; 824 szHint.base_width += sb_w;
707 if (!(options & Opt_scrollBar_right)) 825 if (!OPTION (Opt_scrollBar_right))
708 window_vt_x += sb_w; 826 window_vt_x += sb_w;
709 } 827 }
710 828
711 if (menubar_visible ())
712 {
713 mb_h = menuBar_TotalHeight ();
714 szHint.base_height += mb_h;
715 window_vt_y += mb_h;
716 }
717
718 szHint.width_inc = TermWin.fwidth; 829 szHint.width_inc = fwidth;
719 szHint.height_inc = TermWin.fheight; 830 szHint.height_inc = fheight;
720 szHint.min_width = szHint.base_width + szHint.width_inc; 831 szHint.min_width = szHint.base_width + szHint.width_inc;
721 szHint.min_height = szHint.base_height + szHint.height_inc; 832 szHint.min_height = szHint.base_height + szHint.height_inc;
722 833
723 if (width && width - szHint.base_width < max_width) 834 if (newwidth && newwidth - szHint.base_width < max_width)
724 { 835 {
725 szHint.width = width; 836 szHint.width = newwidth;
726 TermWin.width = width - szHint.base_width; 837 width = newwidth - szHint.base_width;
727 } 838 }
728 else 839 else
729 { 840 {
730 MIN_IT (TermWin.width, max_width); 841 min_it (width, max_width);
731 szHint.width = szHint.base_width + TermWin.width; 842 szHint.width = szHint.base_width + width;
732 } 843 }
733 844
734 if (height && height - szHint.base_height < max_height) 845 if (newheight && newheight - szHint.base_height < max_height)
735 { 846 {
736 szHint.height = height; 847 szHint.height = newheight;
737 TermWin.height = height - szHint.base_height; 848 height = newheight - szHint.base_height;
738 } 849 }
739 else 850 else
740 { 851 {
741 MIN_IT (TermWin.height, max_height); 852 min_it (height, max_height);
742 szHint.height = szHint.base_height + TermWin.height; 853 szHint.height = szHint.base_height + height;
743 } 854 }
744 855
745 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 856 if (scrollBar.state && OPTION (Opt_scrollBar_right))
746 window_sb_x = szHint.width - sb_w; 857 window_sb_x = szHint.width - sb_w;
747 858
748 if (recalc_x) 859 if (recalc_x)
749 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 860 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
750 - szHint.width - 2 * TermWin.ext_bwidth);
751 if (recalc_y) 861 if (recalc_y)
752 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 862 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
753 - szHint.height - 2 * TermWin.ext_bwidth);
754 863
755 TermWin.ncol = TermWin.width / TermWin.fwidth; 864 ncol = width / fwidth;
756 TermWin.nrow = TermWin.height / TermWin.fheight; 865 nrow = height / fheight;
757 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 866 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
758 TermWin.ncol, TermWin.nrow, szHint.width, 867 ncol, nrow, szHint.width,
759 szHint.height)); 868 szHint.height));
760 return; 869 return;
761} 870}
762 871
763/*----------------------------------------------------------------------*/ 872/*----------------------------------------------------------------------*/
… …
766 * Called after a window size change. 875 * Called after a window size change.
767 */ 876 */
768void 877void
769rxvt_term::tt_winch () 878rxvt_term::tt_winch ()
770{ 879{
771 if (pty.pty < 0) 880 if (pty->pty < 0)
772 return; 881 return;
773 882
774 struct winsize ws; 883 struct winsize ws;
775 884
776 ws.ws_col = TermWin.ncol; 885 ws.ws_col = ncol;
777 ws.ws_row = TermWin.nrow; 886 ws.ws_row = nrow;
778 ws.ws_xpixel = TermWin.width; 887 ws.ws_xpixel = width;
779 ws.ws_ypixel = TermWin.height; 888 ws.ws_ypixel = height;
780 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 889 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
781 890
782#if 0 891#if 0
783 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 892 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
784 if (cmd_pid) /* force through to the command */ 893 if (cmd_pid) /* force through to the command */
785 kill (cmd_pid, SIGWINCH); 894 kill (-cmd_pid, SIGWINCH);
786#endif 895#endif
787} 896}
788 897
789/*----------------------------------------------------------------------*/ 898/*----------------------------------------------------------------------*/
790/* set_fonts () - load and set the various fonts 899/* set_fonts () - load and set the various fonts
791/* 900 *
792 * init = 1 - initialize 901 * init = 1 - initialize
793 * 902 *
794 * fontname == FONT_UP - switch to bigger font 903 * fontname == FONT_UP - switch to bigger font
795 * fontname == FONT_DN - switch to smaller font 904 * fontname == FONT_DN - switch to smaller font
796 */ 905 */
… …
798rxvt_term::set_fonts () 907rxvt_term::set_fonts ()
799{ 908{
800 rxvt_fontset *fs = new rxvt_fontset (this); 909 rxvt_fontset *fs = new rxvt_fontset (this);
801 rxvt_fontprop prop; 910 rxvt_fontprop prop;
802 911
803 prop.width = prop.height = prop.weight = prop.slant
804 = rxvt_fontprop::unset;
805
806 if (!fs 912 if (!fs
807 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed", prop) 913 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
808 || !fs->realize_font (1)) 914 || !fs->realize_font (1))
809 { 915 {
810 delete fs; 916 delete fs;
811 return false; 917 return false;
812 } 918 }
813 919
814#if ENABLE_STYLES 920#if ENABLE_STYLES
815 for (int i = RS_styleCount; --i; ) 921 for (int i = RS_styleCount; --i; )
816 if (TermWin.fontset[i] != TermWin.fontset[0]) 922 if (fontset[i] != fontset[0])
817 delete TermWin.fontset[i]; 923 delete fontset[i];
818#endif 924#endif
819 925
820 delete TermWin.fontset[0]; 926 delete fontset[0];
821 TermWin.fontset[0] = fs; 927 fontset[0] = fs;
822 928
823 fs->prop = prop = (*fs)[1]->properties (); 929 prop = (*fs)[1]->properties ();
930 prop.height += lineSpace;
931 fs->set_prop (prop);
824 932
825 TermWin.fwidth = prop.width; 933 fwidth = prop.width;
826 TermWin.fheight = prop.height; 934 fheight = prop.height;
827 TermWin.fweight = prop.weight; 935 fbase = prop.ascent;
828 TermWin.fslant = prop.slant;
829 TermWin.fbase = (*fs)[1]->ascent;
830 936
831 for (int style = 1; style < 4; style++) 937 for (int style = 1; style < 4; style++)
832 { 938 {
833#if ENABLE_STYLES 939#if ENABLE_STYLES
834 const char *res = rs[Rs_font + style]; 940 const char *res = rs[Rs_font + style];
835 941
836 if (res && !*res) 942 if (res && !*res)
837 TermWin.fontset[style] = TermWin.fontset[0]; 943 fontset[style] = fontset[0];
838 else 944 else
839 { 945 {
840 TermWin.fontset[style] = fs = new rxvt_fontset (this); 946 fontset[style] = fs = new rxvt_fontset (this);
841 rxvt_fontprop prop2 = prop; 947 rxvt_fontprop prop2 = prop;
842 948
843 if (res) 949 if (res)
844 prop2.weight = prop2.slant = rxvt_fontprop::unset; 950 prop2.weight = prop2.slant = rxvt_fontprop::unset;
845 else 951 else
846 { 952 {
847 res = TermWin.fontset[0]->fontdesc; 953 res = fontset[0]->fontdesc;
848 954
849 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 955 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
850 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 956 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
851 } 957 }
852 958
853 fs->populate (res, prop2); 959 fs->populate (res);
960 fs->set_prop (prop2);
854 } 961 }
855#else 962#else
856 TermWin.fontset[style] = TermWin.fontset[0]; 963 fontset[style] = fontset[0];
857#endif 964#endif
858 } 965 }
859 966
860 if (TermWin.parent[0]) 967 if (parent[0])
861 { 968 {
862 resize_all_windows (0, 0, 0); 969 resize_all_windows (0, 0, 0);
863 scr_remap_chars (); 970 scr_remap_chars ();
864 scr_touch (true); 971 scr_touch (true);
865 } 972 }
866 973
867 return true; 974 return true;
868} 975}
869 976
977void rxvt_term::set_string_property (Atom prop, const char *str, int len)
978{
979 XChangeProperty (display->display, parent[0],
980 prop, XA_STRING, 8, PropModeReplace,
981 (const unsigned char *)str, len >= 0 ? len : strlen (str));
982}
983
984void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
985{
986 wchar_t *ws = rxvt_mbstowcs (str, len);
987 char *s = rxvt_wcstoutf8 (ws);
988
989 XChangeProperty (display->display, parent[0],
990 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
991 (const unsigned char *)s, strlen (s));
992
993 free (s);
994 free (ws);
995}
996
870/*----------------------------------------------------------------------*/ 997/*----------------------------------------------------------------------*/
871/*----------------------------------------------------------------------*/ 998/*----------------------------------------------------------------------*/
872/* xterm sequences - title, iconName, color (exptl) */ 999/* xterm sequences - title, iconName, color (exptl) */
873void 1000void
874rxvt_term::set_title (const char *str) 1001rxvt_term::set_title (const char *str)
875{ 1002{
876#ifdef SMART_WINDOW_TITLE 1003 set_string_property (XA_WM_NAME, str);
877 char *name; 1004#if ENABLE_EWMH
878 1005 set_utf8_property (xa[XA_NET_WM_NAME], str);
879 if (!XFetchName (display->display, TermWin.parent[0], &name))
880 name = NULL;
881
882 if (name == NULL || strcmp (name, str))
883#endif
884 XStoreName (display->display, TermWin.parent[0], str);
885
886#ifdef SMART_WINDOW_TITLE
887 if (name)
888 XFree (name);
889#endif 1006#endif
890} 1007}
891 1008
892void 1009void
893rxvt_term::set_icon_name (const char *str) 1010rxvt_term::set_icon_name (const char *str)
894{ 1011{
895#ifdef SMART_WINDOW_TITLE 1012 set_string_property (XA_WM_ICON_NAME, str);
896 char *name; 1013#if ENABLE_EWMH
897 1014 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
898 if (!XGetIconName (display->display, TermWin.parent[0], &name))
899 name = NULL;
900
901 if (name == NULL || strcmp (name, str))
902#endif
903 XSetIconName (display->display, TermWin.parent[0], str);
904
905#ifdef SMART_WINDOW_TITLE
906 if (name)
907 XFree (name);
908#endif 1015#endif
909} 1016}
910 1017
911#ifdef XTERM_COLOR_CHANGE 1018#ifdef XTERM_COLOR_CHANGE
912void 1019void
… …
920 1027
921 /* handle color aliases */ 1028 /* handle color aliases */
922 if (isdigit (*color)) 1029 if (isdigit (*color))
923 { 1030 {
924 i = atoi (color); 1031 i = atoi (color);
1032
925 if (i >= 8 && i <= 15) 1033 if (i >= 8 && i <= 15)
926 { /* bright colors */ 1034 { /* bright colors */
927 i -= 8; 1035 i -= 8;
928# ifndef NO_BRIGHTCOLOR
929 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1036 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
930 SET_PIXCOLOR (idx); 1037 SET_PIXCOLOR (idx);
931 goto Done; 1038 goto done;
932# endif
933
934 } 1039 }
1040
935 if (i >= 0 && i <= 7) 1041 if (i >= 0 && i <= 7)
936 { /* normal colors */ 1042 { /* normal colors */
937 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1043 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
938 SET_PIXCOLOR (idx); 1044 SET_PIXCOLOR (idx);
939 goto Done; 1045 goto done;
940 } 1046 }
941 } 1047 }
942 1048
943 if (!rXParseAllocColor (& xcol, color)) 1049 if (!rXParseAllocColor (&xcol, color))
944 return; 1050 return;
945 1051
946 /* XStoreColor (display->display, display->cmap, XColor*); */ 1052 /* XStoreColor (display->display, display->cmap, XColor*); */
947 1053
948 /* 1054 /*
… …
964 pix_colors_focused[idx] = xcol; 1070 pix_colors_focused[idx] = xcol;
965 SET_PIXCOLOR (idx); 1071 SET_PIXCOLOR (idx);
966 1072
967 /* XSetWindowAttributes attr; */ 1073 /* XSetWindowAttributes attr; */
968 /* Cursor cursor; */ 1074 /* Cursor cursor; */
969Done: 1075done:
1076
970#ifdef OFF_FOCUS_FADING 1077#if OFF_FOCUS_FADING
971 if (rs[Rs_fade]) 1078 if (rs[Rs_fade])
972 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1079 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
973#endif 1080#endif
974 1081
975 /*TODO: handle Color_BD, scrollbar background, etc. */ 1082 /*TODO: handle Color_BD, scrollbar background, etc. */
976 1083
977 recolour_cursor (); 1084 recolour_cursor ();
… …
1031 1138
1032 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1139 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1033} 1140}
1034 1141
1035/*----------------------------------------------------------------------*/ 1142/*----------------------------------------------------------------------*/
1036/*
1037 * Colour determination for low colour displays, routine from
1038 * Hans de Goede <hans@highrise.nl>
1039 */
1040 1143
1041int 1144int
1042rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1145rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1043{ 1146{
1044 if (!screen_in_out->set (display, colour)) 1147 if (!screen_in_out->set (display, colour))
… …
1052 1155
1053/* -------------------------------------------------------------------- * 1156/* -------------------------------------------------------------------- *
1054 * - WINDOW RESIZING - * 1157 * - WINDOW RESIZING - *
1055 * -------------------------------------------------------------------- */ 1158 * -------------------------------------------------------------------- */
1056void 1159void
1057rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1160rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1058{ 1161{
1059 int fix_screen; 1162 int fix_screen;
1060
1061#ifdef SMART_RESIZE
1062 int old_width = szHint.width, old_height = szHint.height; 1163 int old_width = szHint.width, old_height = szHint.height;
1063#endif 1164 dDisp;
1064 1165
1065 window_calc (width, height); 1166 window_calc (newwidth, newheight);
1066 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1167 XSetWMNormalHints (disp, parent[0], &szHint);
1067 1168
1068 if (!ignoreparent) 1169 if (!ignoreparent)
1069 { 1170 {
1070#ifdef SMART_RESIZE 1171#ifdef SMART_RESIZE
1071 /* 1172 /*
… …
1075 int x, y, x1, y1; 1176 int x, y, x1, y1;
1076 int dx, dy; 1177 int dx, dy;
1077 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1178 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1078 Window unused_cr; 1179 Window unused_cr;
1079 1180
1080 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1181 XTranslateCoordinates (disp, parent[0], display->root,
1081 0, 0, &x, &y, &unused_cr); 1182 0, 0, &x, &y, &unused_cr);
1082 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1183 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1083 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1184 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1084 /* 1185 /*
1085 * if display->root isn't the parent window, a WM will probably have offset 1186 * if display->root isn't the parent window, a WM will probably have offset
1086 * our position for handles and decorations. Counter it 1187 * our position for handles and decorations. Counter it
1087 */ 1188 */
… …
1089 { 1190 {
1090 x -= x1; 1191 x -= x1;
1091 y -= y1; 1192 y -= y1;
1092 } 1193 }
1093 1194
1094 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1195 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1095 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1196 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1096 dx = old_width - szHint.width; 1197 dx = old_width - szHint.width;
1097 dy = old_height - szHint.height; 1198 dy = old_height - szHint.height;
1098 1199
1099 /* Check position of the center of the window */ 1200 /* Check position of the center of the window */
1100 if (x < x1) /* left half */ 1201 if (x < x1) /* left half */
… …
1104 if (y < y1) /* top half */ 1205 if (y < y1) /* top half */
1105 dy = 0; 1206 dy = 0;
1106 else if (y == y1) /* exact center */ 1207 else if (y == y1) /* exact center */
1107 dy /= 2; 1208 dy /= 2;
1108 1209
1109 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1210 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1110 szHint.width, szHint.height); 1211 szHint.width, szHint.height);
1111#else 1212#else
1112 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1213 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1113#endif 1214#endif
1114 } 1215 }
1115 1216
1116 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1217 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1117 1218
1118 if (fix_screen || width != old_width || height != old_height) 1219 if (fix_screen || newwidth != old_width || newheight != old_height)
1119 { 1220 {
1120 if (scrollbar_visible ()) 1221 if (scrollBar.state)
1121 { 1222 {
1122 XMoveResizeWindow (display->display, scrollBar.win, 1223 XMoveResizeWindow (disp, scrollBar.win,
1123 window_sb_x, 0, 1224 window_sb_x, 0,
1124 scrollbar_TotalWidth (), szHint.height); 1225 scrollbar_TotalWidth (), szHint.height);
1125 resize_scrollbar (); 1226 resize_scrollbar ();
1126 } 1227 }
1127 1228
1128 if (menubar_visible ())
1129 XMoveResizeWindow (display->display, menuBar.win,
1130 window_vt_x, 0,
1131 TermWin_TotalWidth (), menuBar_TotalHeight ());
1132
1133 XMoveResizeWindow (display->display, TermWin.vt, 1229 XMoveResizeWindow (disp, vt,
1134 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1135 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1231 width, height);
1232
1136 scr_clear (); 1233 scr_clear ();
1137#ifdef XPM_BACKGROUND 1234#ifdef XPM_BACKGROUND
1138 resize_pixmap (); 1235 resize_pixmap ();
1139#endif 1236#endif
1140 } 1237 }
… …
1145 int old_ncol = prev_ncol; 1242 int old_ncol = prev_ncol;
1146 1243
1147 /* scr_reset only works on the primary screen */ 1244 /* scr_reset only works on the primary screen */
1148 if (old_height) /* this is not the first time through */ 1245 if (old_height) /* this is not the first time through */
1149 { 1246 {
1150 unsigned int ncol = TermWin.ncol; 1247 unsigned int ocol = ncol;
1151 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1248 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1152 curr_screen = scr_change_screen (PRIMARY); 1249 curr_screen = scr_change_screen (PRIMARY);
1153 TermWin.ncol = ncol; 1250 ncol = ocol;
1154 } 1251 }
1155 1252
1156 scr_reset (); 1253 scr_reset ();
1157 1254
1158 if (curr_screen >= 0) /* this is not the first time through */ 1255 if (curr_screen >= 0) /* this is not the first time through */
1159 { 1256 {
1160 scr_change_screen (curr_screen); 1257 scr_change_screen (curr_screen);
1161 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1258 selection_check (old_ncol != ncol ? 4 : 0);
1162 } 1259 }
1163 } 1260 }
1164 1261
1165 old_width = szHint.width; 1262 old_width = szHint.width;
1166 old_height = szHint.height; 1263 old_height = szHint.height;
1264
1265#ifdef XPM_BACKGROUND
1266 if (pixmap)
1267 scr_touch (false);
1268#endif
1167 1269
1168#ifdef USE_XIM 1270#ifdef USE_XIM
1169 IMSetStatusPosition (); 1271 IMSetStatusPosition ();
1170#endif 1272#endif
1171} 1273}
… …
1173/* 1275/*
1174 * Set the width/height of the vt window in characters. Units are pixels. 1276 * Set the width/height of the vt window in characters. Units are pixels.
1175 * good for toggling 80/132 columns 1277 * good for toggling 80/132 columns
1176 */ 1278 */
1177void 1279void
1178rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1280rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1179{ 1281{
1180 XWindowAttributes wattr; 1282 XWindowAttributes wattr;
1181 1283
1182 if (width == 0 || height == 0) 1284 if (newwidth == 0 || newheight == 0)
1183 { 1285 {
1184 XGetWindowAttributes (display->display, display->root, &wattr); 1286 XGetWindowAttributes (display->display, display->root, &wattr);
1287
1185 if (width == 0) 1288 if (newwidth == 0)
1186 width = wattr.width - szHint.base_width; 1289 newwidth = wattr.width - szHint.base_width;
1187 if (height == 0) 1290 if (newheight == 0)
1188 height = wattr.height - szHint.base_height; 1291 newheight = wattr.height - szHint.base_height;
1189 }
1190
1191 if (width != TermWin.width || height != TermWin.height)
1192 { 1292 }
1293
1294 if (newwidth != width || newheight != height)
1295 {
1193 width += szHint.base_width; 1296 newwidth += szHint.base_width;
1194 height += szHint.base_height; 1297 newheight += szHint.base_height;
1195 resize_all_windows (width, height, 0); 1298 resize_all_windows (newwidth, newheight, 0);
1196 } 1299 }
1197} 1300}
1198 1301
1199/* -------------------------------------------------------------------- * 1302/* -------------------------------------------------------------------- *
1200 * - X INPUT METHOD ROUTINES - * 1303 * - X INPUT METHOD ROUTINES - *
… …
1210 1313
1211void 1314void
1212rxvt_term::im_set_size (XRectangle &size) 1315rxvt_term::im_set_size (XRectangle &size)
1213{ 1316{
1214 // the int_bwidth terms make no sense to me 1317 // the int_bwidth terms make no sense to me
1215 size.x = TermWin.int_bwidth; 1318 size.x = int_bwidth;
1216 size.y = TermWin.int_bwidth; 1319 size.y = int_bwidth;
1217 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1320 size.width = Width2Pixel (ncol) + int_bwidth;
1218 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1321 size.height = Height2Pixel (nrow) + int_bwidth;
1219} 1322}
1220 1323
1221void 1324void
1222rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1325rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1223 XRectangle &status_rect, 1326 XRectangle &status_rect,
1224 const XRectangle &needed_rect) 1327 const XRectangle &needed_rect)
1225{ 1328{
1226 preedit_rect.x = needed_rect.width; 1329 preedit_rect.x = needed_rect.width;
1227 preedit_rect.y = 0; 1330 preedit_rect.y = 0;
1228 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1331 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1229 preedit_rect.height = TermWin.fheight; 1332 preedit_rect.height = fheight;
1230 1333
1231 status_rect.x = 0; 1334 status_rect.x = 0;
1232 status_rect.y = 0; 1335 status_rect.y = 0;
1233 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1336 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1234 status_rect.height = TermWin.fheight; 1337 status_rect.height = fheight;
1235} 1338}
1236 1339
1237/* Checking whether input method is running. */ 1340/* Checking whether input method is running. */
1238bool 1341bool
1239rxvt_term::IMisRunning () 1342rxvt_term::IMisRunning ()
… …
1263} 1366}
1264 1367
1265void 1368void
1266rxvt_term::IMSendSpot () 1369rxvt_term::IMSendSpot ()
1267{ 1370{
1268 XPoint spot; 1371 XPoint nspot;
1269 XVaNestedList preedit_attr; 1372 XVaNestedList preedit_attr;
1270 1373
1271 if (!Input_Context 1374 if (!Input_Context
1272 || !TermWin.focus 1375 || !focus
1273 || !(input_style & XIMPreeditPosition) 1376 || !(input_style & XIMPreeditPosition))
1274#if 0
1275 || !(event_type == KeyPress
1276 || event_type == Expose
1277 || event_type == NoExpose
1278 || event_type == SelectionNotify
1279 || event_type == ButtonRelease || event_type == FocusIn)
1280#endif
1281 || !IMisRunning ())
1282 return; 1377 return;
1283 1378
1284 im_set_position (spot); 1379 im_set_position (nspot);
1380
1381 if (nspot.x == spot.x && nspot.y == spot.y)
1382 return;
1383
1384 spot = nspot;
1285 1385
1286 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1386 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1287 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1387 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1288 XFree (preedit_attr); 1388 XFree (preedit_attr);
1289} 1389}
1290 1390
1291void 1391void
1292rxvt_term::im_destroy () 1392rxvt_term::im_destroy ()
1293{ 1393{
1294 if (Input_Context)
1295 {
1296 XDestroyIC (Input_Context);
1297 Input_Context = 0;
1298 }
1299
1300 if (input_method) 1394 if (input_method)
1301 { 1395 {
1396 if (Input_Context && input_method->xim)
1397 XDestroyIC (Input_Context);
1398
1302 display->put_xim (input_method); 1399 display->put_xim (input_method);
1303 input_method = 0; 1400 input_method = 0;
1304 } 1401 }
1402
1403 Input_Context = 0;
1305} 1404}
1306 1405
1307/* 1406/*
1308 * Try to open a XIM with the current modifiers, then see if we can 1407 * Try to open a XIM with the current modifiers, then see if we can
1309 * open a suitable preedit type 1408 * open a suitable preedit type
… …
1318 unsigned long fg, bg; 1417 unsigned long fg, bg;
1319 const char *p; 1418 const char *p;
1320 char **s; 1419 char **s;
1321 XIMStyles *xim_styles; 1420 XIMStyles *xim_styles;
1322 1421
1422 set_environ (envv);
1423
1323 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1424 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1324 return false; 1425 return false;
1325 1426
1326 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1427 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1327 input_method = display->get_xim (locale, modifiers); 1428 input_method = display->get_xim (locale, modifiers);
1328 if (input_method == NULL) 1429 if (input_method == NULL)
1329 return false; 1430 return false;
1330 1431
1331 xim = input_method->xim; 1432 xim = input_method->xim;
1433 spot.x = spot.y = -1;
1332 1434
1333 xim_styles = NULL; 1435 xim_styles = NULL;
1334 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1436 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1335 || !xim_styles || !xim_styles->count_styles) 1437 || !xim_styles || !xim_styles->count_styles)
1336 { 1438 {
1337 im_destroy (); 1439 im_destroy ();
1338 return false; 1440 return false;
1339 } 1441 }
1340 1442
1341 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1443 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1444
1445 for (int pi = 0; pi < 2; pi++)
1446 {
1447 p = pet[pi];
1448
1449 if (!p)
1450 continue;
1451
1342 s = rxvt_splitcommastring (p); 1452 s = rxvt_splitcommastring (p);
1343 1453
1344 for (i = found = 0; !found && s[i]; i++) 1454 for (i = found = 0; !found && s[i]; i++)
1345 { 1455 {
1346 if (!strcmp (s[i], "OverTheSpot")) 1456 if (!strcmp (s[i], "OverTheSpot"))
1347 input_style = (XIMPreeditPosition | XIMStatusNothing); 1457 input_style = (XIMPreeditPosition | XIMStatusNothing);
1348 else if (!strcmp (s[i], "OffTheSpot")) 1458 else if (!strcmp (s[i], "OffTheSpot"))
1349 input_style = (XIMPreeditArea | XIMStatusArea); 1459 input_style = (XIMPreeditArea | XIMStatusArea);
1350 else if (!strcmp (s[i], "Root")) 1460 else if (!strcmp (s[i], "Root"))
1351 input_style = (XIMPreeditNothing | XIMStatusNothing); 1461 input_style = (XIMPreeditNothing | XIMStatusNothing);
1462 else if (!strcmp (s[i], "None"))
1463 input_style = (XIMPreeditNone | XIMStatusNone);
1352 1464
1353 for (j = 0; j < xim_styles->count_styles; j++) 1465 for (j = 0; j < xim_styles->count_styles; j++)
1354 if (input_style == xim_styles->supported_styles[j]) 1466 if (input_style == xim_styles->supported_styles[j])
1355 { 1467 {
1468 rxvt_freecommastring (s);
1469
1356 found = 1; 1470 found = 1;
1357 break; 1471 goto foundpet;
1472 }
1473
1358 } 1474 }
1359 }
1360 1475
1361 for (i = 0; s[i]; i++) 1476 rxvt_freecommastring (s);
1362 free (s[i]); 1477 }
1363 1478
1364 free (s); 1479foundpet:
1480
1365 XFree (xim_styles); 1481 XFree (xim_styles);
1366 1482
1367 if (!found) 1483 if (!found)
1368 { 1484 {
1369 im_destroy (); 1485 im_destroy ();
… …
1386 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1502 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1387 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1503 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1388 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1504 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1389 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1505 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1390 "*", 1506 "*",
1391 TermWin.fheight, 1507 fheight,
1392 TermWin.fheight + 1, TermWin.fheight - 1, 1508 fheight + 1, fheight - 1,
1393 TermWin.fheight - 2, TermWin.fheight + 2); 1509 fheight - 2, fheight + 2);
1394 1510
1395 fs = XCreateFontSet (display->display, pat, 1511 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1396 &missing_charset_list, &missing_charset_count, &def_string); 1512 &missing_charset_list, &missing_charset_count, &def_string);
1397 1513
1398 if (missing_charset_list) 1514 if (missing_charset_list)
1399 XFreeStringList (missing_charset_list); 1515 XFreeStringList (missing_charset_list);
1400 1516
… …
1444 NULL); 1560 NULL);
1445 } 1561 }
1446 1562
1447 Input_Context = XCreateIC (xim, 1563 Input_Context = XCreateIC (xim,
1448 XNInputStyle, input_style, 1564 XNInputStyle, input_style,
1449 XNClientWindow, TermWin.vt, 1565 XNClientWindow, vt,
1450 XNFocusWindow, TermWin.parent[0], 1566 XNFocusWindow, parent[0],
1451 preedit_attr ? XNPreeditAttributes : NULL, 1567 preedit_attr ? XNPreeditAttributes : NULL,
1452 preedit_attr, 1568 preedit_attr,
1453 status_attr ? XNStatusAttributes : NULL, 1569 status_attr ? XNStatusAttributes : NULL,
1454 status_attr, NULL); 1570 status_attr, NULL);
1455 1571
… …
1472} 1588}
1473 1589
1474void 1590void
1475rxvt_term::im_cb () 1591rxvt_term::im_cb ()
1476{ 1592{
1477 int i, found, had_im; 1593 int i;
1478 const char *p; 1594 const char *p;
1479 char **s; 1595 char **s;
1480 char buf[IMBUFSIZ]; 1596 char buf[IMBUFSIZ];
1481 1597
1598 make_current ();
1599
1482 im_destroy (); 1600 im_destroy ();
1483 1601
1484 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1602 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1485 if (Input_Context) 1603 if (Input_Context)
1486 return; 1604 return;
… …
1494 if (p && *p) 1612 if (p && *p)
1495 { 1613 {
1496 bool found = false; 1614 bool found = false;
1497 1615
1498 s = rxvt_splitcommastring (p); 1616 s = rxvt_splitcommastring (p);
1617
1499 for (i = 0; s[i]; i++) 1618 for (i = 0; s[i]; i++)
1500 { 1619 {
1501 if (*s[i]) 1620 if (*s[i])
1502 { 1621 {
1503 strcpy (buf, "@im="); 1622 strcpy (buf, "@im=");
… …
1507 found = true; 1626 found = true;
1508 break; 1627 break;
1509 } 1628 }
1510 } 1629 }
1511 } 1630 }
1512 for (i = 0; s[i]; i++) 1631
1513 free (s[i]); 1632 rxvt_freecommastring (s);
1514 free (s);
1515 1633
1516 if (found) 1634 if (found)
1517 goto done; 1635 goto done;
1518 } 1636 }
1519 1637
… …
1537{ 1655{
1538 XRectangle preedit_rect, status_rect, *needed_rect; 1656 XRectangle preedit_rect, status_rect, *needed_rect;
1539 XVaNestedList preedit_attr, status_attr; 1657 XVaNestedList preedit_attr, status_attr;
1540 1658
1541 if (!Input_Context 1659 if (!Input_Context
1542 || !TermWin.focus 1660 || !focus
1543 || !(input_style & XIMPreeditArea) 1661 || !(input_style & XIMPreeditArea)
1544 || !IMisRunning ()) 1662 || !IMisRunning ())
1545 return; 1663 return;
1546 1664
1547 /* Getting the necessary width of preedit area */ 1665 /* Getting the necessary width of preedit area */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines