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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines