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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines