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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines