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.186 by root, Tue Jan 17 15:41:33 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines