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.132 by root, Thu Feb 3 07:18:30 2005 UTC vs.
Revision 1.198 by root, Tue Jan 24 16:57:42 2006 UTC

… …
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"
37
38#include <limits>
36 39
37#include <csignal> 40#include <csignal>
38#include <cstring> 41#include <cstring>
39 42
40#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
43 46
44#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
45# include <termios.h> 48# include <termios.h>
46#endif 49#endif
47 50
48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
51
52vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
53 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
54static char curlocale[128]; 56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
58{ 60{
59 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
60 return false; 62 return false;
61 63
62 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
63 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
64 return true; 66 return true;
67}
68
69void
70rxvt_push_locale (const char *locale) NOTHROW
71{
72 strcpy (savelocale, curlocale);
73 rxvt_set_locale (locale);
74}
75
76void
77rxvt_pop_locale () NOTHROW
78{
79 rxvt_set_locale (savelocale);
65} 80}
66 81
67#if ENABLE_COMBINING 82#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
69 84
… …
134 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
135#endif 150#endif
136#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
137 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
138#endif 153#endif
139#ifdef MENUBAR
140 menubar_ev (this, &rxvt_term::x_cb),
141#endif
142#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
143 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
144#endif 156#endif
145#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
146 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 171#endif
160#ifdef USE_XIM 172#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
162#endif 174#endif
163 sw_term (this, &rxvt_term::sig_term), 175#ifndef NO_BELL
164 sw_int (this, &rxvt_term::sig_term), 176 bell_ev (this, &rxvt_term::bell_cb),
165 sw_chld (this, &rxvt_term::sig_chld), 177#endif
166 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
168 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
171 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
172 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
175 188
176 termlist.push_back (this); 189 termlist.push_back (this);
177 190
178#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
179 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
180
181 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n");
183#endif 193#endif
184} 194}
185 195
186rxvt_term::~rxvt_term () 196// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit
198void rxvt_term::emergency_cleanup ()
187{ 199{
188 termlist.erase (find (termlist.begin (), termlist.end(), this));
189
190 if (cmd_pid) 200 if (cmd_pid)
191 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
192 202
193#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
194 privileged_utmp (RESTORE); 204}
195#endif
196 205
197 pty.put (); 206rxvt_term::~rxvt_term ()
207{
208 termlist.erase (find (termlist.begin (), termlist.end(), this));
209
210 emergency_cleanup ();
198 211
199#if ENABLE_STYLES 212#if ENABLE_STYLES
200 for (int i = RS_styleCount; --i; ) 213 for (int i = RS_styleCount; --i; )
201 if (TermWin.fontset[i] != TermWin.fontset[0]) 214 if (fontset[i] != fontset[0])
202 delete TermWin.fontset[i]; 215 delete fontset[i];
203#endif 216#endif
204 delete TermWin.fontset[0]; 217 delete fontset[0];
205 218
206 if (display) 219 if (display)
207 { 220 {
221 dDisp;
222
208 selection_clear (); 223 selection_clear ();
209 224
210#ifdef USE_XIM 225#ifdef USE_XIM
211 im_destroy (); 226 im_destroy ();
212#endif 227#endif
213#ifdef MENUBAR
214 if (menubarGC) XFreeGC (display->display, menubarGC);
215#endif
216#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
217 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
218 if (ShadowGC) XFreeGC (display->display, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
219#endif 231#endif
220#ifdef PLAIN_SCROLLBAR 232#ifdef PLAIN_SCROLLBAR
221 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
222#endif 234#endif
223#ifdef NEXT_SCROLLBAR 235#ifdef NEXT_SCROLLBAR
224 if (blackGC) XFreeGC (display->display, blackGC); 236 if (blackGC) XFreeGC (disp, blackGC);
225 if (whiteGC) XFreeGC (display->display, whiteGC); 237 if (whiteGC) XFreeGC (disp, whiteGC);
226 if (grayGC) XFreeGC (display->display, grayGC); 238 if (grayGC) XFreeGC (disp, grayGC);
227 if (darkGC) XFreeGC (display->display, darkGC); 239 if (darkGC) XFreeGC (disp, darkGC);
228 if (stippleGC) XFreeGC (display->display, stippleGC); 240 if (stippleGC) XFreeGC (disp, stippleGC);
229 if (dimple) XFreePixmap (display->display, dimple); 241 if (dimple) XFreePixmap (disp, dimple);
230 if (upArrow) XFreePixmap (display->display, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
231 if (downArrow) XFreePixmap (display->display, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
232 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
233 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
234#endif 246#endif
235#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
236 if (topShadowGC) XFreeGC (display->display, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
237 if (botShadowGC) XFreeGC (display->display, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
238 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
239#endif 251#endif
240 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 252 if (gc) XFreeGC (disp, gc);
241 253
242#if defined(MENUBAR) && (MENUBAR_MAX > 1)
243 delete menuBar.drawable; 254 delete drawable;
244 //if (menuBar.win)
245 // XDestroyWindow (display->display, menuBar.win);
246#endif
247 delete TermWin.drawable;
248 // destroy all windows 255 // destroy all windows
249 if (TermWin.parent[0]) 256 if (parent[0])
250 XDestroyWindow (display->display, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
251 } 258 }
252 259
253 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
254
255 delete pix_colors_focused; 261 delete pix_colors_focused;
256#ifdef OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
257 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
258#endif 264#endif
259 265
260 displays.put (display); 266 displays.put (display);
261 267
262 scr_release (); 268 scr_release ();
263 269
264 /* clear all resources */ 270 /* clear all resources */
265 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
266 free (allocated[i]); 272 free (allocated [i]);
267 273
268 free (selection.text); 274 free (selection.text);
269 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
270 free (env_windowid); 276 free (env_windowid);
271 free (env_display); 277 free (env_display);
… …
277 283
278 delete envv; 284 delete envv;
279 delete argv; 285 delete argv;
280 286
281#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
282 delete keyboard; 288 delete keyboard;
283#endif 289#endif
290}
291
292// child has exited, usually destroys
293void
294rxvt_term::child_cb (child_watcher &w, int status)
295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
298 cmd_pid = 0;
299
300 if (!OPTION (Opt_hold))
301 destroy ();
284} 302}
285 303
286void 304void
287rxvt_term::destroy () 305rxvt_term::destroy ()
288{ 306{
289 if (destroy_ev.active) 307 if (destroy_ev.active)
290 return; 308 return;
291 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
292#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
293 scr_overlay_off (); 314 scr_overlay_off ();
294#endif 315#endif
295 316
296 if (display) 317 if (display)
… …
298#if USE_XIM 319#if USE_XIM
299 im_ev.stop (display); 320 im_ev.stop (display);
300#endif 321#endif
301#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
302 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
303#endif
304#if MENUBAR
305 menubar_ev.stop (display);
306#endif 324#endif
307#if TRANSPARENT 325#if TRANSPARENT
308 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
309#endif 327#endif
310 incr_ev.stop (); 328 incr_ev.stop ();
… …
334} 352}
335 353
336void 354void
337rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
338{ 356{
339 SET_R (this); 357 make_current ();
340 358
341 delete this; 359 delete this;
342}
343
344/*----------------------------------------------------------------------*/
345/* rxvt_init () */
346bool
347rxvt_term::init (int argc, const char *const *argv)
348{
349 SET_R (this);
350
351 set_locale ("");
352
353 if (!init_vars ())
354 return false;
355
356 init_secondary ();
357
358 const char **cmd_argv = init_resources (argc, argv);
359
360#ifdef KEYSYM_RESOURCE
361 keyboard->register_done ();
362#endif
363
364#if MENUBAR_MAX
365 menubar_read (rs[Rs_menu]);
366#endif
367#ifdef HAVE_SCROLLBARS
368 if (options & Opt_scrollBar)
369 scrollBar.setIdle (); /* set existence for size calculations */
370#endif
371
372 create_windows (argc, argv);
373
374 init_xlocale ();
375
376 scr_reset (); /* initialize screen */
377
378#if 0
379 XSynchronize (display->display, True);
380#endif
381
382#ifdef HAVE_SCROLLBARS
383 if (options & Opt_scrollBar)
384 resize_scrollbar (); /* create and map scrollbar */
385#endif
386#if (MENUBAR_MAX)
387 if (menubar_visible ())
388 XMapWindow (display->display, menuBar.win);
389#endif
390#ifdef TRANSPARENT
391 if (options & Opt_transparent)
392 {
393 XSelectInput (display->display, display->root, PropertyChangeMask);
394 check_our_parents ();
395 rootwin_ev.start (display, display->root);
396 }
397#endif
398
399 XMapWindow (display->display, TermWin.vt);
400 XMapWindow (display->display, TermWin.parent[0]);
401
402 set_colorfgbg ();
403
404 init_command (cmd_argv);
405
406 free (cmd_argv);
407
408 pty_ev.start (pty.pty, EVENT_READ);
409
410 check_ev.start ();
411
412 return true;
413}
414
415static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
416
417void
418rxvt_init ()
419{
420 /*
421 * Save and then give up any super-user privileges
422 * If we need privileges in any area then we must specifically request it.
423 * We should only need to be root in these cases:
424 * 1. write utmp entries on some systems
425 * 2. chown tty on some systems
426 */
427 rxvt_privileges (SAVE);
428 rxvt_privileges (IGNORE);
429
430 signal (SIGHUP, SIG_IGN);
431 signal (SIGPIPE, SIG_IGN);
432
433 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
434 /* signal (SIGURG, SIG_DFL); */
435
436 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
437 // TODO: handle this with exceptions and tolerate the memory loss
438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
439}
440
441/* ------------------------------------------------------------------------- *
442 * SIGNAL HANDLING & EXIT HANDLER *
443 * ------------------------------------------------------------------------- */
444/*
445 * Catch a SIGCHLD signal and exit if the direct child has died
446 */
447
448void
449rxvt_term::sig_chld (sig_watcher &w)
450{
451 // we are being called for every SIGCHLD, not just ours
452 int pid;
453
454 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
455 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
456 if (pid == (*t)->cmd_pid)
457 {
458 (*t)->destroy ();
459 break;
460 }
461} 360}
462 361
463/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
464/* 363/*
465 * Exit gracefully, clearing the utmp entry and restoring tty attributes 364 * Exit gracefully, clearing the utmp entry and restoring tty attributes
466 * TODO: if debugging, this should free up any known resources if we can 365 * TODO: if debugging, this should free up any known resources if we can
467 */ 366 */
468void 367static XErrorHandler old_xerror_handler;
469rxvt_destroy_all () 368
369static void
370rxvt_emergency_cleanup ()
470{ 371{
471 // TODO: rxvtd should clean up all ressources
472 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
473 (*t)->destroy (); 373 (*t)->emergency_cleanup ();
474} 374}
475 375
476/* 376#if ENABLE_FRILLS
477 * Catch a fatal signal and tidy up before quitting 377static void
478 */ 378print_x_error (Display *dpy, XErrorEvent *event)
479void
480rxvt_term::sig_term (sig_watcher &w)
481{ 379{
482#ifdef DEBUG_CMD 380 char buffer[BUFSIZ];
483 rxvt_warn ("caught signal %d, exiting.\n", w.signum); 381 char mesg[BUFSIZ];
484#endif 382 char number[32];
485 rxvt_destroy_all (); 383 char *mtype = "XlibMessage";
486 signal (w.signum, SIG_DFL); 384 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
487 kill (getpid (), w.signum); 385 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
386 rxvt_warn ("An X Error occured, trying to continue after report.\n");
387 rxvt_warn ("%s: %s\n", mesg, buffer);
388 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
389 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
390 sprintf(number, "%d", event->request_code);
391 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
392 rxvt_warn ("(which is %s)\n", buffer);
393 if (event->request_code >= 128) {
394 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
395 mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
397 }
398 if ((event->error_code == BadWindow) ||
399 (event->error_code == BadPixmap) ||
400 (event->error_code == BadCursor) ||
401 (event->error_code == BadFont) ||
402 (event->error_code == BadDrawable) ||
403 (event->error_code == BadColor) ||
404 (event->error_code == BadGC) ||
405 (event->error_code == BadIDChoice) ||
406 (event->error_code == BadValue) ||
407 (event->error_code == BadAtom)) {
408 if (event->error_code == BadValue)
409 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
410 mesg, BUFSIZ);
411 else if (event->error_code == BadAtom)
412 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
413 mesg, BUFSIZ);
414 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
488} 422}
423#endif
489 424
490/* INTPROTO */
491int 425int
492rxvt_xerror_handler (Display *display, XErrorEvent *event) 426rxvt_xerror_handler (Display *display, XErrorEvent *event)
493{ 427{
494 if (GET_R->allowedxerror == -1) 428 if (GET_R->allowedxerror == -1)
495 GET_R->allowedxerror = event->error_code; 429 GET_R->allowedxerror = event->error_code;
496 else 430 else
497 { 431 {
432 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue
434#if ENABLE_FRILLS
435 print_x_error (display, event);
436#else
498 old_xerror_handler (display, event); 437 old_xerror_handler (display, event);
499 GET_R->destroy (); 438#endif
500 } 439 }
501 440
502 return 0; 441 return 0;
442}
443
444int
445rxvt_xioerror_handler (Display *display)
446{
447 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
448 DisplayString (display));
449 rxvt_emergency_cleanup ();
450 _exit (EXIT_FAILURE);
451}
452
453/*----------------------------------------------------------------------*/
454bool
455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
456{
457 this->envv = envv;
458
459 SET_R (this);
460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
462
463 if (!init_vars ())
464 return false;
465
466 init_secondary ();
467
468 const char **cmd_argv = init_resources (argc, argv);
469
470#ifdef KEYSYM_RESOURCE
471 keyboard->register_done ();
472#endif
473
474#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */
477#endif
478
479 pty = ptytty::create ();
480
481 create_windows (argc, argv);
482
483 dDisp;
484
485 init_xlocale ();
486
487 scr_reset (); // initialize screen
488
489#if 0
490 XSynchronize (disp, True);
491#endif
492
493#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */
496#endif
497#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent))
499 {
500 XSelectInput (disp, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root);
503 }
504#endif
505
506 set_colorfgbg ();
507
508 init_command (cmd_argv);
509
510 free (cmd_argv);
511
512 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ);
514
515 check_ev.start ();
516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
519 XMapWindow (disp, vt);
520 XMapWindow (disp, parent[0]);
521
522 return true;
523}
524
525static struct sig_handlers
526{
527 sig_watcher sw_term, sw_int;
528
529 /*
530 * Catch a fatal signal and tidy up before quitting
531 */
532 void
533 sig_term (sig_watcher &w)
534 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum);
541 }
542
543 sig_handlers ()
544 : sw_term (this, &sig_handlers::sig_term),
545 sw_int (this, &sig_handlers::sig_term)
546 {
547 }
548} sig_handlers;
549
550char **rxvt_environ; // startup environment
551
552void
553rxvt_init ()
554{
555 ptytty::init ();
556
557 rxvt_environ = environ;
558
559 signal (SIGHUP, SIG_IGN);
560 signal (SIGPIPE, SIG_IGN);
561
562 sig_handlers.sw_term.start (SIGTERM);
563 sig_handlers.sw_int.start (SIGINT);
564
565 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
566 /* signal (SIGURG, SIG_DFL); */
567
568 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
569 // TODO: handle this with exceptions and tolerate the memory loss
570 XSetIOErrorHandler (rxvt_xioerror_handler);
571
572 XrmInitialize ();
503} 573}
504 574
505/* ------------------------------------------------------------------------- * 575/* ------------------------------------------------------------------------- *
506 * MEMORY ALLOCATION WRAPPERS * 576 * MEMORY ALLOCATION WRAPPERS *
507 * ------------------------------------------------------------------------- */ 577 * ------------------------------------------------------------------------- */
… …
514 rxvt_fatal ("memory allocation failure. aborting.\n"); 584 rxvt_fatal ("memory allocation failure. aborting.\n");
515 585
516 return p; 586 return p;
517} 587}
518 588
519/* INTPROTO */ 589void *
520void *
521rxvt_calloc (size_t number, size_t size) 590rxvt_calloc (size_t number, size_t size)
522{ 591{
523 void *p = calloc (number, size); 592 void *p = calloc (number, size);
524 593
525 if (!p) 594 if (!p)
526 rxvt_fatal ("memory allocation failure. aborting.\n"); 595 rxvt_fatal ("memory allocation failure. aborting.\n");
527 596
528 return p; 597 return p;
529} 598}
530 599
531/* INTPROTO */ 600void *
532void *
533rxvt_realloc (void *ptr, size_t size) 601rxvt_realloc (void *ptr, size_t size)
534{ 602{
535 void *p = realloc (ptr, size); 603 void *p = realloc (ptr, size);
536 604
537 if (!p) 605 if (!p)
538 rxvt_fatal ("memory allocation failure. aborting.\n"); 606 rxvt_fatal ("memory allocation failure. aborting.\n");
539 607
540 return p; 608 return p;
541} 609}
542
543/* ------------------------------------------------------------------------- *
544 * PRIVILEGED OPERATIONS *
545 * ------------------------------------------------------------------------- */
546/* take care of suid/sgid super-user (root) privileges */
547void
548rxvt_privileges (rxvt_privaction action)
549{
550#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
551 static uid_t euid;
552 static gid_t egid;
553#endif
554
555#if ! defined(__CYGWIN32__)
556# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
557 /* setreuid () is the poor man's setuid (), seteuid () */
558# define seteuid(a) setreuid(-1, (a))
559# define setegid(a) setregid(-1, (a))
560# define HAVE_SETEUID
561# endif
562# ifdef HAVE_SETEUID
563 switch (action)
564 {
565 case IGNORE:
566 /*
567 * change effective uid/gid - not real uid/gid - so we can switch
568 * back to root later, as required
569 */
570 seteuid (getuid ());
571 setegid (getgid ());
572 break;
573 case SAVE:
574 euid = geteuid ();
575 egid = getegid ();
576 break;
577 case RESTORE:
578 seteuid (euid);
579 setegid (egid);
580 break;
581 }
582# else
583 switch (action)
584 {
585 case IGNORE:
586 setuid (getuid ());
587 setgid (getgid ());
588 /* FALLTHROUGH */
589 case SAVE:
590 /* FALLTHROUGH */
591 case RESTORE:
592 break;
593 }
594# endif
595#endif
596}
597
598#ifdef UTMP_SUPPORT
599void
600rxvt_term::privileged_utmp (rxvt_privaction action)
601{
602 if ((options & Opt_utmpInhibit)
603 || !pty.name || !*pty.name)
604 return;
605
606 rxvt_privileges (RESTORE);
607
608 if (action == SAVE)
609 makeutent (pty.name, rs[Rs_display_name]);
610 else
611 cleanutent ();
612
613 rxvt_privileges (IGNORE);
614}
615#endif
616 610
617/*----------------------------------------------------------------------*/ 611/*----------------------------------------------------------------------*/
618/* 612/*
619 * window size/position calculcations for XSizeHint and other storage. 613 * window size/position calculcations for XSizeHint and other storage.
620 * if width/height are non-zero then override calculated width/height 614 * if width/height are non-zero then override calculated width/height
621 */ 615 */
622void 616void
623rxvt_term::window_calc (unsigned int width, unsigned int height) 617rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
624{ 618{
625 short recalc_x, recalc_y; 619 short recalc_x, recalc_y;
626 int x, y, sb_w, mb_h, flags; 620 int x, y, sb_w, flags;
627 unsigned int w, h; 621 unsigned int w, h;
628 unsigned int max_width, max_height; 622 unsigned int max_width, max_height;
623 dDisp;
629 624
630 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 625 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
631 TermWin.ncol, TermWin.nrow, szHint.width, 626 ncol, nrow, szHint.width, szHint.height));
632 szHint.height)); 627
633 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 628 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
634 szHint.win_gravity = NorthWestGravity; 629 szHint.win_gravity = NorthWestGravity;
635 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 630 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
636 631
637 recalc_x = recalc_y = 0; 632 recalc_x = recalc_y = 0;
638 flags = 0; 633 flags = 0;
634
639 if (!parsed_geometry) 635 if (!parsed_geometry)
640 { 636 {
641 parsed_geometry = 1; 637 parsed_geometry = 1;
638
642 if (rs[Rs_geometry]) 639 if (rs[Rs_geometry])
643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 640 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
641
644 if (flags & WidthValue) 642 if (flags & WidthValue)
645 { 643 {
646 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 644 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
647 szHint.flags |= USSize; 645 szHint.flags |= USSize;
648 } 646 }
647
649 if (flags & HeightValue) 648 if (flags & HeightValue)
650 { 649 {
651 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 650 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
652 szHint.flags |= USSize; 651 szHint.flags |= USSize;
653 } 652 }
653
654 if (flags & XValue) 654 if (flags & XValue)
655 { 655 {
656 szHint.x = x; 656 szHint.x = x;
657 szHint.flags |= USPosition; 657 szHint.flags |= USPosition;
658
658 if (flags & XNegative) 659 if (flags & XNegative)
659 { 660 {
660 recalc_x = 1; 661 recalc_x = 1;
661 szHint.win_gravity = NorthEastGravity; 662 szHint.win_gravity = NorthEastGravity;
662 } 663 }
663 } 664 }
665
664 if (flags & YValue) 666 if (flags & YValue)
665 { 667 {
666 szHint.y = y; 668 szHint.y = y;
667 szHint.flags |= USPosition; 669 szHint.flags |= USPosition;
670
668 if (flags & YNegative) 671 if (flags & YNegative)
669 { 672 {
670 recalc_y = 1; 673 recalc_y = 1;
674
671 if (szHint.win_gravity == NorthEastGravity) 675 if (szHint.win_gravity == NorthEastGravity)
672 szHint.win_gravity = SouthEastGravity; 676 szHint.win_gravity = SouthEastGravity;
673 else 677 else
674 szHint.win_gravity = SouthWestGravity; 678 szHint.win_gravity = SouthWestGravity;
675 } 679 }
676 } 680 }
677 } 681 }
678 682
679 /* TODO: BOUNDS */ 683 /* TODO: BOUNDS */
680 TermWin.width = TermWin.ncol * TermWin.fwidth; 684 width = ncol * fwidth;
681 TermWin.height = TermWin.nrow * TermWin.fheight; 685 height = nrow * fheight;
682 max_width = MAX_COLS * TermWin.fwidth; 686 max_width = MAX_COLS * fwidth;
683 max_height = MAX_ROWS * TermWin.fheight; 687 max_height = MAX_ROWS * fheight;
684 688
685 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 689 szHint.base_width = szHint.base_height = 2 * int_bwidth;
686 690
687 sb_w = mb_h = 0; 691 sb_w = 0;
688 window_vt_x = window_vt_y = TermWin.int_bwidth; 692 window_vt_x = window_vt_y = int_bwidth;
689 693
690 if (scrollbar_visible ()) 694 if (scrollBar.state)
691 { 695 {
692 sb_w = scrollbar_TotalWidth (); 696 sb_w = scrollbar_TotalWidth ();
693 szHint.base_width += sb_w; 697 szHint.base_width += sb_w;
694 if (!(options & Opt_scrollBar_right)) 698 if (!OPTION (Opt_scrollBar_right))
695 window_vt_x += sb_w; 699 window_vt_x += sb_w;
696 } 700 }
697 701
698 if (menubar_visible ())
699 {
700 mb_h = menuBar_TotalHeight ();
701 szHint.base_height += mb_h;
702 window_vt_y += mb_h;
703 }
704
705 szHint.width_inc = TermWin.fwidth; 702 szHint.width_inc = fwidth;
706 szHint.height_inc = TermWin.fheight; 703 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 704 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 705 szHint.min_height = szHint.base_height + szHint.height_inc;
709 706
710 if (width && width - szHint.base_width < max_width) 707 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 708 {
712 szHint.width = width; 709 szHint.width = newwidth;
713 TermWin.width = width - szHint.base_width; 710 width = newwidth - szHint.base_width;
714 } 711 }
715 else 712 else
716 { 713 {
717 MIN_IT (TermWin.width, max_width); 714 min_it (width, max_width);
718 szHint.width = szHint.base_width + TermWin.width; 715 szHint.width = szHint.base_width + width;
719 } 716 }
720 717
721 if (height && height - szHint.base_height < max_height) 718 if (newheight && newheight - szHint.base_height < max_height)
722 { 719 {
723 szHint.height = height; 720 szHint.height = newheight;
724 TermWin.height = height - szHint.base_height; 721 height = newheight - szHint.base_height;
725 } 722 }
726 else 723 else
727 { 724 {
728 MIN_IT (TermWin.height, max_height); 725 min_it (height, max_height);
729 szHint.height = szHint.base_height + TermWin.height; 726 szHint.height = szHint.base_height + height;
730 } 727 }
731 728
732 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 729 if (scrollBar.state && OPTION (Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 730 window_sb_x = szHint.width - sb_w;
734 731
735 if (recalc_x) 732 if (recalc_x)
736 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 733 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
737 - szHint.width - 2 * TermWin.ext_bwidth);
738 if (recalc_y) 734 if (recalc_y)
739 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 735 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
740 - szHint.height - 2 * TermWin.ext_bwidth);
741 736
742 TermWin.ncol = TermWin.width / TermWin.fwidth; 737 ncol = width / fwidth;
743 TermWin.nrow = TermWin.height / TermWin.fheight; 738 nrow = height / fheight;
744 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 739 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
745 TermWin.ncol, TermWin.nrow, szHint.width, 740 ncol, nrow, szHint.width,
746 szHint.height)); 741 szHint.height));
747 return; 742 return;
748} 743}
749 744
750/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
… …
753 * Called after a window size change. 748 * Called after a window size change.
754 */ 749 */
755void 750void
756rxvt_term::tt_winch () 751rxvt_term::tt_winch ()
757{ 752{
758 if (pty.pty < 0) 753 if (pty->pty < 0)
759 return; 754 return;
760 755
761 struct winsize ws; 756 struct winsize ws;
762 757
763 ws.ws_col = TermWin.ncol; 758 ws.ws_col = ncol;
764 ws.ws_row = TermWin.nrow; 759 ws.ws_row = nrow;
765 ws.ws_xpixel = TermWin.width; 760 ws.ws_xpixel = width;
766 ws.ws_ypixel = TermWin.height; 761 ws.ws_ypixel = height;
767 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 762 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
768 763
769#if 0 764#if 0
770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 765 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
771 if (cmd_pid) /* force through to the command */ 766 if (cmd_pid) /* force through to the command */
772 kill (cmd_pid, SIGWINCH); 767 kill (-cmd_pid, SIGWINCH);
773#endif 768#endif
774} 769}
775 770
776/*----------------------------------------------------------------------*/ 771/*----------------------------------------------------------------------*/
777/* set_fonts () - load and set the various fonts 772/* set_fonts () - load and set the various fonts
778/* 773 *
779 * init = 1 - initialize 774 * init = 1 - initialize
780 * 775 *
781 * fontname == FONT_UP - switch to bigger font 776 * fontname == FONT_UP - switch to bigger font
782 * fontname == FONT_DN - switch to smaller font 777 * fontname == FONT_DN - switch to smaller font
783 */ 778 */
… …
795 return false; 790 return false;
796 } 791 }
797 792
798#if ENABLE_STYLES 793#if ENABLE_STYLES
799 for (int i = RS_styleCount; --i; ) 794 for (int i = RS_styleCount; --i; )
800 if (TermWin.fontset[i] != TermWin.fontset[0]) 795 if (fontset[i] != fontset[0])
801 delete TermWin.fontset[i]; 796 delete fontset[i];
802#endif 797#endif
803 798
804 delete TermWin.fontset[0]; 799 delete fontset[0];
805 TermWin.fontset[0] = fs; 800 fontset[0] = fs;
806 801
807 prop = (*fs)[1]->properties (); 802 prop = (*fs)[1]->properties ();
808 prop.height += TermWin.lineSpace; 803 prop.height += lineSpace;
809 fs->set_prop (prop); 804 fs->set_prop (prop);
810 805
811 TermWin.fwidth = prop.width; 806 fwidth = prop.width;
812 TermWin.fheight = prop.height; 807 fheight = prop.height;
813 TermWin.fweight = prop.weight; 808 fbase = prop.ascent;
814 TermWin.fslant = prop.slant;
815 TermWin.fbase = (*fs)[1]->ascent;
816 809
817 for (int style = 1; style < 4; style++) 810 for (int style = 1; style < 4; style++)
818 { 811 {
819#if ENABLE_STYLES 812#if ENABLE_STYLES
820 const char *res = rs[Rs_font + style]; 813 const char *res = rs[Rs_font + style];
821 814
822 if (res && !*res) 815 if (res && !*res)
823 TermWin.fontset[style] = TermWin.fontset[0]; 816 fontset[style] = fontset[0];
824 else 817 else
825 { 818 {
826 TermWin.fontset[style] = fs = new rxvt_fontset (this); 819 fontset[style] = fs = new rxvt_fontset (this);
827 rxvt_fontprop prop2 = prop; 820 rxvt_fontprop prop2 = prop;
828 821
829 if (res) 822 if (res)
830 prop2.weight = prop2.slant = rxvt_fontprop::unset; 823 prop2.weight = prop2.slant = rxvt_fontprop::unset;
831 else 824 else
832 { 825 {
833 res = TermWin.fontset[0]->fontdesc; 826 res = fontset[0]->fontdesc;
834 827
835 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 828 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
836 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 829 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
837 } 830 }
838 831
839 fs->populate (res); 832 fs->populate (res);
840 fs->set_prop (prop2); 833 fs->set_prop (prop2);
841 } 834 }
842#else 835#else
843 TermWin.fontset[style] = TermWin.fontset[0]; 836 fontset[style] = fontset[0];
844#endif 837#endif
845 } 838 }
846 839
847 if (TermWin.parent[0]) 840 if (parent[0])
848 { 841 {
849 resize_all_windows (0, 0, 0); 842 resize_all_windows (0, 0, 0);
850 scr_remap_chars (); 843 scr_remap_chars ();
851 scr_touch (true); 844 scr_touch (true);
852 } 845 }
… …
854 return true; 847 return true;
855} 848}
856 849
857void rxvt_term::set_string_property (Atom prop, const char *str, int len) 850void rxvt_term::set_string_property (Atom prop, const char *str, int len)
858{ 851{
859 // TODO: SMART_WINDOW_TITLE
860 XChangeProperty (display->display, TermWin.parent[0], 852 XChangeProperty (display->display, parent[0],
861 prop, XA_STRING, 8, PropModeReplace, 853 prop, XA_STRING, 8, PropModeReplace,
862 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 854 (const unsigned char *)str, len >= 0 ? len : strlen (str));
863} 855}
864 856
865void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 857void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
866{ 858{
867 // TODO: SMART_WINDOW_TITLE
868 wchar_t *ws = rxvt_mbstowcs (str, len); 859 wchar_t *ws = rxvt_mbstowcs (str, len);
869 char *s = rxvt_wcstoutf8 (ws); 860 char *s = rxvt_wcstoutf8 (ws);
870 861
871 XChangeProperty (display->display, TermWin.parent[0], 862 XChangeProperty (display->display, parent[0],
872 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 863 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
873 (const unsigned char *)s, strlen (s)); 864 (const unsigned char *)s, strlen (s));
874 865
875 free (s); 866 free (s);
876 free (ws); 867 free (ws);
… …
881/* xterm sequences - title, iconName, color (exptl) */ 872/* xterm sequences - title, iconName, color (exptl) */
882void 873void
883rxvt_term::set_title (const char *str) 874rxvt_term::set_title (const char *str)
884{ 875{
885 set_string_property (XA_WM_NAME, str); 876 set_string_property (XA_WM_NAME, str);
886#if ENABLE_FRILLS 877#if ENABLE_EWMH
887 set_utf8_property (xa[XA_NET_WM_NAME], str); 878 set_utf8_property (xa[XA_NET_WM_NAME], str);
888#endif 879#endif
889} 880}
890 881
891void 882void
892rxvt_term::set_icon_name (const char *str) 883rxvt_term::set_icon_name (const char *str)
893{ 884{
894 set_string_property (XA_WM_ICON_NAME, str); 885 set_string_property (XA_WM_ICON_NAME, str);
895#if ENABLE_FRILLS 886#if ENABLE_EWMH
896 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 887 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
897#endif 888#endif
898} 889}
899 890
900#ifdef XTERM_COLOR_CHANGE 891#ifdef XTERM_COLOR_CHANGE
… …
909 900
910 /* handle color aliases */ 901 /* handle color aliases */
911 if (isdigit (*color)) 902 if (isdigit (*color))
912 { 903 {
913 i = atoi (color); 904 i = atoi (color);
905
914 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
915 { /* bright colors */ 907 { /* bright colors */
916 i -= 8; 908 i -= 8;
917# ifndef NO_BRIGHTCOLOR
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
919 SET_PIXCOLOR (idx); 910 SET_PIXCOLOR (idx);
920 goto Done; 911 goto done;
921# endif
922
923 } 912 }
913
924 if (i >= 0 && i <= 7) 914 if (i >= 0 && i <= 7)
925 { /* normal colors */ 915 { /* normal colors */
926 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 916 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
927 SET_PIXCOLOR (idx); 917 SET_PIXCOLOR (idx);
928 goto Done; 918 goto done;
929 } 919 }
930 } 920 }
931 921
932 if (!rXParseAllocColor (& xcol, color)) 922 if (!rXParseAllocColor (&xcol, color))
933 return; 923 return;
934 924
935 /* XStoreColor (display->display, display->cmap, XColor*); */ 925 /* XStoreColor (display->display, display->cmap, XColor*); */
936 926
937 /* 927 /*
… …
953 pix_colors_focused[idx] = xcol; 943 pix_colors_focused[idx] = xcol;
954 SET_PIXCOLOR (idx); 944 SET_PIXCOLOR (idx);
955 945
956 /* XSetWindowAttributes attr; */ 946 /* XSetWindowAttributes attr; */
957 /* Cursor cursor; */ 947 /* Cursor cursor; */
958Done: 948done:
949
959#ifdef OFF_FOCUS_FADING 950#if OFF_FOCUS_FADING
960 if (rs[Rs_fade]) 951 if (rs[Rs_fade])
961 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
962#endif 953#endif
963 954
964 /*TODO: handle Color_BD, scrollbar background, etc. */ 955 /*TODO: handle Color_BD, scrollbar background, etc. */
965 956
966 recolour_cursor (); 957 recolour_cursor ();
… …
1037 1028
1038/* -------------------------------------------------------------------- * 1029/* -------------------------------------------------------------------- *
1039 * - WINDOW RESIZING - * 1030 * - WINDOW RESIZING - *
1040 * -------------------------------------------------------------------- */ 1031 * -------------------------------------------------------------------- */
1041void 1032void
1042rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1033rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1043{ 1034{
1044 int fix_screen; 1035 int fix_screen;
1036 int old_width = szHint.width;
1037 int old_height = szHint.height;
1038 dDisp;
1045 1039
1046#ifdef SMART_RESIZE
1047 int old_width = szHint.width, old_height = szHint.height;
1048#endif
1049
1050 window_calc (width, height); 1040 window_calc (newwidth, newheight);
1051 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1041 XSetWMNormalHints (disp, parent[0], &szHint);
1052 1042
1053 if (!ignoreparent) 1043 if (!ignoreparent)
1054 { 1044 {
1055#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1056 /* 1046 /*
… …
1060 int x, y, x1, y1; 1050 int x, y, x1, y1;
1061 int dx, dy; 1051 int dx, dy;
1062 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1063 Window unused_cr; 1053 Window unused_cr;
1064 1054
1065 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1055 XTranslateCoordinates (disp, parent[0], display->root,
1066 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1067 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1068 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1069 /* 1059 /*
1070 * if display->root isn't the parent window, a WM will probably have offset 1060 * if display->root isn't the parent window, a WM will probably have offset
1071 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1072 */ 1062 */
… …
1074 { 1064 {
1075 x -= x1; 1065 x -= x1;
1076 y -= y1; 1066 y -= y1;
1077 } 1067 }
1078 1068
1079 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1080 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1081 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1082 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1083 1073
1084 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1085 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1086 dx = 0; 1076 dx = 0;
… …
1089 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1090 dy = 0; 1080 dy = 0;
1091 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1092 dy /= 2; 1082 dy /= 2;
1093 1083
1094 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1095 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1096#else 1086#else
1097 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1087 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1098#endif 1088#endif
1099 } 1089 }
1100 1090
1101 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1102 1092
1103 if (fix_screen || width != old_width || height != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1104 { 1094 {
1105 if (scrollbar_visible ()) 1095 if (scrollBar.state)
1106 { 1096 {
1107 XMoveResizeWindow (display->display, scrollBar.win, 1097 XMoveResizeWindow (disp, scrollBar.win,
1108 window_sb_x, 0, 1098 window_sb_x, 0,
1109 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1110 resize_scrollbar (); 1100 resize_scrollbar ();
1111 } 1101 }
1112 1102
1113 if (menubar_visible ())
1114 XMoveResizeWindow (display->display, menuBar.win,
1115 window_vt_x, 0,
1116 TermWin_TotalWidth (), menuBar_TotalHeight ());
1117
1118 XMoveResizeWindow (display->display, TermWin.vt, 1103 XMoveResizeWindow (disp, vt,
1119 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1120 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1105 width, height);
1121 1106
1122 scr_clear (); 1107 scr_clear ();
1123#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1124 resize_pixmap (); 1109 resize_pixmap ();
1125#endif 1110#endif
1126 } 1111 }
1127 1112
1128 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1129 {
1130 int curr_screen = -1;
1131 int old_ncol = prev_ncol;
1132
1133 /* scr_reset only works on the primary screen */
1134 if (old_height) /* this is not the first time through */
1135 {
1136 unsigned int ncol = TermWin.ncol;
1137 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1138 curr_screen = scr_change_screen (PRIMARY);
1139 TermWin.ncol = ncol;
1140 }
1141
1142 scr_reset (); 1114 scr_reset ();
1143
1144 if (curr_screen >= 0) /* this is not the first time through */
1145 {
1146 scr_change_screen (curr_screen);
1147 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1148 }
1149 }
1150
1151 old_width = szHint.width;
1152 old_height = szHint.height;
1153 1115
1154#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1155 if (TermWin.pixmap) 1117 if (pixmap)
1156 scr_touch (false); 1118 scr_touch (false);
1157#endif 1119#endif
1158 1120
1159#ifdef USE_XIM 1121#ifdef USE_XIM
1160 IMSetStatusPosition (); 1122 IMSetStatusPosition ();
… …
1164/* 1126/*
1165 * Set the width/height of the vt window in characters. Units are pixels. 1127 * Set the width/height of the vt window in characters. Units are pixels.
1166 * good for toggling 80/132 columns 1128 * good for toggling 80/132 columns
1167 */ 1129 */
1168void 1130void
1169rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1131rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1170{ 1132{
1171 XWindowAttributes wattr; 1133 XWindowAttributes wattr;
1172 1134
1173 if (width == 0 || height == 0) 1135 if (newwidth == 0 || newheight == 0)
1174 { 1136 {
1175 XGetWindowAttributes (display->display, display->root, &wattr); 1137 XGetWindowAttributes (display->display, display->root, &wattr);
1138
1176 if (width == 0) 1139 if (newwidth == 0)
1177 width = wattr.width - szHint.base_width; 1140 newwidth = wattr.width - szHint.base_width;
1178 if (height == 0) 1141 if (newheight == 0)
1179 height = wattr.height - szHint.base_height; 1142 newheight = wattr.height - szHint.base_height;
1180 }
1181
1182 if (width != TermWin.width || height != TermWin.height)
1183 { 1143 }
1144
1145 if (newwidth != width || newheight != height)
1146 {
1184 width += szHint.base_width; 1147 newwidth += szHint.base_width;
1185 height += szHint.base_height; 1148 newheight += szHint.base_height;
1186 resize_all_windows (width, height, 0); 1149 resize_all_windows (newwidth, newheight, 0);
1187 } 1150 }
1188} 1151}
1189 1152
1190/* -------------------------------------------------------------------- * 1153/* -------------------------------------------------------------------- *
1191 * - X INPUT METHOD ROUTINES - * 1154 * - X INPUT METHOD ROUTINES - *
… …
1201 1164
1202void 1165void
1203rxvt_term::im_set_size (XRectangle &size) 1166rxvt_term::im_set_size (XRectangle &size)
1204{ 1167{
1205 // the int_bwidth terms make no sense to me 1168 // the int_bwidth terms make no sense to me
1206 size.x = TermWin.int_bwidth; 1169 size.x = int_bwidth;
1207 size.y = TermWin.int_bwidth; 1170 size.y = int_bwidth;
1208 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1171 size.width = Width2Pixel (ncol) + int_bwidth;
1209 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1172 size.height = Height2Pixel (nrow) + int_bwidth;
1210} 1173}
1211 1174
1212void 1175void
1213rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1176rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1214 XRectangle &status_rect, 1177 XRectangle &status_rect,
1215 const XRectangle &needed_rect) 1178 const XRectangle &needed_rect)
1216{ 1179{
1217 preedit_rect.x = needed_rect.width; 1180 preedit_rect.x = needed_rect.width;
1218 preedit_rect.y = 0; 1181 preedit_rect.y = 0;
1219 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1182 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1220 preedit_rect.height = TermWin.fheight; 1183 preedit_rect.height = fheight;
1221 1184
1222 status_rect.x = 0; 1185 status_rect.x = 0;
1223 status_rect.y = 0; 1186 status_rect.y = 0;
1224 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1187 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1225 status_rect.height = TermWin.fheight; 1188 status_rect.height = fheight;
1226} 1189}
1227 1190
1228/* Checking whether input method is running. */ 1191/* Checking whether input method is running. */
1229bool 1192bool
1230rxvt_term::IMisRunning () 1193rxvt_term::IMisRunning ()
… …
1258{ 1221{
1259 XPoint nspot; 1222 XPoint nspot;
1260 XVaNestedList preedit_attr; 1223 XVaNestedList preedit_attr;
1261 1224
1262 if (!Input_Context 1225 if (!Input_Context
1263 || !TermWin.focus 1226 || !focus
1264 || !(input_style & XIMPreeditPosition)) 1227 || !(input_style & XIMPreeditPosition))
1265 return; 1228 return;
1266 1229
1267 im_set_position (nspot); 1230 im_set_position (nspot);
1268 1231
… …
1304 XRectangle rect, status_rect, needed_rect; 1267 XRectangle rect, status_rect, needed_rect;
1305 unsigned long fg, bg; 1268 unsigned long fg, bg;
1306 const char *p; 1269 const char *p;
1307 char **s; 1270 char **s;
1308 XIMStyles *xim_styles; 1271 XIMStyles *xim_styles;
1272
1273 set_environ (envv);
1309 1274
1310 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1275 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1311 return false; 1276 return false;
1312 1277
1313 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1278 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1388 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1353 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1389 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1354 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1390 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1355 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1391 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1356 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1392 "*", 1357 "*",
1393 TermWin.fheight, 1358 fheight,
1394 TermWin.fheight + 1, TermWin.fheight - 1, 1359 fheight + 1, fheight - 1,
1395 TermWin.fheight - 2, TermWin.fheight + 2); 1360 fheight - 2, fheight + 2);
1396 1361
1397 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1362 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1398 &missing_charset_list, &missing_charset_count, &def_string); 1363 &missing_charset_list, &missing_charset_count, &def_string);
1399 1364
1400 if (missing_charset_list) 1365 if (missing_charset_list)
… …
1446 NULL); 1411 NULL);
1447 } 1412 }
1448 1413
1449 Input_Context = XCreateIC (xim, 1414 Input_Context = XCreateIC (xim,
1450 XNInputStyle, input_style, 1415 XNInputStyle, input_style,
1451 XNClientWindow, TermWin.vt, 1416 XNClientWindow, vt,
1452 XNFocusWindow, TermWin.parent[0], 1417 XNFocusWindow, parent[0],
1453 preedit_attr ? XNPreeditAttributes : NULL, 1418 preedit_attr ? XNPreeditAttributes : NULL,
1454 preedit_attr, 1419 preedit_attr,
1455 status_attr ? XNStatusAttributes : NULL, 1420 status_attr ? XNStatusAttributes : NULL,
1456 status_attr, NULL); 1421 status_attr, NULL);
1457 1422
… …
1464 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1429 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1465 im_destroy (); 1430 im_destroy ();
1466 return false; 1431 return false;
1467 } 1432 }
1468 1433
1434 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1435 vt_select_input ();
1436
1469 if (input_style & XIMPreeditArea) 1437 if (input_style & XIMPreeditArea)
1470 IMSetStatusPosition (); 1438 IMSetStatusPosition ();
1471 1439
1472 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection")); 1440 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1473 return true; 1441 return true;
1474} 1442}
1475 1443
1476void 1444void
1477rxvt_term::im_cb () 1445rxvt_term::im_cb ()
1478{ 1446{
1479 int i, found, had_im; 1447 int i;
1480 const char *p; 1448 const char *p;
1481 char **s; 1449 char **s;
1482 char buf[IMBUFSIZ]; 1450 char buf[IMBUFSIZ];
1451
1452 make_current ();
1483 1453
1484 im_destroy (); 1454 im_destroy ();
1485 1455
1486 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1456 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1487 if (Input_Context) 1457 if (Input_Context)
… …
1539{ 1509{
1540 XRectangle preedit_rect, status_rect, *needed_rect; 1510 XRectangle preedit_rect, status_rect, *needed_rect;
1541 XVaNestedList preedit_attr, status_attr; 1511 XVaNestedList preedit_attr, status_attr;
1542 1512
1543 if (!Input_Context 1513 if (!Input_Context
1544 || !TermWin.focus 1514 || !focus
1545 || !(input_style & XIMPreeditArea) 1515 || !(input_style & XIMPreeditArea)
1546 || !IMisRunning ()) 1516 || !IMisRunning ())
1547 return; 1517 return;
1548 1518
1549 /* Getting the necessary width of preedit area */ 1519 /* Getting the necessary width of preedit area */
… …
1564 XFree (preedit_attr); 1534 XFree (preedit_attr);
1565 XFree (status_attr); 1535 XFree (status_attr);
1566} 1536}
1567#endif /* USE_XIM */ 1537#endif /* USE_XIM */
1568 1538
1569/*----------------------------------------------------------------------*/
1570rxvt_t rxvt_current_term;
1571
1572/*----------------------- end-of-file (C source) -----------------------*/ 1539/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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