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

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

Diff Legend

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