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.134 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.199 by root, Tue Jan 24 19:40:12 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
186// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
187// for use before an emergency exit 197// for use before an emergency exit
188void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
189{ 199{
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);
195#endif
196
197 pty.put ();
198} 204}
199 205
200rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
201{ 207{
202 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
203 209
204 emergency_cleanup (); 210 emergency_cleanup ();
205 211
206#if ENABLE_STYLES 212#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; ) 213 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0]) 214 if (fontset[i] != fontset[0])
209 delete TermWin.fontset[i]; 215 delete fontset[i];
210#endif 216#endif
211 delete TermWin.fontset[0]; 217 delete fontset[0];
212 218
213 if (display) 219 if (display)
214 { 220 {
215 dDisp; 221 dDisp;
216 222
217 selection_clear (); 223 selection_clear ();
218 224
219#ifdef USE_XIM 225#ifdef USE_XIM
220 im_destroy (); 226 im_destroy ();
221#endif
222#ifdef MENUBAR
223 if (menubarGC) XFreeGC (disp, menubarGC);
224#endif 227#endif
225#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
228#endif 231#endif
… …
239 if (upArrow) XFreePixmap (disp, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
243#endif 246#endif
244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
248#endif 251#endif
249 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 252 if (gc) XFreeGC (disp, gc);
250 253
251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252 delete menuBar.drawable; 254 delete drawable;
253 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win);
255#endif
256 delete TermWin.drawable;
257 // destroy all windows 255 // destroy all windows
258 if (TermWin.parent[0]) 256 if (parent[0])
259 XDestroyWindow (disp, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
260 } 258 }
261 259
262 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
263
264 delete pix_colors_focused; 261 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
266 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
267#endif 264#endif
268 265
269 displays.put (display); 266 displays.put (display);
270 267
… …
290#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
291 delete keyboard; 288 delete keyboard;
292#endif 289#endif
293} 290}
294 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 ();
302}
303
295void 304void
296rxvt_term::destroy () 305rxvt_term::destroy ()
297{ 306{
298 if (destroy_ev.active) 307 if (destroy_ev.active)
299 return; 308 return;
300 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
301#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
302 scr_overlay_off (); 314 scr_overlay_off ();
303#endif 315#endif
304 316
305 if (display) 317 if (display)
… …
307#if USE_XIM 319#if USE_XIM
308 im_ev.stop (display); 320 im_ev.stop (display);
309#endif 321#endif
310#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
311 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
312#endif
313#if MENUBAR
314 menubar_ev.stop (display);
315#endif 324#endif
316#if TRANSPARENT 325#if TRANSPARENT
317 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
318#endif 327#endif
319 incr_ev.stop (); 328 incr_ev.stop ();
… …
343} 352}
344 353
345void 354void
346rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
347{ 356{
348 SET_R (this); 357 make_current ();
349 358
350 delete this; 359 delete this;
351} 360}
352 361
353/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
… …
362{ 371{
363 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++)
364 (*t)->emergency_cleanup (); 373 (*t)->emergency_cleanup ();
365} 374}
366 375
376#if ENABLE_FRILLS
377static void
378print_x_error (Display *dpy, XErrorEvent *event)
379{
380 char buffer[BUFSIZ];
381 char mesg[BUFSIZ];
382 char number[32];
383 char *mtype = "XlibMessage";
384 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
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);
422}
423#endif
424
367int 425int
368rxvt_xerror_handler (Display *display, XErrorEvent *event) 426rxvt_xerror_handler (Display *display, XErrorEvent *event)
369{ 427{
370 if (GET_R->allowedxerror == -1) 428 if (GET_R->allowedxerror == -1)
371 GET_R->allowedxerror = event->error_code; 429 GET_R->allowedxerror = event->error_code;
372 else 430 else
373 { 431 {
374 //TODO: GET_R is most likely not the terminal which caused the error 432 // GET_R is most likely not the terminal which caused the error,
375 //TODO: maybe just output the error and continue? 433 // so just output the error and continue
434#if ENABLE_FRILLS
435 print_x_error (display, event);
436#else
376 old_xerror_handler (display, event); 437 old_xerror_handler (display, event);
377 GET_R->destroy (); 438#endif
378 } 439 }
379 440
380 return 0; 441 return 0;
381} 442}
382 443
… …
387 DisplayString (display)); 448 DisplayString (display));
388 rxvt_emergency_cleanup (); 449 rxvt_emergency_cleanup ();
389 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
390} 451}
391 452
392/*
393 * Catch a fatal signal and tidy up before quitting
394 */
395void
396rxvt_term::sig_term (sig_watcher &w)
397{
398#ifdef DEBUG_CMD
399 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
400#endif
401 rxvt_emergency_cleanup ();
402 signal (w.signum, SIG_DFL);
403 kill (getpid (), w.signum);
404}
405
406/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
407/* rxvt_init () */
408bool 454bool
409rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
410{ 456{
457 this->envv = envv;
458
411 SET_R (this); 459 SET_R (this);
412
413 set_locale (""); 460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
414 462
415 if (!init_vars ()) 463 if (!init_vars ())
416 return false; 464 return false;
417 465
418 init_secondary (); 466 init_secondary ();
… …
421 469
422#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
423 keyboard->register_done (); 471 keyboard->register_done ();
424#endif 472#endif
425 473
426#if MENUBAR_MAX
427 menubar_read (rs[Rs_menu]);
428#endif
429#ifdef HAVE_SCROLLBARS 474#ifdef HAVE_SCROLLBARS
430 if (options & Opt_scrollBar) 475 if (OPTION (Opt_scrollBar))
431 scrollBar.setIdle (); /* set existence for size calculations */ 476 scrollBar.setIdle (); /* set existence for size calculations */
432#endif 477#endif
433 478
479 pty = ptytty::create ();
480
434 create_windows (argc, argv); 481 create_windows (argc, argv);
435 482
436 dDisp; 483 dDisp;
437 484
438 init_xlocale (); 485 init_xlocale ();
439 486
440 scr_reset (); /* initialize screen */ 487 scr_reset (); // initialize screen
441 488
442#if 0 489#if 0
443 XSynchronize (disp, True); 490 XSynchronize (disp, True);
444#endif 491#endif
445 492
446#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
447 if (options & Opt_scrollBar) 494 if (OPTION (Opt_scrollBar))
448 resize_scrollbar (); /* create and map scrollbar */ 495 resize_scrollbar (); /* create and map scrollbar */
449#endif 496#endif
450#if (MENUBAR_MAX)
451 if (menubar_visible ())
452 XMapWindow (disp, menuBar.win);
453#endif
454#ifdef TRANSPARENT 497#ifdef TRANSPARENT
455 if (options & Opt_transparent) 498 if (OPTION (Opt_transparent))
456 { 499 {
457 XSelectInput (disp, display->root, PropertyChangeMask); 500 XSelectInput (disp, display->root, PropertyChangeMask);
458 check_our_parents (); 501 check_our_parents ();
459 rootwin_ev.start (display, display->root); 502 rootwin_ev.start (display, display->root);
460 } 503 }
461#endif 504#endif
462 505
463 XMapWindow (disp, TermWin.vt);
464 XMapWindow (disp, TermWin.parent[0]);
465
466 set_colorfgbg (); 506 set_colorfgbg ();
467 507
468 init_command (cmd_argv); 508 init_command (cmd_argv);
469 509
470 free (cmd_argv); 510 free (cmd_argv);
471 511
512 if (pty->pty >= 0)
472 pty_ev.start (pty.pty, EVENT_READ); 513 pty_ev.start (pty->pty, EVENT_READ);
473 514
474 check_ev.start (); 515 check_ev.start ();
475 516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
519 XMapWindow (disp, vt);
520 XMapWindow (disp, parent[0]);
521
476 return true; 522 return true;
477} 523}
478 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 rxvt_emergency_cleanup ();
536 signal (w.signum, SIG_DFL);
537 kill (getpid (), w.signum);
538 }
539
540 sig_handlers ()
541 : sw_term (this, &sig_handlers::sig_term),
542 sw_int (this, &sig_handlers::sig_term)
543 {
544 }
545} sig_handlers;
546
547char **rxvt_environ; // startup environment
548
479void 549void
480rxvt_init () 550rxvt_init ()
481{ 551{
482 /* 552 ptytty::init ();
483 * Save and then give up any super-user privileges 553
484 * If we need privileges in any area then we must specifically request it. 554 rxvt_environ = environ;
485 * We should only need to be root in these cases:
486 * 1. write utmp entries on some systems
487 * 2. chown tty on some systems
488 */
489 rxvt_privileges (SAVE);
490 rxvt_privileges (IGNORE);
491 555
492 signal (SIGHUP, SIG_IGN); 556 signal (SIGHUP, SIG_IGN);
493 signal (SIGPIPE, SIG_IGN); 557 signal (SIGPIPE, SIG_IGN);
558
559 sig_handlers.sw_term.start (SIGTERM);
560 sig_handlers.sw_int.start (SIGINT);
494 561
495 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 562 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
496 /* signal (SIGURG, SIG_DFL); */ 563 /* signal (SIGURG, SIG_DFL); */
497 564
498 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 565 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
499 // TODO: handle this with exceptions and tolerate the memory loss 566 // TODO: handle this with exceptions and tolerate the memory loss
500 XSetIOErrorHandler (rxvt_xioerror_handler); 567 XSetIOErrorHandler (rxvt_xioerror_handler);
501}
502 568
503/* ------------------------------------------------------------------------- * 569 XrmInitialize ();
504 * SIGNAL HANDLING & EXIT HANDLER *
505 * ------------------------------------------------------------------------- */
506/*
507 * Catch a SIGCHLD signal and exit if the direct child has died
508 */
509
510void
511rxvt_term::sig_chld (sig_watcher &w)
512{
513 // we are being called for every SIGCHLD, not just ours
514 int pid;
515
516 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
517 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
518 if (pid == (*t)->cmd_pid)
519 {
520 (*t)->destroy ();
521 break;
522 }
523} 570}
524 571
525/* ------------------------------------------------------------------------- * 572/* ------------------------------------------------------------------------- *
526 * MEMORY ALLOCATION WRAPPERS * 573 * MEMORY ALLOCATION WRAPPERS *
527 * ------------------------------------------------------------------------- */ 574 * ------------------------------------------------------------------------- */
… …
534 rxvt_fatal ("memory allocation failure. aborting.\n"); 581 rxvt_fatal ("memory allocation failure. aborting.\n");
535 582
536 return p; 583 return p;
537} 584}
538 585
539/* INTPROTO */ 586void *
540void *
541rxvt_calloc (size_t number, size_t size) 587rxvt_calloc (size_t number, size_t size)
542{ 588{
543 void *p = calloc (number, size); 589 void *p = calloc (number, size);
544 590
545 if (!p) 591 if (!p)
546 rxvt_fatal ("memory allocation failure. aborting.\n"); 592 rxvt_fatal ("memory allocation failure. aborting.\n");
547 593
548 return p; 594 return p;
549} 595}
550 596
551/* INTPROTO */ 597void *
552void *
553rxvt_realloc (void *ptr, size_t size) 598rxvt_realloc (void *ptr, size_t size)
554{ 599{
555 void *p = realloc (ptr, size); 600 void *p = realloc (ptr, size);
556 601
557 if (!p) 602 if (!p)
558 rxvt_fatal ("memory allocation failure. aborting.\n"); 603 rxvt_fatal ("memory allocation failure. aborting.\n");
559 604
560 return p; 605 return p;
561} 606}
562
563/* ------------------------------------------------------------------------- *
564 * PRIVILEGED OPERATIONS *
565 * ------------------------------------------------------------------------- */
566/* take care of suid/sgid super-user (root) privileges */
567void
568rxvt_privileges (rxvt_privaction action)
569{
570#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
571 static uid_t euid;
572 static gid_t egid;
573#endif
574
575#if ! defined(__CYGWIN32__)
576# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
577 /* setreuid () is the poor man's setuid (), seteuid () */
578# define seteuid(a) setreuid(-1, (a))
579# define setegid(a) setregid(-1, (a))
580# define HAVE_SETEUID
581# endif
582# ifdef HAVE_SETEUID
583 switch (action)
584 {
585 case IGNORE:
586 /*
587 * change effective uid/gid - not real uid/gid - so we can switch
588 * back to root later, as required
589 */
590 seteuid (getuid ());
591 setegid (getgid ());
592 break;
593 case SAVE:
594 euid = geteuid ();
595 egid = getegid ();
596 break;
597 case RESTORE:
598 seteuid (euid);
599 setegid (egid);
600 break;
601 }
602# else
603 switch (action)
604 {
605 case IGNORE:
606 setuid (getuid ());
607 setgid (getgid ());
608 /* FALLTHROUGH */
609 case SAVE:
610 /* FALLTHROUGH */
611 case RESTORE:
612 break;
613 }
614# endif
615#endif
616}
617
618#ifdef UTMP_SUPPORT
619void
620rxvt_term::privileged_utmp (rxvt_privaction action)
621{
622 if ((options & Opt_utmpInhibit)
623 || !pty.name || !*pty.name)
624 return;
625
626 rxvt_privileges (RESTORE);
627
628 if (action == SAVE)
629 makeutent (pty.name, rs[Rs_display_name]);
630 else
631 cleanutent ();
632
633 rxvt_privileges (IGNORE);
634}
635#endif
636 607
637/*----------------------------------------------------------------------*/ 608/*----------------------------------------------------------------------*/
638/* 609/*
639 * window size/position calculcations for XSizeHint and other storage. 610 * window size/position calculcations for XSizeHint and other storage.
640 * if width/height are non-zero then override calculated width/height 611 * if width/height are non-zero then override calculated width/height
641 */ 612 */
642void 613void
643rxvt_term::window_calc (unsigned int width, unsigned int height) 614rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
644{ 615{
645 short recalc_x, recalc_y; 616 short recalc_x, recalc_y;
646 int x, y, sb_w, mb_h, flags; 617 int x, y, sb_w, flags;
647 unsigned int w, h; 618 unsigned int w, h;
648 unsigned int max_width, max_height; 619 unsigned int max_width, max_height;
649 dDisp; 620 dDisp;
650 621
651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
652 TermWin.ncol, TermWin.nrow, szHint.width,
653 szHint.height));
654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
655 szHint.win_gravity = NorthWestGravity; 623 szHint.win_gravity = NorthWestGravity;
656 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
657 625
658 recalc_x = recalc_y = 0; 626 recalc_x = recalc_y = 0;
659 flags = 0; 627 flags = 0;
628
660 if (!parsed_geometry) 629 if (!parsed_geometry)
661 { 630 {
662 parsed_geometry = 1; 631 parsed_geometry = 1;
632
663 if (rs[Rs_geometry]) 633 if (rs[Rs_geometry])
664 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 634 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
635
665 if (flags & WidthValue) 636 if (flags & WidthValue)
666 { 637 {
667 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 638 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
668 szHint.flags |= USSize; 639 szHint.flags |= USSize;
669 } 640 }
641
670 if (flags & HeightValue) 642 if (flags & HeightValue)
671 { 643 {
672 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 644 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 645 szHint.flags |= USSize;
674 } 646 }
647
675 if (flags & XValue) 648 if (flags & XValue)
676 { 649 {
677 szHint.x = x; 650 szHint.x = x;
678 szHint.flags |= USPosition; 651 szHint.flags |= USPosition;
652
679 if (flags & XNegative) 653 if (flags & XNegative)
680 { 654 {
681 recalc_x = 1; 655 recalc_x = 1;
682 szHint.win_gravity = NorthEastGravity; 656 szHint.win_gravity = NorthEastGravity;
683 } 657 }
684 } 658 }
659
685 if (flags & YValue) 660 if (flags & YValue)
686 { 661 {
687 szHint.y = y; 662 szHint.y = y;
688 szHint.flags |= USPosition; 663 szHint.flags |= USPosition;
664
689 if (flags & YNegative) 665 if (flags & YNegative)
690 { 666 {
691 recalc_y = 1; 667 recalc_y = 1;
668
692 if (szHint.win_gravity == NorthEastGravity) 669 if (szHint.win_gravity == NorthEastGravity)
693 szHint.win_gravity = SouthEastGravity; 670 szHint.win_gravity = SouthEastGravity;
694 else 671 else
695 szHint.win_gravity = SouthWestGravity; 672 szHint.win_gravity = SouthWestGravity;
696 } 673 }
697 } 674 }
698 } 675 }
699 676
700 /* TODO: BOUNDS */ 677 /* TODO: BOUNDS */
701 TermWin.width = TermWin.ncol * TermWin.fwidth; 678 width = ncol * fwidth;
702 TermWin.height = TermWin.nrow * TermWin.fheight; 679 height = nrow * fheight;
703 max_width = MAX_COLS * TermWin.fwidth; 680 max_width = MAX_COLS * fwidth;
704 max_height = MAX_ROWS * TermWin.fheight; 681 max_height = MAX_ROWS * fheight;
705 682
706 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 683 szHint.base_width = szHint.base_height = 2 * int_bwidth;
707 684
708 sb_w = mb_h = 0; 685 sb_w = 0;
709 window_vt_x = window_vt_y = TermWin.int_bwidth; 686 window_vt_x = window_vt_y = int_bwidth;
710 687
711 if (scrollbar_visible ()) 688 if (scrollBar.state)
712 { 689 {
713 sb_w = scrollbar_TotalWidth (); 690 sb_w = scrollbar_TotalWidth ();
714 szHint.base_width += sb_w; 691 szHint.base_width += sb_w;
715 if (!(options & Opt_scrollBar_right)) 692 if (!OPTION (Opt_scrollBar_right))
716 window_vt_x += sb_w; 693 window_vt_x += sb_w;
717 } 694 }
718 695
719 if (menubar_visible ())
720 {
721 mb_h = menuBar_TotalHeight ();
722 szHint.base_height += mb_h;
723 window_vt_y += mb_h;
724 }
725
726 szHint.width_inc = TermWin.fwidth; 696 szHint.width_inc = fwidth;
727 szHint.height_inc = TermWin.fheight; 697 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 698 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 699 szHint.min_height = szHint.base_height + szHint.height_inc;
730 700
731 if (width && width - szHint.base_width < max_width) 701 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 702 {
733 szHint.width = width; 703 szHint.width = newwidth;
734 TermWin.width = width - szHint.base_width; 704 width = newwidth - szHint.base_width;
735 } 705 }
736 else 706 else
737 { 707 {
738 MIN_IT (TermWin.width, max_width); 708 min_it (width, max_width);
739 szHint.width = szHint.base_width + TermWin.width; 709 szHint.width = szHint.base_width + width;
740 } 710 }
741 711
742 if (height && height - szHint.base_height < max_height) 712 if (newheight && newheight - szHint.base_height < max_height)
743 { 713 {
744 szHint.height = height; 714 szHint.height = newheight;
745 TermWin.height = height - szHint.base_height; 715 height = newheight - szHint.base_height;
746 } 716 }
747 else 717 else
748 { 718 {
749 MIN_IT (TermWin.height, max_height); 719 min_it (height, max_height);
750 szHint.height = szHint.base_height + TermWin.height; 720 szHint.height = szHint.base_height + height;
751 } 721 }
752 722
753 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 723 if (scrollBar.state && OPTION (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 724 window_sb_x = szHint.width - sb_w;
755 725
756 if (recalc_x) 726 if (recalc_x)
757 szHint.x += (DisplayWidth (disp, display->screen) 727 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
758 - szHint.width - 2 * TermWin.ext_bwidth);
759 if (recalc_y) 728 if (recalc_y)
760 szHint.y += (DisplayHeight (disp, display->screen) 729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
761 - szHint.height - 2 * TermWin.ext_bwidth);
762 730
763 TermWin.ncol = TermWin.width / TermWin.fwidth; 731 ncol = width / fwidth;
764 TermWin.nrow = TermWin.height / TermWin.fheight; 732 nrow = height / fheight;
765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
766 TermWin.ncol, TermWin.nrow, szHint.width,
767 szHint.height));
768 return;
769} 733}
770 734
771/*----------------------------------------------------------------------*/ 735/*----------------------------------------------------------------------*/
772/* 736/*
773 * Tell the teletype handler what size the window is. 737 * Tell the teletype handler what size the window is.
774 * Called after a window size change. 738 * Called after a window size change.
775 */ 739 */
776void 740void
777rxvt_term::tt_winch () 741rxvt_term::tt_winch ()
778{ 742{
779 if (pty.pty < 0) 743 if (pty->pty < 0)
780 return; 744 return;
781 745
782 struct winsize ws; 746 struct winsize ws;
783 747
784 ws.ws_col = TermWin.ncol; 748 ws.ws_col = ncol;
785 ws.ws_row = TermWin.nrow; 749 ws.ws_row = nrow;
786 ws.ws_xpixel = TermWin.width; 750 ws.ws_xpixel = width;
787 ws.ws_ypixel = TermWin.height; 751 ws.ws_ypixel = height;
788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 752 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
789 753
790#if 0 754#if 0
791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 755 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 756 if (cmd_pid) /* force through to the command */
793 kill (cmd_pid, SIGWINCH); 757 kill (-cmd_pid, SIGWINCH);
794#endif 758#endif
795} 759}
796 760
797/*----------------------------------------------------------------------*/ 761/*----------------------------------------------------------------------*/
798/* set_fonts () - load and set the various fonts 762/* set_fonts () - load and set the various fonts
799/* 763 *
800 * init = 1 - initialize 764 * init = 1 - initialize
801 * 765 *
802 * fontname == FONT_UP - switch to bigger font 766 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font 767 * fontname == FONT_DN - switch to smaller font
804 */ 768 */
… …
816 return false; 780 return false;
817 } 781 }
818 782
819#if ENABLE_STYLES 783#if ENABLE_STYLES
820 for (int i = RS_styleCount; --i; ) 784 for (int i = RS_styleCount; --i; )
821 if (TermWin.fontset[i] != TermWin.fontset[0]) 785 if (fontset[i] != fontset[0])
822 delete TermWin.fontset[i]; 786 delete fontset[i];
823#endif 787#endif
824 788
825 delete TermWin.fontset[0]; 789 delete fontset[0];
826 TermWin.fontset[0] = fs; 790 fontset[0] = fs;
827 791
828 prop = (*fs)[1]->properties (); 792 prop = (*fs)[1]->properties ();
829 prop.height += TermWin.lineSpace; 793 prop.height += lineSpace;
830 fs->set_prop (prop); 794 fs->set_prop (prop);
831 795
832 TermWin.fwidth = prop.width; 796 fwidth = prop.width;
833 TermWin.fheight = prop.height; 797 fheight = prop.height;
834 TermWin.fweight = prop.weight; 798 fbase = prop.ascent;
835 TermWin.fslant = prop.slant;
836 TermWin.fbase = (*fs)[1]->ascent;
837 799
838 for (int style = 1; style < 4; style++) 800 for (int style = 1; style < 4; style++)
839 { 801 {
840#if ENABLE_STYLES 802#if ENABLE_STYLES
841 const char *res = rs[Rs_font + style]; 803 const char *res = rs[Rs_font + style];
842 804
843 if (res && !*res) 805 if (res && !*res)
844 TermWin.fontset[style] = TermWin.fontset[0]; 806 fontset[style] = fontset[0];
845 else 807 else
846 { 808 {
847 TermWin.fontset[style] = fs = new rxvt_fontset (this); 809 fontset[style] = fs = new rxvt_fontset (this);
848 rxvt_fontprop prop2 = prop; 810 rxvt_fontprop prop2 = prop;
849 811
850 if (res) 812 if (res)
851 prop2.weight = prop2.slant = rxvt_fontprop::unset; 813 prop2.weight = prop2.slant = rxvt_fontprop::unset;
852 else 814 else
853 { 815 {
854 res = TermWin.fontset[0]->fontdesc; 816 res = fontset[0]->fontdesc;
855 817
856 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 818 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
857 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 819 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
858 } 820 }
859 821
860 fs->populate (res); 822 fs->populate (res);
861 fs->set_prop (prop2); 823 fs->set_prop (prop2);
862 } 824 }
863#else 825#else
864 TermWin.fontset[style] = TermWin.fontset[0]; 826 fontset[style] = fontset[0];
865#endif 827#endif
866 } 828 }
867 829
868 if (TermWin.parent[0]) 830 if (parent[0])
869 { 831 {
870 resize_all_windows (0, 0, 0); 832 resize_all_windows (0, 0, 0);
871 scr_remap_chars (); 833 scr_remap_chars ();
872 scr_touch (true); 834 scr_touch (true);
873 } 835 }
… …
875 return true; 837 return true;
876} 838}
877 839
878void rxvt_term::set_string_property (Atom prop, const char *str, int len) 840void rxvt_term::set_string_property (Atom prop, const char *str, int len)
879{ 841{
880 // TODO: SMART_WINDOW_TITLE
881 XChangeProperty (display->display, TermWin.parent[0], 842 XChangeProperty (display->display, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 843 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 844 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 845}
885 846
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 847void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 848{
888 // TODO: SMART_WINDOW_TITLE
889 wchar_t *ws = rxvt_mbstowcs (str, len); 849 wchar_t *ws = rxvt_mbstowcs (str, len);
890 char *s = rxvt_wcstoutf8 (ws); 850 char *s = rxvt_wcstoutf8 (ws);
891 851
892 XChangeProperty (display->display, TermWin.parent[0], 852 XChangeProperty (display->display, parent[0],
893 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
894 (const unsigned char *)s, strlen (s)); 854 (const unsigned char *)s, strlen (s));
895 855
896 free (s); 856 free (s);
897 free (ws); 857 free (ws);
… …
902/* xterm sequences - title, iconName, color (exptl) */ 862/* xterm sequences - title, iconName, color (exptl) */
903void 863void
904rxvt_term::set_title (const char *str) 864rxvt_term::set_title (const char *str)
905{ 865{
906 set_string_property (XA_WM_NAME, str); 866 set_string_property (XA_WM_NAME, str);
907#if ENABLE_FRILLS 867#if ENABLE_EWMH
908 set_utf8_property (xa[XA_NET_WM_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_NAME], str);
909#endif 869#endif
910} 870}
911 871
912void 872void
913rxvt_term::set_icon_name (const char *str) 873rxvt_term::set_icon_name (const char *str)
914{ 874{
915 set_string_property (XA_WM_ICON_NAME, str); 875 set_string_property (XA_WM_ICON_NAME, str);
916#if ENABLE_FRILLS 876#if ENABLE_EWMH
917 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
918#endif 878#endif
919} 879}
920 880
921#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
… …
934 i = atoi (color); 894 i = atoi (color);
935 895
936 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
937 { /* bright colors */ 897 { /* bright colors */
938 i -= 8; 898 i -= 8;
939# ifndef NO_BRIGHTCOLOR
940 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
941 SET_PIXCOLOR (idx); 900 SET_PIXCOLOR (idx);
942 goto Done; 901 goto done;
943# endif
944 } 902 }
945 903
946 if (i >= 0 && i <= 7) 904 if (i >= 0 && i <= 7)
947 { /* normal colors */ 905 { /* normal colors */
948 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
949 SET_PIXCOLOR (idx); 907 SET_PIXCOLOR (idx);
950 goto Done; 908 goto done;
951 } 909 }
952 } 910 }
953 911
954 if (!rXParseAllocColor (&xcol, color)) 912 if (!rXParseAllocColor (&xcol, color))
955 return; 913 return;
… …
975 pix_colors_focused[idx] = xcol; 933 pix_colors_focused[idx] = xcol;
976 SET_PIXCOLOR (idx); 934 SET_PIXCOLOR (idx);
977 935
978 /* XSetWindowAttributes attr; */ 936 /* XSetWindowAttributes attr; */
979 /* Cursor cursor; */ 937 /* Cursor cursor; */
980Done: 938done:
939
981#ifdef OFF_FOCUS_FADING 940#if OFF_FOCUS_FADING
982 if (rs[Rs_fade]) 941 if (rs[Rs_fade])
983 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 942 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
984#endif 943#endif
985 944
986 /*TODO: handle Color_BD, scrollbar background, etc. */ 945 /*TODO: handle Color_BD, scrollbar background, etc. */
987 946
988 recolour_cursor (); 947 recolour_cursor ();
… …
1059 1018
1060/* -------------------------------------------------------------------- * 1019/* -------------------------------------------------------------------- *
1061 * - WINDOW RESIZING - * 1020 * - WINDOW RESIZING - *
1062 * -------------------------------------------------------------------- */ 1021 * -------------------------------------------------------------------- */
1063void 1022void
1064rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1065{ 1024{
1066 int fix_screen; 1025 int fix_screen;
1067#ifdef SMART_RESIZE 1026 int old_width = szHint.width;
1068 int old_width = szHint.width, old_height = szHint.height; 1027 int old_height = szHint.height;
1069#endif
1070 dDisp; 1028 dDisp;
1071 1029
1072 window_calc (width, height); 1030 window_calc (newwidth, newheight);
1073 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1031 XSetWMNormalHints (disp, parent[0], &szHint);
1074 1032
1075 if (!ignoreparent) 1033 if (!ignoreparent)
1076 { 1034 {
1077#ifdef SMART_RESIZE 1035#ifdef SMART_RESIZE
1078 /* 1036 /*
… …
1082 int x, y, x1, y1; 1040 int x, y, x1, y1;
1083 int dx, dy; 1041 int dx, dy;
1084 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1042 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1085 Window unused_cr; 1043 Window unused_cr;
1086 1044
1087 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1045 XTranslateCoordinates (disp, parent[0], display->root,
1088 0, 0, &x, &y, &unused_cr); 1046 0, 0, &x, &y, &unused_cr);
1089 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1047 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1090 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1048 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1091 /* 1049 /*
1092 * if display->root isn't the parent window, a WM will probably have offset 1050 * if display->root isn't the parent window, a WM will probably have offset
1093 * our position for handles and decorations. Counter it 1051 * our position for handles and decorations. Counter it
1094 */ 1052 */
… …
1096 { 1054 {
1097 x -= x1; 1055 x -= x1;
1098 y -= y1; 1056 y -= y1;
1099 } 1057 }
1100 1058
1101 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1102 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1103 dx = old_width - szHint.width; 1061 dx = old_width - szHint.width;
1104 dy = old_height - szHint.height; 1062 dy = old_height - szHint.height;
1105 1063
1106 /* Check position of the center of the window */ 1064 /* Check position of the center of the window */
1107 if (x < x1) /* left half */ 1065 if (x < x1) /* left half */
1108 dx = 0; 1066 dx = 0;
… …
1111 if (y < y1) /* top half */ 1069 if (y < y1) /* top half */
1112 dy = 0; 1070 dy = 0;
1113 else if (y == y1) /* exact center */ 1071 else if (y == y1) /* exact center */
1114 dy /= 2; 1072 dy /= 2;
1115 1073
1116 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1074 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1117 szHint.width, szHint.height); 1075 szHint.width, szHint.height);
1118#else 1076#else
1119 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1077 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1120#endif 1078#endif
1121 } 1079 }
1122 1080
1123 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1081 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1124 1082
1125 if (fix_screen || width != old_width || height != old_height) 1083 if (fix_screen || newwidth != old_width || newheight != old_height)
1126 { 1084 {
1127 if (scrollbar_visible ()) 1085 if (scrollBar.state)
1128 { 1086 {
1129 XMoveResizeWindow (disp, scrollBar.win, 1087 XMoveResizeWindow (disp, scrollBar.win,
1130 window_sb_x, 0, 1088 window_sb_x, 0,
1131 scrollbar_TotalWidth (), szHint.height); 1089 scrollbar_TotalWidth (), szHint.height);
1132 resize_scrollbar (); 1090 resize_scrollbar ();
1133 } 1091 }
1134 1092
1135 if (menubar_visible ())
1136 XMoveResizeWindow (disp, menuBar.win,
1137 window_vt_x, 0,
1138 TermWin_TotalWidth (), menuBar_TotalHeight ());
1139
1140 XMoveResizeWindow (disp, TermWin.vt, 1093 XMoveResizeWindow (disp, vt,
1141 window_vt_x, window_vt_y, 1094 window_vt_x, window_vt_y,
1142 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1095 width, height);
1143 1096
1144 scr_clear (); 1097 scr_clear ();
1145#ifdef XPM_BACKGROUND 1098#ifdef XPM_BACKGROUND
1146 resize_pixmap (); 1099 resize_pixmap ();
1147#endif 1100#endif
1148 } 1101 }
1149 1102
1150 if (fix_screen || old_height == 0) 1103 if (fix_screen || old_height == 0)
1151 {
1152 int curr_screen = -1;
1153 int old_ncol = prev_ncol;
1154
1155 /* scr_reset only works on the primary screen */
1156 if (old_height) /* this is not the first time through */
1157 {
1158 unsigned int ncol = TermWin.ncol;
1159 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1160 curr_screen = scr_change_screen (PRIMARY);
1161 TermWin.ncol = ncol;
1162 }
1163
1164 scr_reset (); 1104 scr_reset ();
1165
1166 if (curr_screen >= 0) /* this is not the first time through */
1167 {
1168 scr_change_screen (curr_screen);
1169 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1170 }
1171 }
1172
1173 old_width = szHint.width;
1174 old_height = szHint.height;
1175 1105
1176#ifdef XPM_BACKGROUND 1106#ifdef XPM_BACKGROUND
1177 if (TermWin.pixmap) 1107 if (pixmap)
1178 scr_touch (false); 1108 scr_touch (false);
1179#endif 1109#endif
1180 1110
1181#ifdef USE_XIM 1111#ifdef USE_XIM
1182 IMSetStatusPosition (); 1112 IMSetStatusPosition ();
… …
1186/* 1116/*
1187 * Set the width/height of the vt window in characters. Units are pixels. 1117 * Set the width/height of the vt window in characters. Units are pixels.
1188 * good for toggling 80/132 columns 1118 * good for toggling 80/132 columns
1189 */ 1119 */
1190void 1120void
1191rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1121rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1192{ 1122{
1193 XWindowAttributes wattr; 1123 XWindowAttributes wattr;
1194 1124
1195 if (width == 0 || height == 0) 1125 if (newwidth == 0 || newheight == 0)
1196 { 1126 {
1197 XGetWindowAttributes (display->display, display->root, &wattr); 1127 XGetWindowAttributes (display->display, display->root, &wattr);
1128
1198 if (width == 0) 1129 if (newwidth == 0)
1199 width = wattr.width - szHint.base_width; 1130 newwidth = wattr.width - szHint.base_width;
1200 if (height == 0) 1131 if (newheight == 0)
1201 height = wattr.height - szHint.base_height; 1132 newheight = wattr.height - szHint.base_height;
1202 }
1203
1204 if (width != TermWin.width || height != TermWin.height)
1205 { 1133 }
1134
1135 if (newwidth != width || newheight != height)
1136 {
1206 width += szHint.base_width; 1137 newwidth += szHint.base_width;
1207 height += szHint.base_height; 1138 newheight += szHint.base_height;
1208 resize_all_windows (width, height, 0); 1139 resize_all_windows (newwidth, newheight, 0);
1209 } 1140 }
1210} 1141}
1211 1142
1212/* -------------------------------------------------------------------- * 1143/* -------------------------------------------------------------------- *
1213 * - X INPUT METHOD ROUTINES - * 1144 * - X INPUT METHOD ROUTINES - *
… …
1223 1154
1224void 1155void
1225rxvt_term::im_set_size (XRectangle &size) 1156rxvt_term::im_set_size (XRectangle &size)
1226{ 1157{
1227 // the int_bwidth terms make no sense to me 1158 // the int_bwidth terms make no sense to me
1228 size.x = TermWin.int_bwidth; 1159 size.x = int_bwidth;
1229 size.y = TermWin.int_bwidth; 1160 size.y = int_bwidth;
1230 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1161 size.width = Width2Pixel (ncol) + int_bwidth;
1231 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1162 size.height = Height2Pixel (nrow) + int_bwidth;
1232} 1163}
1233 1164
1234void 1165void
1235rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1166rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1236 XRectangle &status_rect, 1167 XRectangle &status_rect,
1237 const XRectangle &needed_rect) 1168 const XRectangle &needed_rect)
1238{ 1169{
1239 preedit_rect.x = needed_rect.width; 1170 preedit_rect.x = needed_rect.width;
1240 preedit_rect.y = 0; 1171 preedit_rect.y = 0;
1241 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1172 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1242 preedit_rect.height = TermWin.fheight; 1173 preedit_rect.height = fheight;
1243 1174
1244 status_rect.x = 0; 1175 status_rect.x = 0;
1245 status_rect.y = 0; 1176 status_rect.y = 0;
1246 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1177 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1247 status_rect.height = TermWin.fheight; 1178 status_rect.height = fheight;
1248} 1179}
1249 1180
1250/* Checking whether input method is running. */ 1181/* Checking whether input method is running. */
1251bool 1182bool
1252rxvt_term::IMisRunning () 1183rxvt_term::IMisRunning ()
… …
1280{ 1211{
1281 XPoint nspot; 1212 XPoint nspot;
1282 XVaNestedList preedit_attr; 1213 XVaNestedList preedit_attr;
1283 1214
1284 if (!Input_Context 1215 if (!Input_Context
1285 || !TermWin.focus 1216 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1217 || !(input_style & XIMPreeditPosition))
1287 return; 1218 return;
1288 1219
1289 im_set_position (nspot); 1220 im_set_position (nspot);
1290 1221
… …
1327 unsigned long fg, bg; 1258 unsigned long fg, bg;
1328 const char *p; 1259 const char *p;
1329 char **s; 1260 char **s;
1330 XIMStyles *xim_styles; 1261 XIMStyles *xim_styles;
1331 1262
1263 set_environ (envv);
1264
1332 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1333 return false; 1266 return false;
1334 1267
1335 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1336 input_method = display->get_xim (locale, modifiers); 1268 input_method = display->get_xim (locale, modifiers);
1337 if (input_method == NULL) 1269 if (input_method == NULL)
1338 return false; 1270 return false;
1339 1271
1340 xim = input_method->xim; 1272 xim = input_method->xim;
… …
1410 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1342 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1411 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1343 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1412 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1344 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1413 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1345 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1414 "*", 1346 "*",
1415 TermWin.fheight, 1347 fheight,
1416 TermWin.fheight + 1, TermWin.fheight - 1, 1348 fheight + 1, fheight - 1,
1417 TermWin.fheight - 2, TermWin.fheight + 2); 1349 fheight - 2, fheight + 2);
1418 1350
1419 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1351 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1420 &missing_charset_list, &missing_charset_count, &def_string); 1352 &missing_charset_list, &missing_charset_count, &def_string);
1421 1353
1422 if (missing_charset_list) 1354 if (missing_charset_list)
… …
1468 NULL); 1400 NULL);
1469 } 1401 }
1470 1402
1471 Input_Context = XCreateIC (xim, 1403 Input_Context = XCreateIC (xim,
1472 XNInputStyle, input_style, 1404 XNInputStyle, input_style,
1473 XNClientWindow, TermWin.vt, 1405 XNClientWindow, vt,
1474 XNFocusWindow, TermWin.parent[0], 1406 XNFocusWindow, parent[0],
1475 preedit_attr ? XNPreeditAttributes : NULL, 1407 preedit_attr ? XNPreeditAttributes : NULL,
1476 preedit_attr, 1408 preedit_attr,
1477 status_attr ? XNStatusAttributes : NULL, 1409 status_attr ? XNStatusAttributes : NULL,
1478 status_attr, NULL); 1410 status_attr, NULL);
1479 1411
… …
1486 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1418 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1487 im_destroy (); 1419 im_destroy ();
1488 return false; 1420 return false;
1489 } 1421 }
1490 1422
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input ();
1425
1491 if (input_style & XIMPreeditArea) 1426 if (input_style & XIMPreeditArea)
1492 IMSetStatusPosition (); 1427 IMSetStatusPosition ();
1493 1428
1494 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1495 return true; 1429 return true;
1496} 1430}
1497 1431
1498void 1432void
1499rxvt_term::im_cb () 1433rxvt_term::im_cb ()
1500{ 1434{
1501 int i, found, had_im; 1435 int i;
1502 const char *p; 1436 const char *p;
1503 char **s; 1437 char **s;
1504 char buf[IMBUFSIZ]; 1438 char buf[IMBUFSIZ];
1505 1439
1440 make_current ();
1441
1506 im_destroy (); 1442 im_destroy ();
1507 1443
1508 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1509 if (Input_Context) 1444 if (Input_Context)
1510 return; 1445 return;
1511 1446
1512#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1447#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1513 if (rs[Rs_imLocale]) 1448 if (rs[Rs_imLocale])
… …
1561{ 1496{
1562 XRectangle preedit_rect, status_rect, *needed_rect; 1497 XRectangle preedit_rect, status_rect, *needed_rect;
1563 XVaNestedList preedit_attr, status_attr; 1498 XVaNestedList preedit_attr, status_attr;
1564 1499
1565 if (!Input_Context 1500 if (!Input_Context
1566 || !TermWin.focus 1501 || !focus
1567 || !(input_style & XIMPreeditArea) 1502 || !(input_style & XIMPreeditArea)
1568 || !IMisRunning ()) 1503 || !IMisRunning ())
1569 return; 1504 return;
1570 1505
1571 /* Getting the necessary width of preedit area */ 1506 /* Getting the necessary width of preedit area */
… …
1586 XFree (preedit_attr); 1521 XFree (preedit_attr);
1587 XFree (status_attr); 1522 XFree (status_attr);
1588} 1523}
1589#endif /* USE_XIM */ 1524#endif /* USE_XIM */
1590 1525
1591/*----------------------------------------------------------------------*/
1592rxvt_t rxvt_current_term;
1593
1594/*----------------------- end-of-file (C source) -----------------------*/ 1526/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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