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

Diff Legend

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