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.45 by pcg, Tue Feb 24 21:46:15 2004 UTC vs.
Revision 1.186 by root, Tue Jan 17 15:41:33 2006 UTC

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

Diff Legend

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