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.171 by root, Wed Jan 11 03:13:26 2006 UTC

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

Diff Legend

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