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

Diff Legend

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