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

Diff Legend

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