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

Diff Legend

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