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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines