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.175 by root, Thu Jan 12 00:35:39 2006 UTC

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

Diff Legend

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