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

Diff Legend

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