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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines