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.94 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines