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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines