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

Diff Legend

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