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.179 by root, Mon Jan 16 08:48:09 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{
328} 377}
329 378
330void 379void
331rxvt_term::destroy_cb (time_watcher &w) 380rxvt_term::destroy_cb (time_watcher &w)
332{ 381{
333 SET_R (this); 382 make_current ();
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 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
344 485
345 if (!init_vars ()) 486 if (!init_vars ())
346 return false; 487 return false;
347 488
348 init_secondary (); 489 init_secondary ();
349 490
350 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
351 492
352 set_locale (""); 493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
353 496
354#if MENUBAR_MAX 497#if MENUBAR_MAX
355 menubar_read (rs[Rs_menu]); 498 menubar_read (rs[Rs_menu]);
356#endif 499#endif
357#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
358 if (options & Opt_scrollBar) 501 if (OPTION (Opt_scrollBar))
359 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
360#endif 503#endif
361 504
505#if ENABLE_PERL
506 if (!rs[Rs_perl_ext_1])
507 rs[Rs_perl_ext_1] = "default";
508
509 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
510 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
511 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
512 {
513#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
514 // ignore some perl-related arguments if some bozo installed us set[ug]id
515 if (rxvt_tainted ())
516 {
517 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
518 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
519 {
520 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
521 rs[Rs_perl_lib] = 0;
522 rs[Rs_perl_eval] = 0;
523 }
524 }
525#endif
526 rxvt_perl.init (this);
527 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
528 }
529#endif
530
362 create_windows (argc, argv); 531 create_windows (argc, argv);
363 532
533 dDisp;
534
364 init_xlocale (); 535 init_xlocale ();
365 536
366 scr_reset (); /* initialize screen */ 537 scr_reset (); // initialize screen
367 538
368#if 0 539#if 0
369 XSynchronize (display->display, True); 540 XSynchronize (disp, True);
370#endif 541#endif
371 542
372#ifdef HAVE_SCROLLBARS 543#ifdef HAVE_SCROLLBARS
373 if (options & Opt_scrollBar) 544 if (OPTION (Opt_scrollBar))
374 resize_scrollbar (); /* create and map scrollbar */ 545 resize_scrollbar (); /* create and map scrollbar */
375#endif 546#endif
376#if (MENUBAR_MAX) 547#if (MENUBAR_MAX)
377 if (menubar_visible ()) 548 if (menubar_visible ())
378 XMapWindow (display->display, menuBar.win); 549 XMapWindow (disp, menuBar.win);
379#endif 550#endif
380#ifdef TRANSPARENT 551#ifdef TRANSPARENT
381 if (options & Opt_transparent) 552 if (OPTION (Opt_transparent))
382 { 553 {
383 XSelectInput (display->display, display->root, PropertyChangeMask); 554 XSelectInput (disp, display->root, PropertyChangeMask);
384 check_our_parents (); 555 check_our_parents ();
385 rootwin_ev.start (display, display->root); 556 rootwin_ev.start (display, display->root);
386 } 557 }
387#endif 558#endif
388 559
389 XMapWindow (display->display, TermWin.vt); 560 XMapWindow (disp, vt);
390 XMapWindow (display->display, TermWin.parent[0]); 561 XMapWindow (disp, parent[0]);
562
563 set_colorfgbg ();
391 564
392 init_command (cmd_argv); 565 init_command (cmd_argv);
393 566
567 free (cmd_argv);
568
569 if (pty.pty >= 0)
394 pty_ev.start (pty.pty, EVENT_READ); 570 pty_ev.start (pty.pty, EVENT_READ);
395 571
396 check_ev.start (); 572 check_ev.start ();
397 573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
398 return true; 576 return true;
399} 577}
400 578
401static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 579static struct sig_handlers
580{
581 sig_watcher sw_chld, sw_term, sw_int;
582
583 void sig_chld (sig_watcher &w)
584 {
585 // we are being called for every SIGCHLD, find the corresponding term
586 int pid;
587
588 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
589 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
590 if (pid == (*t)->cmd_pid)
591 {
592 (*t)->child_exit ();
593 break;
594 }
595 }
596
597 /*
598 * Catch a fatal signal and tidy up before quitting
599 */
600 void
601 sig_term (sig_watcher &w)
602 {
603#ifdef DEBUG_CMD
604 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
605#endif
606 rxvt_emergency_cleanup ();
607 signal (w.signum, SIG_DFL);
608 kill (getpid (), w.signum);
609 }
610
611 sig_handlers ()
612 : sw_chld (this, &sig_handlers::sig_chld),
613 sw_term (this, &sig_handlers::sig_term),
614 sw_int (this, &sig_handlers::sig_term)
615 {
616 }
617} sig_handlers;
618
619char **rxvt_environ; // startup environment
402 620
403void 621void
404rxvt_init () 622rxvt_init ()
405{ 623{
406 /* install exit handler for cleanup */ 624 rxvt_environ = environ;
407#if 0 625
408#ifdef HAVE_ATEXIT
409 atexit (rxvt_clean_exit);
410#else
411#endif
412#endif
413 /* 626 /*
414 * Save and then give up any super-user privileges 627 * Save and then give up any super-user privileges
415 * If we need privileges in any area then we must specifically request it. 628 * If we need privileges in any area then we must specifically request it.
416 * We should only need to be root in these cases: 629 * We should only need to be root in these cases:
417 * 1. write utmp entries on some systems 630 * 1. write utmp entries on some systems
418 * 2. chown tty on some systems 631 * 2. chown tty on some systems
419 */ 632 */
420 rxvt_privileges (SAVE); 633 rxvt_privileges (SAVE);
421 rxvt_privileges (IGNORE); 634 rxvt_privileges (IGNORE);
422 635
423 struct sigaction sa; 636 signal (SIGHUP, SIG_IGN);
637 signal (SIGPIPE, SIG_IGN);
424 638
425 sigfillset (&sa.sa_mask); 639 sig_handlers.sw_chld.start (SIGCHLD);
426 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 640 sig_handlers.sw_term.start (SIGTERM);
427 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0); 641 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 642
434 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 643 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
435 /* signal (SIGURG, SIG_DFL); */ 644 /* signal (SIGURG, SIG_DFL); */
436 645
437 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 646 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
647 // TODO: handle this with exceptions and tolerate the memory loss
438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 648 XSetIOErrorHandler (rxvt_xioerror_handler);
439}
440 649
441/* ------------------------------------------------------------------------- * 650 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} 651}
514 652
515/* ------------------------------------------------------------------------- * 653/* ------------------------------------------------------------------------- *
516 * MEMORY ALLOCATION WRAPPERS * 654 * MEMORY ALLOCATION WRAPPERS *
517 * ------------------------------------------------------------------------- */ 655 * ------------------------------------------------------------------------- */
518/* INTPROTO */ 656void *
519void *
520rxvt_malloc (size_t size) 657rxvt_malloc (size_t size)
521{ 658{
522 void *p;
523
524 p = malloc (size); 659 void *p = malloc (size);
660
525 if (p) 661 if (!p)
526 return p;
527
528 rxvt_fatal ("memory allocation failure. aborting.\n"); 662 rxvt_fatal ("memory allocation failure. aborting.\n");
529 /* NOTREACHED */
530}
531 663
532/* INTPROTO */ 664 return p;
533void * 665}
666
667void *
534rxvt_calloc (size_t number, size_t size) 668rxvt_calloc (size_t number, size_t size)
535{ 669{
536 void *p;
537
538 p = calloc (number, size); 670 void *p = calloc (number, size);
671
539 if (p) 672 if (!p)
540 return p;
541
542 rxvt_fatal ("memory allocation failure. aborting.\n"); 673 rxvt_fatal ("memory allocation failure. aborting.\n");
543 /* NOTREACHED */
544}
545 674
546/* INTPROTO */ 675 return p;
676}
677
547void * 678void *
548rxvt_realloc (void *ptr, size_t size) 679rxvt_realloc (void *ptr, size_t size)
549{ 680{
550 void *p;
551
552 if (ptr)
553 p = realloc (ptr, size); 681 void *p = realloc (ptr, size);
554 else
555 p = malloc (size);
556 682
557 if (p) 683 if (!p)
558 return p;
559
560 rxvt_fatal ("memory allocation failure. aborting.\n"); 684 rxvt_fatal ("memory allocation failure. aborting.\n");
561 /* NOTREACHED */ 685
686 return p;
562} 687}
563 688
564/* ------------------------------------------------------------------------- * 689/* ------------------------------------------------------------------------- *
565 * PRIVILEGED OPERATIONS * 690 * PRIVILEGED OPERATIONS *
566 * ------------------------------------------------------------------------- */ 691 * ------------------------------------------------------------------------- */
567/* take care of suid/sgid super-user (root) privileges */ 692/* take care of suid/sgid super-user (root) privileges */
568void 693void
569rxvt_privileges (rxvt_privaction action) 694rxvt_privileges (rxvt_privaction action)
570{ 695{
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__) 696#if ! defined(__CYGWIN32__)
577# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 697# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
578 /* setreuid () is the poor man's setuid (), seteuid () */ 698 /* setreuid () is the poor man's setuid (), seteuid () */
579# define seteuid(a) setreuid(-1, (a)) 699# define seteuid(a) setreuid(-1, (a))
580# define setegid(a) setregid(-1, (a)) 700# define setegid(a) setregid(-1, (a))
586 case IGNORE: 706 case IGNORE:
587 /* 707 /*
588 * change effective uid/gid - not real uid/gid - so we can switch 708 * change effective uid/gid - not real uid/gid - so we can switch
589 * back to root later, as required 709 * back to root later, as required
590 */ 710 */
711 setegid (getgid ());
591 seteuid (getuid ()); 712 seteuid (getuid ());
592 setegid (getgid ());
593 break; 713 break;
594 case SAVE: 714 case SAVE:
595 euid = geteuid ();
596 egid = getegid (); 715 saved_egid = getegid ();
716 saved_euid = geteuid ();
597 break; 717 break;
598 case RESTORE: 718 case RESTORE:
599 seteuid (euid);
600 setegid (egid); 719 setegid (saved_egid);
720 seteuid (saved_euid);
601 break; 721 break;
602 } 722 }
603# else 723# else
604 switch (action) 724 switch (action)
605 { 725 {
606 case IGNORE: 726 case IGNORE:
727 setgid (getgid ());
607 setuid (getuid ()); 728 setuid (getuid ());
608 setgid (getgid ());
609 /* FALLTHROUGH */ 729 /* FALLTHROUGH */
610 case SAVE: 730 case SAVE:
611 /* FALLTHROUGH */ 731 /* FALLTHROUGH */
612 case RESTORE: 732 case RESTORE:
613 break; 733 break;
618 738
619#ifdef UTMP_SUPPORT 739#ifdef UTMP_SUPPORT
620void 740void
621rxvt_term::privileged_utmp (rxvt_privaction action) 741rxvt_term::privileged_utmp (rxvt_privaction action)
622{ 742{
623 if ((options & Opt_utmpInhibit) 743 if (OPTION (Opt_utmpInhibit)
624 || !pty.name || !*pty.name) 744 || !pty.name || !*pty.name)
625 return; 745 return;
626 746
627 rxvt_privileges (RESTORE); 747 rxvt_privileges (RESTORE);
628 748
639/* 759/*
640 * window size/position calculcations for XSizeHint and other storage. 760 * window size/position calculcations for XSizeHint and other storage.
641 * if width/height are non-zero then override calculated width/height 761 * if width/height are non-zero then override calculated width/height
642 */ 762 */
643void 763void
644rxvt_term::window_calc (unsigned int width, unsigned int height) 764rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
645{ 765{
646 short recalc_x, recalc_y; 766 short recalc_x, recalc_y;
647 int x, y, sb_w, mb_h, flags; 767 int x, y, sb_w, mb_h, flags;
648 unsigned int w, h; 768 unsigned int w, h;
649 unsigned int max_width, max_height; 769 unsigned int max_width, max_height;
770 dDisp;
650 771
651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 772 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
652 TermWin.ncol, TermWin.nrow, szHint.width, 773 ncol, nrow, szHint.width, szHint.height));
653 szHint.height)); 774
654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 775 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
655 szHint.win_gravity = NorthWestGravity; 776 szHint.win_gravity = NorthWestGravity;
656 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 777 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
657 778
658 recalc_x = recalc_y = 0; 779 recalc_x = recalc_y = 0;
659 flags = 0; 780 flags = 0;
781
660 if (!parsed_geometry) 782 if (!parsed_geometry)
661 { 783 {
662 parsed_geometry = 1; 784 parsed_geometry = 1;
785
663 if (rs[Rs_geometry]) 786 if (rs[Rs_geometry])
664 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 787 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
788
665 if (flags & WidthValue) 789 if (flags & WidthValue)
666 { 790 {
667 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 791 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
668 szHint.flags |= USSize; 792 szHint.flags |= USSize;
669 } 793 }
794
670 if (flags & HeightValue) 795 if (flags & HeightValue)
671 { 796 {
672 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 797 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 798 szHint.flags |= USSize;
674 } 799 }
800
675 if (flags & XValue) 801 if (flags & XValue)
676 { 802 {
677 szHint.x = x; 803 szHint.x = x;
678 szHint.flags |= USPosition; 804 szHint.flags |= USPosition;
805
679 if (flags & XNegative) 806 if (flags & XNegative)
680 { 807 {
681 recalc_x = 1; 808 recalc_x = 1;
682 szHint.win_gravity = NorthEastGravity; 809 szHint.win_gravity = NorthEastGravity;
683 } 810 }
684 } 811 }
812
685 if (flags & YValue) 813 if (flags & YValue)
686 { 814 {
687 szHint.y = y; 815 szHint.y = y;
688 szHint.flags |= USPosition; 816 szHint.flags |= USPosition;
817
689 if (flags & YNegative) 818 if (flags & YNegative)
690 { 819 {
691 recalc_y = 1; 820 recalc_y = 1;
821
692 if (szHint.win_gravity == NorthEastGravity) 822 if (szHint.win_gravity == NorthEastGravity)
693 szHint.win_gravity = SouthEastGravity; 823 szHint.win_gravity = SouthEastGravity;
694 else 824 else
695 szHint.win_gravity = SouthWestGravity; 825 szHint.win_gravity = SouthWestGravity;
696 } 826 }
697 } 827 }
698 } 828 }
699 829
700 /* TODO: BOUNDS */ 830 /* TODO: BOUNDS */
701 TermWin.width = TermWin.ncol * TermWin.fwidth; 831 width = ncol * fwidth;
702 TermWin.height = TermWin.nrow * TermWin.fheight; 832 height = nrow * fheight;
703 max_width = MAX_COLS * TermWin.fwidth; 833 max_width = MAX_COLS * fwidth;
704 max_height = MAX_ROWS * TermWin.fheight; 834 max_height = MAX_ROWS * fheight;
705 835
706 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 836 szHint.base_width = szHint.base_height = 2 * int_bwidth;
707 837
708 sb_w = mb_h = 0; 838 sb_w = mb_h = 0;
709 window_vt_x = window_vt_y = TermWin.int_bwidth; 839 window_vt_x = window_vt_y = int_bwidth;
710 840
711 if (scrollbar_visible ()) 841 if (scrollbar_visible ())
712 { 842 {
713 sb_w = scrollbar_TotalWidth (); 843 sb_w = scrollbar_TotalWidth ();
714 szHint.base_width += sb_w; 844 szHint.base_width += sb_w;
715 if (!(options & Opt_scrollBar_right)) 845 if (!OPTION (Opt_scrollBar_right))
716 window_vt_x += sb_w; 846 window_vt_x += sb_w;
717 } 847 }
718 848
719 if (menubar_visible ()) 849 if (menubar_visible ())
720 { 850 {
721 mb_h = menuBar_TotalHeight (); 851 mb_h = menuBar_TotalHeight ();
722 szHint.base_height += mb_h; 852 szHint.base_height += mb_h;
723 window_vt_y += mb_h; 853 window_vt_y += mb_h;
724 } 854 }
725 855
726 szHint.width_inc = TermWin.fwidth; 856 szHint.width_inc = fwidth;
727 szHint.height_inc = TermWin.fheight; 857 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 858 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 859 szHint.min_height = szHint.base_height + szHint.height_inc;
730 860
731 if (width && width - szHint.base_width < max_width) 861 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 862 {
733 szHint.width = width; 863 szHint.width = newwidth;
734 TermWin.width = width - szHint.base_width; 864 width = newwidth - szHint.base_width;
735 } 865 }
736 else 866 else
737 { 867 {
738 MIN_IT (TermWin.width, max_width); 868 min_it (width, max_width);
739 szHint.width = szHint.base_width + TermWin.width; 869 szHint.width = szHint.base_width + width;
740 } 870 }
741 871
742 if (height && height - szHint.base_height < max_height) 872 if (newheight && newheight - szHint.base_height < max_height)
743 { 873 {
744 szHint.height = height; 874 szHint.height = newheight;
745 TermWin.height = height - szHint.base_height; 875 height = newheight - szHint.base_height;
746 } 876 }
747 else 877 else
748 { 878 {
749 MIN_IT (TermWin.height, max_height); 879 min_it (height, max_height);
750 szHint.height = szHint.base_height + TermWin.height; 880 szHint.height = szHint.base_height + height;
751 } 881 }
752 882
753 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 883 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 884 window_sb_x = szHint.width - sb_w;
755 885
756 if (recalc_x) 886 if (recalc_x)
757 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 887 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
758 - szHint.width - 2 * TermWin.ext_bwidth);
759 if (recalc_y) 888 if (recalc_y)
760 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 889 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
761 - szHint.height - 2 * TermWin.ext_bwidth);
762 890
763 TermWin.ncol = TermWin.width / TermWin.fwidth; 891 ncol = width / fwidth;
764 TermWin.nrow = TermWin.height / TermWin.fheight; 892 nrow = height / fheight;
765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 893 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
766 TermWin.ncol, TermWin.nrow, szHint.width, 894 ncol, nrow, szHint.width,
767 szHint.height)); 895 szHint.height));
768 return; 896 return;
769} 897}
770 898
771/*----------------------------------------------------------------------*/ 899/*----------------------------------------------------------------------*/
779 if (pty.pty < 0) 907 if (pty.pty < 0)
780 return; 908 return;
781 909
782 struct winsize ws; 910 struct winsize ws;
783 911
784 ws.ws_col = TermWin.ncol; 912 ws.ws_col = ncol;
785 ws.ws_row = TermWin.nrow; 913 ws.ws_row = nrow;
786 ws.ws_xpixel = TermWin.width; 914 ws.ws_xpixel = width;
787 ws.ws_ypixel = TermWin.height; 915 ws.ws_ypixel = height;
788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 916 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
789 917
790#if 0 918#if 0
791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 919 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 920 if (cmd_pid) /* force through to the command */
793 kill (cmd_pid, SIGWINCH); 921 kill (-cmd_pid, SIGWINCH);
794#endif 922#endif
795} 923}
796 924
797/*----------------------------------------------------------------------*/ 925/*----------------------------------------------------------------------*/
798/* rxvt_change_font () - Switch to a new font */ 926/* set_fonts () - load and set the various fonts
799/* 927 *
800 * init = 1 - initialize 928 * init = 1 - initialize
801 * 929 *
802 * fontname == FONT_UP - switch to bigger font 930 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font 931 * fontname == FONT_DN - switch to smaller font
804 */ 932 */
805bool 933bool
806rxvt_term::change_font (const char *fontname) 934rxvt_term::set_fonts ()
807{ 935{
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); 936 rxvt_fontset *fs = new rxvt_fontset (this);
937 rxvt_fontprop prop;
819 938
820 if (fs && fs->populate (fontname ? fontname : "fixed")) 939 if (!fs
940 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
941 || !fs->realize_font (1))
942 {
943 delete fs;
944 return false;
945 }
946
947#if ENABLE_STYLES
948 for (int i = RS_styleCount; --i; )
949 if (fontset[i] != fontset[0])
950 delete fontset[i];
951#endif
952
953 delete fontset[0];
954 fontset[0] = fs;
955
956 prop = (*fs)[1]->properties ();
957 prop.height += lineSpace;
958 fs->set_prop (prop);
959
960 fwidth = prop.width;
961 fheight = prop.height;
962 fbase = prop.ascent;
963
964 for (int style = 1; style < 4; style++)
965 {
966#if ENABLE_STYLES
967 const char *res = rs[Rs_font + style];
968
969 if (res && !*res)
970 fontset[style] = fontset[0];
971 else
821 { 972 {
822 delete TermWin.fontset; 973 fontset[style] = fs = new rxvt_fontset (this);
823 TermWin.fontset = fs; 974 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 975
828 if (TermWin.parent[0]) 976 if (res)
977 prop2.weight = prop2.slant = rxvt_fontprop::unset;
978 else
829 { 979 {
830 resize_all_windows (0, 0, 0); 980 res = fontset[0]->fontdesc;
831 scr_remap_chars (); 981
832 scr_touch (true); 982 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
983 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
833 } 984 }
834 985
835 for (unicode_t ch = 0x20; ch <= 0x7f; ch++) 986 fs->populate (res);
836 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch); 987 fs->set_prop (prop2);
837
838 return true;
839 } 988 }
989#else
990 fontset[style] = fontset[0];
991#endif
992 }
993
994 if (parent[0])
840 } 995 {
996 resize_all_windows (0, 0, 0);
997 scr_remap_chars ();
998 scr_touch (true);
999 }
841 1000
842 return false; 1001 return true;
843} 1002}
844 1003
845bool 1004void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846rxvt_term::font_up_down (int n, int direction)
847{ 1005{
848 return false; 1006 XChangeProperty (display->display, parent[0],
1007 prop, XA_STRING, 8, PropModeReplace,
1008 (const unsigned char *)str, len >= 0 ? len : strlen (str));
1009}
1010
1011void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
1012{
1013 wchar_t *ws = rxvt_mbstowcs (str, len);
1014 char *s = rxvt_wcstoutf8 (ws);
1015
1016 XChangeProperty (display->display, parent[0],
1017 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1018 (const unsigned char *)s, strlen (s));
1019
1020 free (s);
1021 free (ws);
849} 1022}
850 1023
851/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
852/*----------------------------------------------------------------------*/ 1025/*----------------------------------------------------------------------*/
853/* xterm sequences - title, iconName, color (exptl) */ 1026/* xterm sequences - title, iconName, color (exptl) */
854void 1027void
855rxvt_term::set_title (const char *str) 1028rxvt_term::set_title (const char *str)
856{ 1029{
857#ifdef SMART_WINDOW_TITLE 1030 set_string_property (XA_WM_NAME, str);
858 char *name; 1031#if ENABLE_EWMH
859 1032 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 1033#endif
871} 1034}
872 1035
873void 1036void
874rxvt_term::set_icon_name (const char *str) 1037rxvt_term::set_icon_name (const char *str)
875{ 1038{
876#ifdef SMART_WINDOW_TITLE 1039 set_string_property (XA_WM_ICON_NAME, str);
877 char *name; 1040#if ENABLE_EWMH
878 1041 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 1042#endif
890} 1043}
891 1044
892#ifdef XTERM_COLOR_CHANGE 1045#ifdef XTERM_COLOR_CHANGE
893void 1046void
901 1054
902 /* handle color aliases */ 1055 /* handle color aliases */
903 if (isdigit (*color)) 1056 if (isdigit (*color))
904 { 1057 {
905 i = atoi (color); 1058 i = atoi (color);
1059
906 if (i >= 8 && i <= 15) 1060 if (i >= 8 && i <= 15)
907 { /* bright colors */ 1061 { /* bright colors */
908 i -= 8; 1062 i -= 8;
909# ifndef NO_BRIGHTCOLOR
910 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1063 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
911 SET_PIXCOLOR (idx); 1064 SET_PIXCOLOR (idx);
912 goto Done; 1065 goto done;
913# endif
914
915 } 1066 }
1067
916 if (i >= 0 && i <= 7) 1068 if (i >= 0 && i <= 7)
917 { /* normal colors */ 1069 { /* normal colors */
918 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1070 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
919 SET_PIXCOLOR (idx); 1071 SET_PIXCOLOR (idx);
920 goto Done; 1072 goto done;
921 } 1073 }
922 } 1074 }
923 1075
924 if (!rXParseAllocColor (& xcol, color)) 1076 if (!rXParseAllocColor (&xcol, color))
925 return; 1077 return;
926 1078
927 /* XStoreColor (display->display, display->cmap, XColor*); */ 1079 /* XStoreColor (display->display, display->cmap, XColor*); */
928 1080
929 /* 1081 /*
945 pix_colors_focused[idx] = xcol; 1097 pix_colors_focused[idx] = xcol;
946 SET_PIXCOLOR (idx); 1098 SET_PIXCOLOR (idx);
947 1099
948 /* XSetWindowAttributes attr; */ 1100 /* XSetWindowAttributes attr; */
949 /* Cursor cursor; */ 1101 /* Cursor cursor; */
950Done: 1102done:
1103
951#ifdef OFF_FOCUS_FADING 1104#if OFF_FOCUS_FADING
1105 if (rs[Rs_fade])
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1106 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
953#endif 1107#endif
954 if (idx == Color_bg && ! (options & Opt_transparent))
955 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
956 1108
957 /* handle Color_BD, scrollbar background, etc. */ 1109 /*TODO: handle Color_BD, scrollbar background, etc. */
958 1110
959 set_colorfgbg ();
960 recolour_cursor (); 1111 recolour_cursor ();
961 scr_touch (true); 1112 scr_recolour ();
962} 1113}
963 1114
964#else 1115#else
965# define set_window_color (idx,color) ((void)0) 1116# define set_window_color (idx,color) ((void)0)
966#endif /* XTERM_COLOR_CHANGE */ 1117#endif /* XTERM_COLOR_CHANGE */
968void 1119void
969rxvt_term::recolour_cursor () 1120rxvt_term::recolour_cursor ()
970{ 1121{
971 XColor xcol[2]; 1122 XColor xcol[2];
972 1123
973 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? pix_colors_focused[Color_pointer_fg] : pix_colors_focused[Color_fg]; 1124 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]; 1125 ? pix_colors_focused[Color_pointer_fg]
1126 : pix_colors_focused[Color_fg];
1127 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1128 ? pix_colors_focused[Color_pointer_bg]
1129 : pix_colors_focused[Color_bg];
1130
975 XQueryColors (display->display, display->cmap, xcol, 2); 1131 XQueryColors (display->display, display->cmap, xcol, 2);
976 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 1132 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
977} 1133}
978 1134
979/*----------------------------------------------------------------------*/ 1135/*----------------------------------------------------------------------*/
981 * find if fg/bg matches any of the normal (low-intensity) colors 1137 * find if fg/bg matches any of the normal (low-intensity) colors
982 */ 1138 */
983void 1139void
984rxvt_term::set_colorfgbg () 1140rxvt_term::set_colorfgbg ()
985{ 1141{
986 unsigned int i; 1142 unsigned int i;
987 const char *xpmb = "\0"; 1143 const char *xpmb = "\0";
988 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1144 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
989 1145
990 env_colorfgbg =
991 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1146 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 1147 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 1148 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 1149 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 1150 if (pix_colors[Color_fg] == pix_colors[i])
996 { 1151 {
997 sprintf (fstr, "%d", (i - Color_Black)); 1152 sprintf (fstr, "%d", (i - Color_Black));
998 break; 1153 break;
999 } 1154 }
1155
1000 for (i = Color_Black; i <= Color_White; i++) 1156 for (i = Color_Black; i <= Color_White; i++)
1001 if (pix_colors[Color_bg] == pix_colors[i]) 1157 if (pix_colors[Color_bg] == pix_colors[i])
1002 { 1158 {
1003 sprintf (bstr, "%d", (i - Color_Black)); 1159 sprintf (bstr, "%d", (i - Color_Black));
1004#ifdef XPM_BACKGROUND 1160#ifdef XPM_BACKGROUND
1006#endif 1162#endif
1007 break; 1163 break;
1008 } 1164 }
1009 1165
1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1166 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} 1167}
1023 1168
1024/*----------------------------------------------------------------------*/ 1169/*----------------------------------------------------------------------*/
1025/*
1026 * Colour determination for low colour displays, routine from
1027 * Hans de Goede <hans@highrise.nl>
1028 */
1029 1170
1030int 1171int
1031rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1172rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1032{ 1173{
1033 if (!screen_in_out->set (display, colour)) 1174 if (!screen_in_out->set (display, colour))
1041 1182
1042/* -------------------------------------------------------------------- * 1183/* -------------------------------------------------------------------- *
1043 * - WINDOW RESIZING - * 1184 * - WINDOW RESIZING - *
1044 * -------------------------------------------------------------------- */ 1185 * -------------------------------------------------------------------- */
1045void 1186void
1046rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1187rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1047{ 1188{
1048 int fix_screen; 1189 int fix_screen;
1049
1050#ifdef SMART_RESIZE
1051 int old_width = szHint.width, old_height = szHint.height; 1190 int old_width = szHint.width, old_height = szHint.height;
1052#endif 1191 dDisp;
1053 1192
1054 window_calc (width, height); 1193 window_calc (newwidth, newheight);
1055 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1194 XSetWMNormalHints (disp, parent[0], &szHint);
1056 1195
1057 if (!ignoreparent) 1196 if (!ignoreparent)
1058 { 1197 {
1059#ifdef SMART_RESIZE 1198#ifdef SMART_RESIZE
1060 /* 1199 /*
1064 int x, y, x1, y1; 1203 int x, y, x1, y1;
1065 int dx, dy; 1204 int dx, dy;
1066 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1205 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1067 Window unused_cr; 1206 Window unused_cr;
1068 1207
1069 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1208 XTranslateCoordinates (disp, parent[0], display->root,
1070 0, 0, &x, &y, &unused_cr); 1209 0, 0, &x, &y, &unused_cr);
1071 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1210 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1072 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1211 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1073 /* 1212 /*
1074 * if display->root isn't the parent window, a WM will probably have offset 1213 * if display->root isn't the parent window, a WM will probably have offset
1075 * our position for handles and decorations. Counter it 1214 * our position for handles and decorations. Counter it
1076 */ 1215 */
1078 { 1217 {
1079 x -= x1; 1218 x -= x1;
1080 y -= y1; 1219 y -= y1;
1081 } 1220 }
1082 1221
1083 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1222 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1084 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1223 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1085 dx = old_width - szHint.width; 1224 dx = old_width - szHint.width;
1086 dy = old_height - szHint.height; 1225 dy = old_height - szHint.height;
1087 1226
1088 /* Check position of the center of the window */ 1227 /* Check position of the center of the window */
1089 if (x < x1) /* left half */ 1228 if (x < x1) /* left half */
1093 if (y < y1) /* top half */ 1232 if (y < y1) /* top half */
1094 dy = 0; 1233 dy = 0;
1095 else if (y == y1) /* exact center */ 1234 else if (y == y1) /* exact center */
1096 dy /= 2; 1235 dy /= 2;
1097 1236
1098 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1237 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1099 szHint.width, szHint.height); 1238 szHint.width, szHint.height);
1100#else 1239#else
1101 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1240 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1102#endif 1241#endif
1103 } 1242 }
1104 1243
1105 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1244 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1106 1245
1107 if (fix_screen || width != old_width || height != old_height) 1246 if (fix_screen || newwidth != old_width || newheight != old_height)
1108 { 1247 {
1109 if (scrollbar_visible ()) 1248 if (scrollbar_visible ())
1110 { 1249 {
1111 XMoveResizeWindow (display->display, scrollBar.win, 1250 XMoveResizeWindow (disp, scrollBar.win,
1112 window_sb_x, 0, 1251 window_sb_x, 0,
1113 scrollbar_TotalWidth (), szHint.height); 1252 scrollbar_TotalWidth (), szHint.height);
1114 resize_scrollbar (); 1253 resize_scrollbar ();
1115 } 1254 }
1116 1255
1117 if (menubar_visible ()) 1256 if (menubar_visible ())
1118 XMoveResizeWindow (display->display, menuBar.win, 1257 XMoveResizeWindow (disp, menuBar.win,
1119 window_vt_x, 0, 1258 window_vt_x, 0,
1120 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1259 width, menuBar_TotalHeight ());
1121 1260
1122 XMoveResizeWindow (display->display, TermWin.vt, 1261 XMoveResizeWindow (disp, vt,
1123 window_vt_x, window_vt_y, 1262 window_vt_x, window_vt_y,
1124 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1263 width, height);
1264
1125 scr_clear (); 1265 scr_clear ();
1126#ifdef XPM_BACKGROUND 1266#ifdef XPM_BACKGROUND
1127 resize_pixmap (); 1267 resize_pixmap ();
1128#endif 1268#endif
1129 } 1269 }
1134 int old_ncol = prev_ncol; 1274 int old_ncol = prev_ncol;
1135 1275
1136 /* scr_reset only works on the primary screen */ 1276 /* scr_reset only works on the primary screen */
1137 if (old_height) /* this is not the first time through */ 1277 if (old_height) /* this is not the first time through */
1138 { 1278 {
1139 unsigned int ncol = TermWin.ncol; 1279 unsigned int ocol = ncol;
1140 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1280 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1141 curr_screen = scr_change_screen (PRIMARY); 1281 curr_screen = scr_change_screen (PRIMARY);
1142 TermWin.ncol = ncol; 1282 ncol = ocol;
1143 } 1283 }
1144 1284
1145 scr_reset (); 1285 scr_reset ();
1146 1286
1147 if (curr_screen >= 0) /* this is not the first time through */ 1287 if (curr_screen >= 0) /* this is not the first time through */
1148 { 1288 {
1149 scr_change_screen (curr_screen); 1289 scr_change_screen (curr_screen);
1150 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1290 selection_check (old_ncol != ncol ? 4 : 0);
1151 } 1291 }
1152 } 1292 }
1153 1293
1154 old_width = szHint.width; 1294 old_width = szHint.width;
1155 old_height = szHint.height; 1295 old_height = szHint.height;
1296
1297#ifdef XPM_BACKGROUND
1298 if (pixmap)
1299 scr_touch (false);
1300#endif
1156 1301
1157#ifdef USE_XIM 1302#ifdef USE_XIM
1158 IMSetStatusPosition (); 1303 IMSetStatusPosition ();
1159#endif 1304#endif
1160} 1305}
1162/* 1307/*
1163 * Set the width/height of the vt window in characters. Units are pixels. 1308 * Set the width/height of the vt window in characters. Units are pixels.
1164 * good for toggling 80/132 columns 1309 * good for toggling 80/132 columns
1165 */ 1310 */
1166void 1311void
1167rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1312rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1168{ 1313{
1169 XWindowAttributes wattr; 1314 XWindowAttributes wattr;
1170 1315
1171 if (width == 0 || height == 0) 1316 if (newwidth == 0 || newheight == 0)
1172 { 1317 {
1173 XGetWindowAttributes (display->display, display->root, &wattr); 1318 XGetWindowAttributes (display->display, display->root, &wattr);
1319
1174 if (width == 0) 1320 if (newwidth == 0)
1175 width = wattr.width - szHint.base_width; 1321 newwidth = wattr.width - szHint.base_width;
1176 if (height == 0) 1322 if (newheight == 0)
1177 height = wattr.height - szHint.base_height; 1323 newheight = wattr.height - szHint.base_height;
1178 }
1179
1180 if (width != TermWin.width || height != TermWin.height)
1181 { 1324 }
1325
1326 if (newwidth != width || newheight != height)
1327 {
1182 width += szHint.base_width; 1328 newwidth += szHint.base_width;
1183 height += szHint.base_height; 1329 newheight += szHint.base_height;
1184 resize_all_windows (width, height, 0); 1330 resize_all_windows (newwidth, newheight, 0);
1185 } 1331 }
1186} 1332}
1187 1333
1188/* -------------------------------------------------------------------- * 1334/* -------------------------------------------------------------------- *
1189 * - X INPUT METHOD ROUTINES - * 1335 * - X INPUT METHOD ROUTINES - *
1199 1345
1200void 1346void
1201rxvt_term::im_set_size (XRectangle &size) 1347rxvt_term::im_set_size (XRectangle &size)
1202{ 1348{
1203 // the int_bwidth terms make no sense to me 1349 // the int_bwidth terms make no sense to me
1204 size.x = TermWin.int_bwidth; 1350 size.x = int_bwidth;
1205 size.y = TermWin.int_bwidth; 1351 size.y = int_bwidth;
1206 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1352 size.width = Width2Pixel (ncol) + int_bwidth;
1207 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1353 size.height = Height2Pixel (nrow) + int_bwidth;
1208} 1354}
1209 1355
1210void 1356void
1211rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1357rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1212 XRectangle &status_rect, 1358 XRectangle &status_rect,
1213 const XRectangle &needed_rect) 1359 const XRectangle &needed_rect)
1214{ 1360{
1215 preedit_rect.x = needed_rect.width; 1361 preedit_rect.x = needed_rect.width;
1216 preedit_rect.y = 0; 1362 preedit_rect.y = 0;
1217 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1363 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1218 preedit_rect.height = TermWin.fheight; 1364 preedit_rect.height = fheight;
1219 1365
1220 status_rect.x = 0; 1366 status_rect.x = 0;
1221 status_rect.y = 0; 1367 status_rect.y = 0;
1222 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1368 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1223 status_rect.height = TermWin.fheight; 1369 status_rect.height = fheight;
1224} 1370}
1225 1371
1226/* Checking whether input method is running. */ 1372/* Checking whether input method is running. */
1227bool 1373bool
1228rxvt_term::IMisRunning () 1374rxvt_term::IMisRunning ()
1252} 1398}
1253 1399
1254void 1400void
1255rxvt_term::IMSendSpot () 1401rxvt_term::IMSendSpot ()
1256{ 1402{
1257 XPoint spot; 1403 XPoint nspot;
1258 XVaNestedList preedit_attr; 1404 XVaNestedList preedit_attr;
1259 1405
1260 if (!Input_Context 1406 if (!Input_Context
1261 || !TermWin.focus 1407 || !focus
1262 || !(input_style & XIMPreeditPosition) 1408 || !(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; 1409 return;
1272 1410
1273 im_set_position (spot); 1411 im_set_position (nspot);
1412
1413 if (nspot.x == spot.x && nspot.y == spot.y)
1414 return;
1415
1416 spot = nspot;
1274 1417
1275 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1418 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1276 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1419 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1277 XFree (preedit_attr); 1420 XFree (preedit_attr);
1278} 1421}
1279 1422
1280void 1423void
1281rxvt_term::im_destroy () 1424rxvt_term::im_destroy ()
1282{ 1425{
1283 if (Input_Context)
1284 {
1285 XDestroyIC (Input_Context);
1286 Input_Context = 0;
1287 }
1288
1289 if (input_method) 1426 if (input_method)
1290 { 1427 {
1428 if (Input_Context && input_method->xim)
1429 XDestroyIC (Input_Context);
1430
1291 display->put_xim (input_method); 1431 display->put_xim (input_method);
1292 input_method = 0; 1432 input_method = 0;
1293 } 1433 }
1434
1435 Input_Context = 0;
1294} 1436}
1295 1437
1296/* 1438/*
1297 * Try to open a XIM with the current modifiers, then see if we can 1439 * Try to open a XIM with the current modifiers, then see if we can
1298 * open a suitable preedit type 1440 * open a suitable preedit type
1307 unsigned long fg, bg; 1449 unsigned long fg, bg;
1308 const char *p; 1450 const char *p;
1309 char **s; 1451 char **s;
1310 XIMStyles *xim_styles; 1452 XIMStyles *xim_styles;
1311 1453
1454 set_environ (envv);
1455
1312 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1456 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1313 return false; 1457 return false;
1314 1458
1315 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1459 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1316 input_method = display->get_xim (locale, modifiers); 1460 input_method = display->get_xim (locale, modifiers);
1317 if (input_method == NULL) 1461 if (input_method == NULL)
1318 return false; 1462 return false;
1319 1463
1320 xim = input_method->xim; 1464 xim = input_method->xim;
1465 spot.x = spot.y = -1;
1321 1466
1322 xim_styles = NULL; 1467 xim_styles = NULL;
1323 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1468 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1324 || !xim_styles || !xim_styles->count_styles) 1469 || !xim_styles || !xim_styles->count_styles)
1325 { 1470 {
1326 im_destroy (); 1471 im_destroy ();
1327 return false; 1472 return false;
1328 } 1473 }
1329 1474
1330 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1475 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1476
1477 for (int pi = 0; pi < 2; pi++)
1478 {
1479 p = pet[pi];
1480
1481 if (!p)
1482 continue;
1483
1331 s = rxvt_splitcommastring (p); 1484 s = rxvt_splitcommastring (p);
1332 1485
1333 for (i = found = 0; !found && s[i]; i++) 1486 for (i = found = 0; !found && s[i]; i++)
1334 { 1487 {
1335 if (!strcmp (s[i], "OverTheSpot")) 1488 if (!strcmp (s[i], "OverTheSpot"))
1336 input_style = (XIMPreeditPosition | XIMStatusNothing); 1489 input_style = (XIMPreeditPosition | XIMStatusNothing);
1337 else if (!strcmp (s[i], "OffTheSpot")) 1490 else if (!strcmp (s[i], "OffTheSpot"))
1338 input_style = (XIMPreeditArea | XIMStatusArea); 1491 input_style = (XIMPreeditArea | XIMStatusArea);
1339 else if (!strcmp (s[i], "Root")) 1492 else if (!strcmp (s[i], "Root"))
1340 input_style = (XIMPreeditNothing | XIMStatusNothing); 1493 input_style = (XIMPreeditNothing | XIMStatusNothing);
1494 else if (!strcmp (s[i], "None"))
1495 input_style = (XIMPreeditNone | XIMStatusNone);
1341 1496
1342 for (j = 0; j < xim_styles->count_styles; j++) 1497 for (j = 0; j < xim_styles->count_styles; j++)
1343 if (input_style == xim_styles->supported_styles[j]) 1498 if (input_style == xim_styles->supported_styles[j])
1344 { 1499 {
1500 rxvt_freecommastring (s);
1501
1345 found = 1; 1502 found = 1;
1346 break; 1503 goto foundpet;
1504 }
1505
1347 } 1506 }
1348 }
1349 1507
1350 for (i = 0; s[i]; i++) 1508 rxvt_freecommastring (s);
1351 free (s[i]); 1509 }
1352 1510
1353 free (s); 1511foundpet:
1512
1354 XFree (xim_styles); 1513 XFree (xim_styles);
1355 1514
1356 if (!found) 1515 if (!found)
1357 { 1516 {
1358 im_destroy (); 1517 im_destroy ();
1375 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1534 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1376 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1535 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1377 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1536 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1378 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1537 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1379 "*", 1538 "*",
1380 TermWin.fheight, 1539 fheight,
1381 TermWin.fheight + 1, TermWin.fheight - 1, 1540 fheight + 1, fheight - 1,
1382 TermWin.fheight - 2, TermWin.fheight + 2); 1541 fheight - 2, fheight + 2);
1383 1542
1384 fs = XCreateFontSet (display->display, pat, 1543 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1385 &missing_charset_list, &missing_charset_count, &def_string); 1544 &missing_charset_list, &missing_charset_count, &def_string);
1386 1545
1387 if (missing_charset_list) 1546 if (missing_charset_list)
1388 XFreeStringList (missing_charset_list); 1547 XFreeStringList (missing_charset_list);
1389 1548
1433 NULL); 1592 NULL);
1434 } 1593 }
1435 1594
1436 Input_Context = XCreateIC (xim, 1595 Input_Context = XCreateIC (xim,
1437 XNInputStyle, input_style, 1596 XNInputStyle, input_style,
1438 XNClientWindow, TermWin.vt, 1597 XNClientWindow, vt,
1439 XNFocusWindow, TermWin.parent[0], 1598 XNFocusWindow, parent[0],
1440 preedit_attr ? XNPreeditAttributes : NULL, 1599 preedit_attr ? XNPreeditAttributes : NULL,
1441 preedit_attr, 1600 preedit_attr,
1442 status_attr ? XNStatusAttributes : NULL, 1601 status_attr ? XNStatusAttributes : NULL,
1443 status_attr, NULL); 1602 status_attr, NULL);
1444 1603
1461} 1620}
1462 1621
1463void 1622void
1464rxvt_term::im_cb () 1623rxvt_term::im_cb ()
1465{ 1624{
1466 int i, found, had_im; 1625 int i;
1467 const char *p; 1626 const char *p;
1468 char **s; 1627 char **s;
1469 char buf[IMBUFSIZ]; 1628 char buf[IMBUFSIZ];
1470 1629
1630 make_current ();
1631
1471 im_destroy (); 1632 im_destroy ();
1472 1633
1473 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1634 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1474 if (Input_Context) 1635 if (Input_Context)
1475 return; 1636 return;
1483 if (p && *p) 1644 if (p && *p)
1484 { 1645 {
1485 bool found = false; 1646 bool found = false;
1486 1647
1487 s = rxvt_splitcommastring (p); 1648 s = rxvt_splitcommastring (p);
1649
1488 for (i = 0; s[i]; i++) 1650 for (i = 0; s[i]; i++)
1489 { 1651 {
1490 if (*s[i]) 1652 if (*s[i])
1491 { 1653 {
1492 strcpy (buf, "@im="); 1654 strcpy (buf, "@im=");
1496 found = true; 1658 found = true;
1497 break; 1659 break;
1498 } 1660 }
1499 } 1661 }
1500 } 1662 }
1501 for (i = 0; s[i]; i++) 1663
1502 free (s[i]); 1664 rxvt_freecommastring (s);
1503 free (s);
1504 1665
1505 if (found) 1666 if (found)
1506 goto done; 1667 goto done;
1507 } 1668 }
1508 1669
1526{ 1687{
1527 XRectangle preedit_rect, status_rect, *needed_rect; 1688 XRectangle preedit_rect, status_rect, *needed_rect;
1528 XVaNestedList preedit_attr, status_attr; 1689 XVaNestedList preedit_attr, status_attr;
1529 1690
1530 if (!Input_Context 1691 if (!Input_Context
1531 || !TermWin.focus 1692 || !focus
1532 || !(input_style & XIMPreeditArea) 1693 || !(input_style & XIMPreeditArea)
1533 || !IMisRunning ()) 1694 || !IMisRunning ())
1534 return; 1695 return;
1535 1696
1536 /* Getting the necessary width of preedit area */ 1697 /* Getting the necessary width of preedit area */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines