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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines