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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines