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.182 by root, Tue Jan 17 10:14:26 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 pty.put ();
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
352 create_windows (argc, argv); 514 create_windows (argc, argv);
353 515
516 dDisp;
517
354 init_xlocale (); 518 init_xlocale ();
355 519
356 scr_reset (); /* initialize screen */ 520 scr_reset (); // initialize screen
357 521
358#if 0 522#if 0
359 XSynchronize (display->display, True); 523 XSynchronize (disp, True);
360#endif 524#endif
361 525
362#ifdef HAVE_SCROLLBARS 526#ifdef HAVE_SCROLLBARS
363 if (options & Opt_scrollBar) 527 if (OPTION (Opt_scrollBar))
364 resize_scrollbar (); /* create and map scrollbar */ 528 resize_scrollbar (); /* create and map scrollbar */
365#endif 529#endif
366#if (MENUBAR_MAX)
367 if (menubar_visible ())
368 XMapWindow (display->display, menuBar.win);
369#endif
370#ifdef TRANSPARENT 530#ifdef TRANSPARENT
371 if (options & Opt_transparent) 531 if (OPTION (Opt_transparent))
372 { 532 {
373 XSelectInput (display->display, display->root, PropertyChangeMask); 533 XSelectInput (disp, display->root, PropertyChangeMask);
374 check_our_parents (); 534 check_our_parents ();
375 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
376 } 536 }
377#endif 537#endif
378 538
379 XMapWindow (display->display, TermWin.vt); 539 XMapWindow (disp, vt);
380 XMapWindow (display->display, TermWin.parent[0]); 540 XMapWindow (disp, parent[0]);
381 541
382 set_colorfgbg (); 542 set_colorfgbg ();
383 543
384 init_command (cmd_argv); 544 init_command (cmd_argv);
385 545
546 free (cmd_argv);
547
548 if (pty.pty >= 0)
386 pty_ev.start (pty.pty, EVENT_READ); 549 pty_ev.start (pty.pty, EVENT_READ);
387 550
388 check_ev.start (); 551 check_ev.start ();
389 552
553 HOOK_INVOKE ((this, HOOK_START, DT_END));
554
390 return true; 555 return true;
391} 556}
392 557
393static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 558static struct sig_handlers
559{
560 sig_watcher sw_chld, sw_term, sw_int;
561
562 void sig_chld (sig_watcher &w)
563 {
564 // we are being called for every SIGCHLD, find the corresponding term
565 int pid;
566
567 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
569 if (pid == (*t)->cmd_pid)
570 {
571 (*t)->child_exit ();
572 break;
573 }
574 }
575
576 /*
577 * Catch a fatal signal and tidy up before quitting
578 */
579 void
580 sig_term (sig_watcher &w)
581 {
582#ifdef DEBUG_CMD
583 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
584#endif
585 rxvt_emergency_cleanup ();
586 signal (w.signum, SIG_DFL);
587 kill (getpid (), w.signum);
588 }
589
590 sig_handlers ()
591 : sw_chld (this, &sig_handlers::sig_chld),
592 sw_term (this, &sig_handlers::sig_term),
593 sw_int (this, &sig_handlers::sig_term)
594 {
595 }
596} sig_handlers;
597
598char **rxvt_environ; // startup environment
394 599
395void 600void
396rxvt_init () 601rxvt_init ()
397{ 602{
398 /* install exit handler for cleanup */ 603 rxvt_environ = environ;
399#if 0 604
400#ifdef HAVE_ATEXIT
401 atexit (rxvt_clean_exit);
402#else
403#endif
404#endif
405 /* 605 /*
406 * Save and then give up any super-user privileges 606 * Save and then give up any super-user privileges
407 * If we need privileges in any area then we must specifically request it. 607 * If we need privileges in any area then we must specifically request it.
408 * We should only need to be root in these cases: 608 * We should only need to be root in these cases:
409 * 1. write utmp entries on some systems 609 * 1. write utmp entries on some systems
410 * 2. chown tty on some systems 610 * 2. chown tty on some systems
411 */ 611 */
412 rxvt_privileges (SAVE); 612 rxvt_privileges (SAVE);
413 rxvt_privileges (IGNORE); 613 rxvt_privileges (IGNORE);
414 614
415 struct sigaction sa; 615 signal (SIGHUP, SIG_IGN);
616 signal (SIGPIPE, SIG_IGN);
416 617
417 sigfillset (&sa.sa_mask); 618 sig_handlers.sw_chld.start (SIGCHLD);
418 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 619 sig_handlers.sw_term.start (SIGTERM);
419 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0); 620 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 621
426 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 622 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
427 /* signal (SIGURG, SIG_DFL); */ 623 /* signal (SIGURG, SIG_DFL); */
428 624
429 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 625 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
626 // TODO: handle this with exceptions and tolerate the memory loss
430 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 627 XSetIOErrorHandler (rxvt_xioerror_handler);
431}
432 628
433/* ------------------------------------------------------------------------- * 629 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} 630}
506 631
507/* ------------------------------------------------------------------------- * 632/* ------------------------------------------------------------------------- *
508 * MEMORY ALLOCATION WRAPPERS * 633 * MEMORY ALLOCATION WRAPPERS *
509 * ------------------------------------------------------------------------- */ 634 * ------------------------------------------------------------------------- */
510/* INTPROTO */ 635void *
511void *
512rxvt_malloc (size_t size) 636rxvt_malloc (size_t size)
513{ 637{
514 void *p;
515
516 p = malloc (size); 638 void *p = malloc (size);
639
517 if (p) 640 if (!p)
518 return p;
519
520 rxvt_fatal ("memory allocation failure. aborting.\n"); 641 rxvt_fatal ("memory allocation failure. aborting.\n");
521 /* NOTREACHED */
522}
523 642
524/* INTPROTO */ 643 return p;
525void * 644}
645
646void *
526rxvt_calloc (size_t number, size_t size) 647rxvt_calloc (size_t number, size_t size)
527{ 648{
528 void *p;
529
530 p = calloc (number, size); 649 void *p = calloc (number, size);
650
531 if (p) 651 if (!p)
532 return p;
533
534 rxvt_fatal ("memory allocation failure. aborting.\n"); 652 rxvt_fatal ("memory allocation failure. aborting.\n");
535 /* NOTREACHED */
536}
537 653
538/* INTPROTO */ 654 return p;
655}
656
539void * 657void *
540rxvt_realloc (void *ptr, size_t size) 658rxvt_realloc (void *ptr, size_t size)
541{ 659{
542 void *p;
543
544 if (ptr)
545 p = realloc (ptr, size); 660 void *p = realloc (ptr, size);
546 else
547 p = malloc (size);
548 661
549 if (p) 662 if (!p)
550 return p;
551
552 rxvt_fatal ("memory allocation failure. aborting.\n"); 663 rxvt_fatal ("memory allocation failure. aborting.\n");
553 /* NOTREACHED */ 664
665 return p;
554} 666}
555 667
556/* ------------------------------------------------------------------------- * 668/* ------------------------------------------------------------------------- *
557 * PRIVILEGED OPERATIONS * 669 * PRIVILEGED OPERATIONS *
558 * ------------------------------------------------------------------------- */ 670 * ------------------------------------------------------------------------- */
559/* take care of suid/sgid super-user (root) privileges */ 671/* take care of suid/sgid super-user (root) privileges */
560void 672void
561rxvt_privileges (rxvt_privaction action) 673rxvt_privileges (rxvt_privaction action)
562{ 674{
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__) 675#if ! defined(__CYGWIN32__)
569# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
570 /* setreuid () is the poor man's setuid (), seteuid () */ 677 /* setreuid () is the poor man's setuid (), seteuid () */
571# define seteuid(a) setreuid(-1, (a)) 678# define seteuid(a) setreuid(-1, (a))
572# define setegid(a) setregid(-1, (a)) 679# define setegid(a) setregid(-1, (a))
… …
578 case IGNORE: 685 case IGNORE:
579 /* 686 /*
580 * change effective uid/gid - not real uid/gid - so we can switch 687 * change effective uid/gid - not real uid/gid - so we can switch
581 * back to root later, as required 688 * back to root later, as required
582 */ 689 */
690 setegid (getgid ());
583 seteuid (getuid ()); 691 seteuid (getuid ());
584 setegid (getgid ());
585 break; 692 break;
586 case SAVE: 693 case SAVE:
587 euid = geteuid ();
588 egid = getegid (); 694 saved_egid = getegid ();
695 saved_euid = geteuid ();
589 break; 696 break;
590 case RESTORE: 697 case RESTORE:
591 seteuid (euid);
592 setegid (egid); 698 setegid (saved_egid);
699 seteuid (saved_euid);
593 break; 700 break;
594 } 701 }
595# else 702# else
596 switch (action) 703 switch (action)
597 { 704 {
598 case IGNORE: 705 case IGNORE:
706 setgid (getgid ());
599 setuid (getuid ()); 707 setuid (getuid ());
600 setgid (getgid ());
601 /* FALLTHROUGH */ 708 /* FALLTHROUGH */
602 case SAVE: 709 case SAVE:
603 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
604 case RESTORE: 711 case RESTORE:
605 break; 712 break;
… …
610 717
611#ifdef UTMP_SUPPORT 718#ifdef UTMP_SUPPORT
612void 719void
613rxvt_term::privileged_utmp (rxvt_privaction action) 720rxvt_term::privileged_utmp (rxvt_privaction action)
614{ 721{
615 if ((options & Opt_utmpInhibit) 722 if (OPTION (Opt_utmpInhibit)
616 || !pty.name || !*pty.name) 723 || !pty.name || !*pty.name)
617 return; 724 return;
618 725
619 rxvt_privileges (RESTORE); 726 rxvt_privileges (RESTORE);
620 727
621 if (action == SAVE) 728 if (action == SAVE)
622 makeutent (pty.name, rs[Rs_display_name]); 729 pty.login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
623 else 730 else
624 cleanutent (); 731 pty.logout ();
625 732
626 rxvt_privileges (IGNORE); 733 rxvt_privileges (IGNORE);
627} 734}
628#endif 735#endif
629 736
… …
631/* 738/*
632 * window size/position calculcations for XSizeHint and other storage. 739 * window size/position calculcations for XSizeHint and other storage.
633 * if width/height are non-zero then override calculated width/height 740 * if width/height are non-zero then override calculated width/height
634 */ 741 */
635void 742void
636rxvt_term::window_calc (unsigned int width, unsigned int height) 743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637{ 744{
638 short recalc_x, recalc_y; 745 short recalc_x, recalc_y;
639 int x, y, sb_w, mb_h, flags; 746 int x, y, sb_w, flags;
640 unsigned int w, h; 747 unsigned int w, h;
641 unsigned int max_width, max_height; 748 unsigned int max_width, max_height;
749 dDisp;
642 750
643 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
644 TermWin.ncol, TermWin.nrow, szHint.width, 752 ncol, nrow, szHint.width, szHint.height));
645 szHint.height)); 753
646 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 754 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
647 szHint.win_gravity = NorthWestGravity; 755 szHint.win_gravity = NorthWestGravity;
648 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 756 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
649 757
650 recalc_x = recalc_y = 0; 758 recalc_x = recalc_y = 0;
651 flags = 0; 759 flags = 0;
760
652 if (!parsed_geometry) 761 if (!parsed_geometry)
653 { 762 {
654 parsed_geometry = 1; 763 parsed_geometry = 1;
764
655 if (rs[Rs_geometry]) 765 if (rs[Rs_geometry])
656 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 766 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
767
657 if (flags & WidthValue) 768 if (flags & WidthValue)
658 { 769 {
659 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 770 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
660 szHint.flags |= USSize; 771 szHint.flags |= USSize;
661 } 772 }
773
662 if (flags & HeightValue) 774 if (flags & HeightValue)
663 { 775 {
664 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 776 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
665 szHint.flags |= USSize; 777 szHint.flags |= USSize;
666 } 778 }
779
667 if (flags & XValue) 780 if (flags & XValue)
668 { 781 {
669 szHint.x = x; 782 szHint.x = x;
670 szHint.flags |= USPosition; 783 szHint.flags |= USPosition;
784
671 if (flags & XNegative) 785 if (flags & XNegative)
672 { 786 {
673 recalc_x = 1; 787 recalc_x = 1;
674 szHint.win_gravity = NorthEastGravity; 788 szHint.win_gravity = NorthEastGravity;
675 } 789 }
676 } 790 }
791
677 if (flags & YValue) 792 if (flags & YValue)
678 { 793 {
679 szHint.y = y; 794 szHint.y = y;
680 szHint.flags |= USPosition; 795 szHint.flags |= USPosition;
796
681 if (flags & YNegative) 797 if (flags & YNegative)
682 { 798 {
683 recalc_y = 1; 799 recalc_y = 1;
800
684 if (szHint.win_gravity == NorthEastGravity) 801 if (szHint.win_gravity == NorthEastGravity)
685 szHint.win_gravity = SouthEastGravity; 802 szHint.win_gravity = SouthEastGravity;
686 else 803 else
687 szHint.win_gravity = SouthWestGravity; 804 szHint.win_gravity = SouthWestGravity;
688 } 805 }
689 } 806 }
690 } 807 }
691 808
692 /* TODO: BOUNDS */ 809 /* TODO: BOUNDS */
693 TermWin.width = TermWin.ncol * TermWin.fwidth; 810 width = ncol * fwidth;
694 TermWin.height = TermWin.nrow * TermWin.fheight; 811 height = nrow * fheight;
695 max_width = MAX_COLS * TermWin.fwidth; 812 max_width = MAX_COLS * fwidth;
696 max_height = MAX_ROWS * TermWin.fheight; 813 max_height = MAX_ROWS * fheight;
697 814
698 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 815 szHint.base_width = szHint.base_height = 2 * int_bwidth;
699 816
700 sb_w = mb_h = 0; 817 sb_w = 0;
701 window_vt_x = window_vt_y = TermWin.int_bwidth; 818 window_vt_x = window_vt_y = int_bwidth;
702 819
703 if (scrollbar_visible ()) 820 if (scrollBar.state)
704 { 821 {
705 sb_w = scrollbar_TotalWidth (); 822 sb_w = scrollbar_TotalWidth ();
706 szHint.base_width += sb_w; 823 szHint.base_width += sb_w;
707 if (!(options & Opt_scrollBar_right)) 824 if (!OPTION (Opt_scrollBar_right))
708 window_vt_x += sb_w; 825 window_vt_x += sb_w;
709 } 826 }
710 827
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; 828 szHint.width_inc = fwidth;
719 szHint.height_inc = TermWin.fheight; 829 szHint.height_inc = fheight;
720 szHint.min_width = szHint.base_width + szHint.width_inc; 830 szHint.min_width = szHint.base_width + szHint.width_inc;
721 szHint.min_height = szHint.base_height + szHint.height_inc; 831 szHint.min_height = szHint.base_height + szHint.height_inc;
722 832
723 if (width && width - szHint.base_width < max_width) 833 if (newwidth && newwidth - szHint.base_width < max_width)
724 { 834 {
725 szHint.width = width; 835 szHint.width = newwidth;
726 TermWin.width = width - szHint.base_width; 836 width = newwidth - szHint.base_width;
727 } 837 }
728 else 838 else
729 { 839 {
730 MIN_IT (TermWin.width, max_width); 840 min_it (width, max_width);
731 szHint.width = szHint.base_width + TermWin.width; 841 szHint.width = szHint.base_width + width;
732 } 842 }
733 843
734 if (height && height - szHint.base_height < max_height) 844 if (newheight && newheight - szHint.base_height < max_height)
735 { 845 {
736 szHint.height = height; 846 szHint.height = newheight;
737 TermWin.height = height - szHint.base_height; 847 height = newheight - szHint.base_height;
738 } 848 }
739 else 849 else
740 { 850 {
741 MIN_IT (TermWin.height, max_height); 851 min_it (height, max_height);
742 szHint.height = szHint.base_height + TermWin.height; 852 szHint.height = szHint.base_height + height;
743 } 853 }
744 854
745 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 855 if (scrollBar.state && OPTION (Opt_scrollBar_right))
746 window_sb_x = szHint.width - sb_w; 856 window_sb_x = szHint.width - sb_w;
747 857
748 if (recalc_x) 858 if (recalc_x)
749 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
750 - szHint.width - 2 * TermWin.ext_bwidth);
751 if (recalc_y) 860 if (recalc_y)
752 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 861 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
753 - szHint.height - 2 * TermWin.ext_bwidth);
754 862
755 TermWin.ncol = TermWin.width / TermWin.fwidth; 863 ncol = width / fwidth;
756 TermWin.nrow = TermWin.height / TermWin.fheight; 864 nrow = height / fheight;
757 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 865 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
758 TermWin.ncol, TermWin.nrow, szHint.width, 866 ncol, nrow, szHint.width,
759 szHint.height)); 867 szHint.height));
760 return; 868 return;
761} 869}
762 870
763/*----------------------------------------------------------------------*/ 871/*----------------------------------------------------------------------*/
… …
771 if (pty.pty < 0) 879 if (pty.pty < 0)
772 return; 880 return;
773 881
774 struct winsize ws; 882 struct winsize ws;
775 883
776 ws.ws_col = TermWin.ncol; 884 ws.ws_col = ncol;
777 ws.ws_row = TermWin.nrow; 885 ws.ws_row = nrow;
778 ws.ws_xpixel = TermWin.width; 886 ws.ws_xpixel = width;
779 ws.ws_ypixel = TermWin.height; 887 ws.ws_ypixel = height;
780 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 888 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
781 889
782#if 0 890#if 0
783 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 891 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
784 if (cmd_pid) /* force through to the command */ 892 if (cmd_pid) /* force through to the command */
785 kill (cmd_pid, SIGWINCH); 893 kill (-cmd_pid, SIGWINCH);
786#endif 894#endif
787} 895}
788 896
789/*----------------------------------------------------------------------*/ 897/*----------------------------------------------------------------------*/
790/* set_fonts () - load and set the various fonts 898/* set_fonts () - load and set the various fonts
791/* 899 *
792 * init = 1 - initialize 900 * init = 1 - initialize
793 * 901 *
794 * fontname == FONT_UP - switch to bigger font 902 * fontname == FONT_UP - switch to bigger font
795 * fontname == FONT_DN - switch to smaller font 903 * fontname == FONT_DN - switch to smaller font
796 */ 904 */
… …
798rxvt_term::set_fonts () 906rxvt_term::set_fonts ()
799{ 907{
800 rxvt_fontset *fs = new rxvt_fontset (this); 908 rxvt_fontset *fs = new rxvt_fontset (this);
801 rxvt_fontprop prop; 909 rxvt_fontprop prop;
802 910
803 prop.width = prop.height = prop.weight = prop.slant
804 = rxvt_fontprop::unset;
805
806 if (!fs 911 if (!fs
807 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed", prop) 912 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
808 || !fs->realize_font (1)) 913 || !fs->realize_font (1))
809 { 914 {
810 delete fs; 915 delete fs;
811 return false; 916 return false;
812 } 917 }
813 918
814#if ENABLE_STYLES 919#if ENABLE_STYLES
815 for (int i = RS_styleCount; --i; ) 920 for (int i = RS_styleCount; --i; )
816 if (TermWin.fontset[i] != TermWin.fontset[0]) 921 if (fontset[i] != fontset[0])
817 delete TermWin.fontset[i]; 922 delete fontset[i];
818#endif 923#endif
819 924
820 delete TermWin.fontset[0]; 925 delete fontset[0];
821 TermWin.fontset[0] = fs; 926 fontset[0] = fs;
822 927
823 fs->prop = prop = (*fs)[1]->properties (); 928 prop = (*fs)[1]->properties ();
929 prop.height += lineSpace;
930 fs->set_prop (prop);
824 931
825 TermWin.fwidth = prop.width; 932 fwidth = prop.width;
826 TermWin.fheight = prop.height; 933 fheight = prop.height;
827 TermWin.fweight = prop.weight; 934 fbase = prop.ascent;
828 TermWin.fslant = prop.slant;
829 TermWin.fbase = (*fs)[1]->ascent;
830 935
831 for (int style = 1; style < 4; style++) 936 for (int style = 1; style < 4; style++)
832 { 937 {
833#if ENABLE_STYLES 938#if ENABLE_STYLES
834 const char *res = rs[Rs_font + style]; 939 const char *res = rs[Rs_font + style];
835 940
836 if (res && !*res) 941 if (res && !*res)
837 TermWin.fontset[style] = TermWin.fontset[0]; 942 fontset[style] = fontset[0];
838 else 943 else
839 { 944 {
840 TermWin.fontset[style] = fs = new rxvt_fontset (this); 945 fontset[style] = fs = new rxvt_fontset (this);
841 rxvt_fontprop prop2 = prop; 946 rxvt_fontprop prop2 = prop;
842 947
843 if (res) 948 if (res)
844 prop2.weight = prop2.slant = rxvt_fontprop::unset; 949 prop2.weight = prop2.slant = rxvt_fontprop::unset;
845 else 950 else
846 { 951 {
847 res = TermWin.fontset[0]->fontdesc; 952 res = fontset[0]->fontdesc;
848 953
849 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 954 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; 955 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
851 } 956 }
852 957
853 fs->populate (res, prop2); 958 fs->populate (res);
959 fs->set_prop (prop2);
854 } 960 }
855#else 961#else
856 TermWin.fontset[style] = TermWin.fontset[0]; 962 fontset[style] = fontset[0];
857#endif 963#endif
858 } 964 }
859 965
860 if (TermWin.parent[0]) 966 if (parent[0])
861 { 967 {
862 resize_all_windows (0, 0, 0); 968 resize_all_windows (0, 0, 0);
863 scr_remap_chars (); 969 scr_remap_chars ();
864 scr_touch (true); 970 scr_touch (true);
865 } 971 }
866 972
867 return true; 973 return true;
868} 974}
869 975
976void rxvt_term::set_string_property (Atom prop, const char *str, int len)
977{
978 XChangeProperty (display->display, parent[0],
979 prop, XA_STRING, 8, PropModeReplace,
980 (const unsigned char *)str, len >= 0 ? len : strlen (str));
981}
982
983void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
984{
985 wchar_t *ws = rxvt_mbstowcs (str, len);
986 char *s = rxvt_wcstoutf8 (ws);
987
988 XChangeProperty (display->display, parent[0],
989 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
990 (const unsigned char *)s, strlen (s));
991
992 free (s);
993 free (ws);
994}
995
870/*----------------------------------------------------------------------*/ 996/*----------------------------------------------------------------------*/
871/*----------------------------------------------------------------------*/ 997/*----------------------------------------------------------------------*/
872/* xterm sequences - title, iconName, color (exptl) */ 998/* xterm sequences - title, iconName, color (exptl) */
873void 999void
874rxvt_term::set_title (const char *str) 1000rxvt_term::set_title (const char *str)
875{ 1001{
876#ifdef SMART_WINDOW_TITLE 1002 set_string_property (XA_WM_NAME, str);
877 char *name; 1003#if ENABLE_EWMH
878 1004 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 1005#endif
890} 1006}
891 1007
892void 1008void
893rxvt_term::set_icon_name (const char *str) 1009rxvt_term::set_icon_name (const char *str)
894{ 1010{
895#ifdef SMART_WINDOW_TITLE 1011 set_string_property (XA_WM_ICON_NAME, str);
896 char *name; 1012#if ENABLE_EWMH
897 1013 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 1014#endif
909} 1015}
910 1016
911#ifdef XTERM_COLOR_CHANGE 1017#ifdef XTERM_COLOR_CHANGE
912void 1018void
… …
920 1026
921 /* handle color aliases */ 1027 /* handle color aliases */
922 if (isdigit (*color)) 1028 if (isdigit (*color))
923 { 1029 {
924 i = atoi (color); 1030 i = atoi (color);
1031
925 if (i >= 8 && i <= 15) 1032 if (i >= 8 && i <= 15)
926 { /* bright colors */ 1033 { /* bright colors */
927 i -= 8; 1034 i -= 8;
928# ifndef NO_BRIGHTCOLOR
929 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1035 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
930 SET_PIXCOLOR (idx); 1036 SET_PIXCOLOR (idx);
931 goto Done; 1037 goto done;
932# endif
933
934 } 1038 }
1039
935 if (i >= 0 && i <= 7) 1040 if (i >= 0 && i <= 7)
936 { /* normal colors */ 1041 { /* normal colors */
937 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1042 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
938 SET_PIXCOLOR (idx); 1043 SET_PIXCOLOR (idx);
939 goto Done; 1044 goto done;
940 } 1045 }
941 } 1046 }
942 1047
943 if (!rXParseAllocColor (& xcol, color)) 1048 if (!rXParseAllocColor (&xcol, color))
944 return; 1049 return;
945 1050
946 /* XStoreColor (display->display, display->cmap, XColor*); */ 1051 /* XStoreColor (display->display, display->cmap, XColor*); */
947 1052
948 /* 1053 /*
… …
964 pix_colors_focused[idx] = xcol; 1069 pix_colors_focused[idx] = xcol;
965 SET_PIXCOLOR (idx); 1070 SET_PIXCOLOR (idx);
966 1071
967 /* XSetWindowAttributes attr; */ 1072 /* XSetWindowAttributes attr; */
968 /* Cursor cursor; */ 1073 /* Cursor cursor; */
969Done: 1074done:
1075
970#ifdef OFF_FOCUS_FADING 1076#if OFF_FOCUS_FADING
971 if (rs[Rs_fade]) 1077 if (rs[Rs_fade])
972 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1078 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
973#endif 1079#endif
974 1080
975 /*TODO: handle Color_BD, scrollbar background, etc. */ 1081 /*TODO: handle Color_BD, scrollbar background, etc. */
976 1082
977 recolour_cursor (); 1083 recolour_cursor ();
… …
1031 1137
1032 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1138 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1033} 1139}
1034 1140
1035/*----------------------------------------------------------------------*/ 1141/*----------------------------------------------------------------------*/
1036/*
1037 * Colour determination for low colour displays, routine from
1038 * Hans de Goede <hans@highrise.nl>
1039 */
1040 1142
1041int 1143int
1042rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1144rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1043{ 1145{
1044 if (!screen_in_out->set (display, colour)) 1146 if (!screen_in_out->set (display, colour))
… …
1052 1154
1053/* -------------------------------------------------------------------- * 1155/* -------------------------------------------------------------------- *
1054 * - WINDOW RESIZING - * 1156 * - WINDOW RESIZING - *
1055 * -------------------------------------------------------------------- */ 1157 * -------------------------------------------------------------------- */
1056void 1158void
1057rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1159rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1058{ 1160{
1059 int fix_screen; 1161 int fix_screen;
1060
1061#ifdef SMART_RESIZE
1062 int old_width = szHint.width, old_height = szHint.height; 1162 int old_width = szHint.width, old_height = szHint.height;
1063#endif 1163 dDisp;
1064 1164
1065 window_calc (width, height); 1165 window_calc (newwidth, newheight);
1066 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1166 XSetWMNormalHints (disp, parent[0], &szHint);
1067 1167
1068 if (!ignoreparent) 1168 if (!ignoreparent)
1069 { 1169 {
1070#ifdef SMART_RESIZE 1170#ifdef SMART_RESIZE
1071 /* 1171 /*
… …
1075 int x, y, x1, y1; 1175 int x, y, x1, y1;
1076 int dx, dy; 1176 int dx, dy;
1077 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1177 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1078 Window unused_cr; 1178 Window unused_cr;
1079 1179
1080 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1180 XTranslateCoordinates (disp, parent[0], display->root,
1081 0, 0, &x, &y, &unused_cr); 1181 0, 0, &x, &y, &unused_cr);
1082 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1182 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1083 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1183 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1084 /* 1184 /*
1085 * if display->root isn't the parent window, a WM will probably have offset 1185 * if display->root isn't the parent window, a WM will probably have offset
1086 * our position for handles and decorations. Counter it 1186 * our position for handles and decorations. Counter it
1087 */ 1187 */
… …
1089 { 1189 {
1090 x -= x1; 1190 x -= x1;
1091 y -= y1; 1191 y -= y1;
1092 } 1192 }
1093 1193
1094 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1194 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1095 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1195 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1096 dx = old_width - szHint.width; 1196 dx = old_width - szHint.width;
1097 dy = old_height - szHint.height; 1197 dy = old_height - szHint.height;
1098 1198
1099 /* Check position of the center of the window */ 1199 /* Check position of the center of the window */
1100 if (x < x1) /* left half */ 1200 if (x < x1) /* left half */
… …
1104 if (y < y1) /* top half */ 1204 if (y < y1) /* top half */
1105 dy = 0; 1205 dy = 0;
1106 else if (y == y1) /* exact center */ 1206 else if (y == y1) /* exact center */
1107 dy /= 2; 1207 dy /= 2;
1108 1208
1109 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1209 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1110 szHint.width, szHint.height); 1210 szHint.width, szHint.height);
1111#else 1211#else
1112 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1212 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1113#endif 1213#endif
1114 } 1214 }
1115 1215
1116 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1117 1217
1118 if (fix_screen || width != old_width || height != old_height) 1218 if (fix_screen || newwidth != old_width || newheight != old_height)
1119 { 1219 {
1120 if (scrollbar_visible ()) 1220 if (scrollBar.state)
1121 { 1221 {
1122 XMoveResizeWindow (display->display, scrollBar.win, 1222 XMoveResizeWindow (disp, scrollBar.win,
1123 window_sb_x, 0, 1223 window_sb_x, 0,
1124 scrollbar_TotalWidth (), szHint.height); 1224 scrollbar_TotalWidth (), szHint.height);
1125 resize_scrollbar (); 1225 resize_scrollbar ();
1126 } 1226 }
1127 1227
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, 1228 XMoveResizeWindow (disp, vt,
1134 window_vt_x, window_vt_y, 1229 window_vt_x, window_vt_y,
1135 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1230 width, height);
1231
1136 scr_clear (); 1232 scr_clear ();
1137#ifdef XPM_BACKGROUND 1233#ifdef XPM_BACKGROUND
1138 resize_pixmap (); 1234 resize_pixmap ();
1139#endif 1235#endif
1140 } 1236 }
… …
1145 int old_ncol = prev_ncol; 1241 int old_ncol = prev_ncol;
1146 1242
1147 /* scr_reset only works on the primary screen */ 1243 /* scr_reset only works on the primary screen */
1148 if (old_height) /* this is not the first time through */ 1244 if (old_height) /* this is not the first time through */
1149 { 1245 {
1150 unsigned int ncol = TermWin.ncol; 1246 unsigned int ocol = ncol;
1151 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1247 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1152 curr_screen = scr_change_screen (PRIMARY); 1248 curr_screen = scr_change_screen (PRIMARY);
1153 TermWin.ncol = ncol; 1249 ncol = ocol;
1154 } 1250 }
1155 1251
1156 scr_reset (); 1252 scr_reset ();
1157 1253
1158 if (curr_screen >= 0) /* this is not the first time through */ 1254 if (curr_screen >= 0) /* this is not the first time through */
1159 { 1255 {
1160 scr_change_screen (curr_screen); 1256 scr_change_screen (curr_screen);
1161 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1257 selection_check (old_ncol != ncol ? 4 : 0);
1162 } 1258 }
1163 } 1259 }
1164 1260
1165 old_width = szHint.width; 1261 old_width = szHint.width;
1166 old_height = szHint.height; 1262 old_height = szHint.height;
1263
1264#ifdef XPM_BACKGROUND
1265 if (pixmap)
1266 scr_touch (false);
1267#endif
1167 1268
1168#ifdef USE_XIM 1269#ifdef USE_XIM
1169 IMSetStatusPosition (); 1270 IMSetStatusPosition ();
1170#endif 1271#endif
1171} 1272}
… …
1173/* 1274/*
1174 * Set the width/height of the vt window in characters. Units are pixels. 1275 * Set the width/height of the vt window in characters. Units are pixels.
1175 * good for toggling 80/132 columns 1276 * good for toggling 80/132 columns
1176 */ 1277 */
1177void 1278void
1178rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1279rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1179{ 1280{
1180 XWindowAttributes wattr; 1281 XWindowAttributes wattr;
1181 1282
1182 if (width == 0 || height == 0) 1283 if (newwidth == 0 || newheight == 0)
1183 { 1284 {
1184 XGetWindowAttributes (display->display, display->root, &wattr); 1285 XGetWindowAttributes (display->display, display->root, &wattr);
1286
1185 if (width == 0) 1287 if (newwidth == 0)
1186 width = wattr.width - szHint.base_width; 1288 newwidth = wattr.width - szHint.base_width;
1187 if (height == 0) 1289 if (newheight == 0)
1188 height = wattr.height - szHint.base_height; 1290 newheight = wattr.height - szHint.base_height;
1189 }
1190
1191 if (width != TermWin.width || height != TermWin.height)
1192 { 1291 }
1292
1293 if (newwidth != width || newheight != height)
1294 {
1193 width += szHint.base_width; 1295 newwidth += szHint.base_width;
1194 height += szHint.base_height; 1296 newheight += szHint.base_height;
1195 resize_all_windows (width, height, 0); 1297 resize_all_windows (newwidth, newheight, 0);
1196 } 1298 }
1197} 1299}
1198 1300
1199/* -------------------------------------------------------------------- * 1301/* -------------------------------------------------------------------- *
1200 * - X INPUT METHOD ROUTINES - * 1302 * - X INPUT METHOD ROUTINES - *
… …
1210 1312
1211void 1313void
1212rxvt_term::im_set_size (XRectangle &size) 1314rxvt_term::im_set_size (XRectangle &size)
1213{ 1315{
1214 // the int_bwidth terms make no sense to me 1316 // the int_bwidth terms make no sense to me
1215 size.x = TermWin.int_bwidth; 1317 size.x = int_bwidth;
1216 size.y = TermWin.int_bwidth; 1318 size.y = int_bwidth;
1217 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1319 size.width = Width2Pixel (ncol) + int_bwidth;
1218 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1320 size.height = Height2Pixel (nrow) + int_bwidth;
1219} 1321}
1220 1322
1221void 1323void
1222rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1324rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1223 XRectangle &status_rect, 1325 XRectangle &status_rect,
1224 const XRectangle &needed_rect) 1326 const XRectangle &needed_rect)
1225{ 1327{
1226 preedit_rect.x = needed_rect.width; 1328 preedit_rect.x = needed_rect.width;
1227 preedit_rect.y = 0; 1329 preedit_rect.y = 0;
1228 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1330 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1229 preedit_rect.height = TermWin.fheight; 1331 preedit_rect.height = fheight;
1230 1332
1231 status_rect.x = 0; 1333 status_rect.x = 0;
1232 status_rect.y = 0; 1334 status_rect.y = 0;
1233 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1335 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1234 status_rect.height = TermWin.fheight; 1336 status_rect.height = fheight;
1235} 1337}
1236 1338
1237/* Checking whether input method is running. */ 1339/* Checking whether input method is running. */
1238bool 1340bool
1239rxvt_term::IMisRunning () 1341rxvt_term::IMisRunning ()
… …
1263} 1365}
1264 1366
1265void 1367void
1266rxvt_term::IMSendSpot () 1368rxvt_term::IMSendSpot ()
1267{ 1369{
1268 XPoint spot; 1370 XPoint nspot;
1269 XVaNestedList preedit_attr; 1371 XVaNestedList preedit_attr;
1270 1372
1271 if (!Input_Context 1373 if (!Input_Context
1272 || !TermWin.focus 1374 || !focus
1273 || !(input_style & XIMPreeditPosition) 1375 || !(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; 1376 return;
1283 1377
1284 im_set_position (spot); 1378 im_set_position (nspot);
1379
1380 if (nspot.x == spot.x && nspot.y == spot.y)
1381 return;
1382
1383 spot = nspot;
1285 1384
1286 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1385 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1287 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1386 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1288 XFree (preedit_attr); 1387 XFree (preedit_attr);
1289} 1388}
1290 1389
1291void 1390void
1292rxvt_term::im_destroy () 1391rxvt_term::im_destroy ()
1293{ 1392{
1294 if (Input_Context)
1295 {
1296 XDestroyIC (Input_Context);
1297 Input_Context = 0;
1298 }
1299
1300 if (input_method) 1393 if (input_method)
1301 { 1394 {
1395 if (Input_Context && input_method->xim)
1396 XDestroyIC (Input_Context);
1397
1302 display->put_xim (input_method); 1398 display->put_xim (input_method);
1303 input_method = 0; 1399 input_method = 0;
1304 } 1400 }
1401
1402 Input_Context = 0;
1305} 1403}
1306 1404
1307/* 1405/*
1308 * Try to open a XIM with the current modifiers, then see if we can 1406 * Try to open a XIM with the current modifiers, then see if we can
1309 * open a suitable preedit type 1407 * open a suitable preedit type
… …
1318 unsigned long fg, bg; 1416 unsigned long fg, bg;
1319 const char *p; 1417 const char *p;
1320 char **s; 1418 char **s;
1321 XIMStyles *xim_styles; 1419 XIMStyles *xim_styles;
1322 1420
1421 set_environ (envv);
1422
1323 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1423 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1324 return false; 1424 return false;
1325 1425
1326 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1426 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1327 input_method = display->get_xim (locale, modifiers); 1427 input_method = display->get_xim (locale, modifiers);
1328 if (input_method == NULL) 1428 if (input_method == NULL)
1329 return false; 1429 return false;
1330 1430
1331 xim = input_method->xim; 1431 xim = input_method->xim;
1432 spot.x = spot.y = -1;
1332 1433
1333 xim_styles = NULL; 1434 xim_styles = NULL;
1334 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1435 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1335 || !xim_styles || !xim_styles->count_styles) 1436 || !xim_styles || !xim_styles->count_styles)
1336 { 1437 {
1337 im_destroy (); 1438 im_destroy ();
1338 return false; 1439 return false;
1339 } 1440 }
1340 1441
1341 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1442 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1443
1444 for (int pi = 0; pi < 2; pi++)
1445 {
1446 p = pet[pi];
1447
1448 if (!p)
1449 continue;
1450
1342 s = rxvt_splitcommastring (p); 1451 s = rxvt_splitcommastring (p);
1343 1452
1344 for (i = found = 0; !found && s[i]; i++) 1453 for (i = found = 0; !found && s[i]; i++)
1345 { 1454 {
1346 if (!strcmp (s[i], "OverTheSpot")) 1455 if (!strcmp (s[i], "OverTheSpot"))
1347 input_style = (XIMPreeditPosition | XIMStatusNothing); 1456 input_style = (XIMPreeditPosition | XIMStatusNothing);
1348 else if (!strcmp (s[i], "OffTheSpot")) 1457 else if (!strcmp (s[i], "OffTheSpot"))
1349 input_style = (XIMPreeditArea | XIMStatusArea); 1458 input_style = (XIMPreeditArea | XIMStatusArea);
1350 else if (!strcmp (s[i], "Root")) 1459 else if (!strcmp (s[i], "Root"))
1351 input_style = (XIMPreeditNothing | XIMStatusNothing); 1460 input_style = (XIMPreeditNothing | XIMStatusNothing);
1461 else if (!strcmp (s[i], "None"))
1462 input_style = (XIMPreeditNone | XIMStatusNone);
1352 1463
1353 for (j = 0; j < xim_styles->count_styles; j++) 1464 for (j = 0; j < xim_styles->count_styles; j++)
1354 if (input_style == xim_styles->supported_styles[j]) 1465 if (input_style == xim_styles->supported_styles[j])
1355 { 1466 {
1467 rxvt_freecommastring (s);
1468
1356 found = 1; 1469 found = 1;
1357 break; 1470 goto foundpet;
1471 }
1472
1358 } 1473 }
1359 }
1360 1474
1361 for (i = 0; s[i]; i++) 1475 rxvt_freecommastring (s);
1362 free (s[i]); 1476 }
1363 1477
1364 free (s); 1478foundpet:
1479
1365 XFree (xim_styles); 1480 XFree (xim_styles);
1366 1481
1367 if (!found) 1482 if (!found)
1368 { 1483 {
1369 im_destroy (); 1484 im_destroy ();
… …
1386 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1501 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1387 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1502 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1388 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1503 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1389 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1504 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1390 "*", 1505 "*",
1391 TermWin.fheight, 1506 fheight,
1392 TermWin.fheight + 1, TermWin.fheight - 1, 1507 fheight + 1, fheight - 1,
1393 TermWin.fheight - 2, TermWin.fheight + 2); 1508 fheight - 2, fheight + 2);
1394 1509
1395 fs = XCreateFontSet (display->display, pat, 1510 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1396 &missing_charset_list, &missing_charset_count, &def_string); 1511 &missing_charset_list, &missing_charset_count, &def_string);
1397 1512
1398 if (missing_charset_list) 1513 if (missing_charset_list)
1399 XFreeStringList (missing_charset_list); 1514 XFreeStringList (missing_charset_list);
1400 1515
… …
1444 NULL); 1559 NULL);
1445 } 1560 }
1446 1561
1447 Input_Context = XCreateIC (xim, 1562 Input_Context = XCreateIC (xim,
1448 XNInputStyle, input_style, 1563 XNInputStyle, input_style,
1449 XNClientWindow, TermWin.vt, 1564 XNClientWindow, vt,
1450 XNFocusWindow, TermWin.parent[0], 1565 XNFocusWindow, parent[0],
1451 preedit_attr ? XNPreeditAttributes : NULL, 1566 preedit_attr ? XNPreeditAttributes : NULL,
1452 preedit_attr, 1567 preedit_attr,
1453 status_attr ? XNStatusAttributes : NULL, 1568 status_attr ? XNStatusAttributes : NULL,
1454 status_attr, NULL); 1569 status_attr, NULL);
1455 1570
… …
1472} 1587}
1473 1588
1474void 1589void
1475rxvt_term::im_cb () 1590rxvt_term::im_cb ()
1476{ 1591{
1477 int i, found, had_im; 1592 int i;
1478 const char *p; 1593 const char *p;
1479 char **s; 1594 char **s;
1480 char buf[IMBUFSIZ]; 1595 char buf[IMBUFSIZ];
1481 1596
1597 make_current ();
1598
1482 im_destroy (); 1599 im_destroy ();
1483 1600
1484 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1601 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1485 if (Input_Context) 1602 if (Input_Context)
1486 return; 1603 return;
… …
1494 if (p && *p) 1611 if (p && *p)
1495 { 1612 {
1496 bool found = false; 1613 bool found = false;
1497 1614
1498 s = rxvt_splitcommastring (p); 1615 s = rxvt_splitcommastring (p);
1616
1499 for (i = 0; s[i]; i++) 1617 for (i = 0; s[i]; i++)
1500 { 1618 {
1501 if (*s[i]) 1619 if (*s[i])
1502 { 1620 {
1503 strcpy (buf, "@im="); 1621 strcpy (buf, "@im=");
… …
1507 found = true; 1625 found = true;
1508 break; 1626 break;
1509 } 1627 }
1510 } 1628 }
1511 } 1629 }
1512 for (i = 0; s[i]; i++) 1630
1513 free (s[i]); 1631 rxvt_freecommastring (s);
1514 free (s);
1515 1632
1516 if (found) 1633 if (found)
1517 goto done; 1634 goto done;
1518 } 1635 }
1519 1636
… …
1537{ 1654{
1538 XRectangle preedit_rect, status_rect, *needed_rect; 1655 XRectangle preedit_rect, status_rect, *needed_rect;
1539 XVaNestedList preedit_attr, status_attr; 1656 XVaNestedList preedit_attr, status_attr;
1540 1657
1541 if (!Input_Context 1658 if (!Input_Context
1542 || !TermWin.focus 1659 || !focus
1543 || !(input_style & XIMPreeditArea) 1660 || !(input_style & XIMPreeditArea)
1544 || !IMisRunning ()) 1661 || !IMisRunning ())
1545 return; 1662 return;
1546 1663
1547 /* Getting the necessary width of preedit area */ 1664 /* Getting the necessary width of preedit area */

Diff Legend

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