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

Diff Legend

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