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.30 by pcg, Thu Feb 12 01:53:25 2004 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC

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

Diff Legend

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