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.203 by root, Wed Jan 25 02:42:06 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 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311
301#if ENABLE_OVERLAY 312#if ENABLE_OVERLAY
302 scr_overlay_off (); 313 scr_overlay_off ();
303#endif 314#endif
304 315
305 if (display) 316 if (display)
… …
307#if USE_XIM 318#if USE_XIM
308 im_ev.stop (display); 319 im_ev.stop (display);
309#endif 320#endif
310#if HAVE_SCROLLBARS 321#if HAVE_SCROLLBARS
311 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
312#endif
313#if MENUBAR
314 menubar_ev.stop (display);
315#endif 323#endif
316#if TRANSPARENT 324#if TRANSPARENT
317 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
318#endif 326#endif
319 incr_ev.stop (); 327 incr_ev.stop ();
… …
343} 351}
344 352
345void 353void
346rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (time_watcher &w)
347{ 355{
348 SET_R (this); 356 make_current ();
349 357
350 delete this; 358 delete this;
351} 359}
352 360
353/*----------------------------------------------------------------------*/ 361/*----------------------------------------------------------------------*/
… …
362{ 370{
363 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364 (*t)->emergency_cleanup (); 372 (*t)->emergency_cleanup ();
365} 373}
366 374
375#if ENABLE_FRILLS
376static void
377print_x_error (Display *dpy, XErrorEvent *event)
378{
379 char buffer[BUFSIZ];
380 char mesg[BUFSIZ];
381 char number[32];
382 char *mtype = "XlibMessage";
383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 rxvt_warn ("An X Error occured, trying to continue after report.\n");
386 rxvt_warn ("%s: %s\n", mesg, buffer);
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389 sprintf(number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer);
392 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 }
397 if ((event->error_code == BadWindow) ||
398 (event->error_code == BadPixmap) ||
399 (event->error_code == BadCursor) ||
400 (event->error_code == BadFont) ||
401 (event->error_code == BadDrawable) ||
402 (event->error_code == BadColor) ||
403 (event->error_code == BadGC) ||
404 (event->error_code == BadIDChoice) ||
405 (event->error_code == BadValue) ||
406 (event->error_code == BadAtom)) {
407 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412 mesg, BUFSIZ);
413 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421}
422#endif
423
367int 424int
368rxvt_xerror_handler (Display *display, XErrorEvent *event) 425rxvt_xerror_handler (Display *display, XErrorEvent *event)
369{ 426{
370 if (GET_R->allowedxerror == -1) 427 if (GET_R->allowedxerror == -1)
371 GET_R->allowedxerror = event->error_code; 428 GET_R->allowedxerror = event->error_code;
372 else 429 else
373 { 430 {
374 //TODO: GET_R is most likely not the terminal which caused the error 431 // GET_R is most likely not the terminal which caused the error,
375 //TODO: maybe just output the error and continue? 432 // so just output the error and continue
433#if ENABLE_FRILLS
434 print_x_error (display, event);
435#else
376 old_xerror_handler (display, event); 436 old_xerror_handler (display, event);
377 GET_R->destroy (); 437#endif
378 } 438 }
379 439
380 return 0; 440 return 0;
381} 441}
382 442
… …
387 DisplayString (display)); 447 DisplayString (display));
388 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
389 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
390} 450}
391 451
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/*----------------------------------------------------------------------*/ 452/*----------------------------------------------------------------------*/
407/* rxvt_init () */
408bool 453bool
409rxvt_term::init (int argc, const char *const *argv) 454rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
410{ 455{
456 this->envv = envv;
457
411 SET_R (this); 458 SET_R (this);
412
413 set_locale (""); 459 set_locale ("");
460 set_environ (envv); // few things in X do not call setlocale :(
414 461
415 if (!init_vars ()) 462 if (!init_vars ())
416 return false; 463 return false;
417 464
418 init_secondary (); 465 init_secondary ();
… …
421 468
422#ifdef KEYSYM_RESOURCE 469#ifdef KEYSYM_RESOURCE
423 keyboard->register_done (); 470 keyboard->register_done ();
424#endif 471#endif
425 472
426#if MENUBAR_MAX
427 menubar_read (rs[Rs_menu]);
428#endif
429#ifdef HAVE_SCROLLBARS 473#ifdef HAVE_SCROLLBARS
430 if (options & Opt_scrollBar) 474 if (OPTION (Opt_scrollBar))
431 scrollBar.setIdle (); /* set existence for size calculations */ 475 scrollBar.setIdle (); /* set existence for size calculations */
432#endif 476#endif
433 477
478 pty = ptytty::create ();
479
434 create_windows (argc, argv); 480 create_windows (argc, argv);
435 481
436 dDisp; 482 dDisp;
437 483
438 init_xlocale (); 484 init_xlocale ();
439 485
440 scr_reset (); /* initialize screen */ 486 scr_reset (); // initialize screen
441 487
442#if 0 488#if 0
443 XSynchronize (disp, True); 489 XSynchronize (disp, True);
444#endif 490#endif
445 491
446#ifdef HAVE_SCROLLBARS 492#ifdef HAVE_SCROLLBARS
447 if (options & Opt_scrollBar) 493 if (OPTION (Opt_scrollBar))
448 resize_scrollbar (); /* create and map scrollbar */ 494 resize_scrollbar (); /* create and map scrollbar */
449#endif 495#endif
450#if (MENUBAR_MAX)
451 if (menubar_visible ())
452 XMapWindow (disp, menuBar.win);
453#endif
454#ifdef TRANSPARENT 496#ifdef TRANSPARENT
455 if (options & Opt_transparent) 497 if (OPTION (Opt_transparent))
456 { 498 {
457 XSelectInput (disp, display->root, PropertyChangeMask); 499 XSelectInput (disp, display->root, PropertyChangeMask);
458 check_our_parents (); 500 check_our_parents ();
459 rootwin_ev.start (display, display->root); 501 rootwin_ev.start (display, display->root);
460 } 502 }
461#endif 503#endif
462 504
463 XMapWindow (disp, TermWin.vt);
464 XMapWindow (disp, TermWin.parent[0]);
465
466 set_colorfgbg (); 505 set_colorfgbg ();
467 506
468 init_command (cmd_argv); 507 init_command (cmd_argv);
469 508
470 free (cmd_argv); 509 free (cmd_argv);
471 510
511 if (pty->pty >= 0)
472 pty_ev.start (pty.pty, EVENT_READ); 512 pty_ev.start (pty->pty, EVENT_READ);
473 513
474 check_ev.start (); 514 check_ev.start ();
475 515
516 HOOK_INVOKE ((this, HOOK_START, DT_END));
517
518#if ENABLE_XEMBED
519 if (rs[Rs_embed])
520 {
521 long info[2] = { 0, XEMBED_MAPPED };
522
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2);
525 }
526#endif
527
528 XMapWindow (disp, vt);
529 XMapWindow (disp, parent[0]);
530
476 return true; 531 return true;
477} 532}
478 533
534static struct sig_handlers
535{
536 sig_watcher sw_term, sw_int;
537
538 /*
539 * Catch a fatal signal and tidy up before quitting
540 */
541 void
542 sig_term (sig_watcher &w)
543 {
544 rxvt_emergency_cleanup ();
545 signal (w.signum, SIG_DFL);
546 kill (getpid (), w.signum);
547 }
548
549 sig_handlers ()
550 : sw_term (this, &sig_handlers::sig_term),
551 sw_int (this, &sig_handlers::sig_term)
552 {
553 }
554} sig_handlers;
555
556char **rxvt_environ; // startup environment
557
479void 558void
480rxvt_init () 559rxvt_init ()
481{ 560{
482 /* 561 ptytty::init ();
483 * Save and then give up any super-user privileges 562
484 * If we need privileges in any area then we must specifically request it. 563 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 564
492 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
493 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
567
568 sig_handlers.sw_term.start (SIGTERM);
569 sig_handlers.sw_int.start (SIGINT);
494 570
495 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 571 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
496 /* signal (SIGURG, SIG_DFL); */ 572 /* signal (SIGURG, SIG_DFL); */
497 573
498 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
499 // TODO: handle this with exceptions and tolerate the memory loss 575 // TODO: handle this with exceptions and tolerate the memory loss
500 XSetIOErrorHandler (rxvt_xioerror_handler); 576 XSetIOErrorHandler (rxvt_xioerror_handler);
501}
502 577
503/* ------------------------------------------------------------------------- * 578 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} 579}
524 580
525/* ------------------------------------------------------------------------- * 581/* ------------------------------------------------------------------------- *
526 * MEMORY ALLOCATION WRAPPERS * 582 * MEMORY ALLOCATION WRAPPERS *
527 * ------------------------------------------------------------------------- */ 583 * ------------------------------------------------------------------------- */
… …
534 rxvt_fatal ("memory allocation failure. aborting.\n"); 590 rxvt_fatal ("memory allocation failure. aborting.\n");
535 591
536 return p; 592 return p;
537} 593}
538 594
539/* INTPROTO */ 595void *
540void *
541rxvt_calloc (size_t number, size_t size) 596rxvt_calloc (size_t number, size_t size)
542{ 597{
543 void *p = calloc (number, size); 598 void *p = calloc (number, size);
544 599
545 if (!p) 600 if (!p)
546 rxvt_fatal ("memory allocation failure. aborting.\n"); 601 rxvt_fatal ("memory allocation failure. aborting.\n");
547 602
548 return p; 603 return p;
549} 604}
550 605
551/* INTPROTO */ 606void *
552void *
553rxvt_realloc (void *ptr, size_t size) 607rxvt_realloc (void *ptr, size_t size)
554{ 608{
555 void *p = realloc (ptr, size); 609 void *p = realloc (ptr, size);
556 610
557 if (!p) 611 if (!p)
558 rxvt_fatal ("memory allocation failure. aborting.\n"); 612 rxvt_fatal ("memory allocation failure. aborting.\n");
559 613
560 return p; 614 return p;
561} 615}
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 616
637/*----------------------------------------------------------------------*/ 617/*----------------------------------------------------------------------*/
638/* 618/*
639 * window size/position calculcations for XSizeHint and other storage. 619 * window size/position calculcations for XSizeHint and other storage.
640 * if width/height are non-zero then override calculated width/height 620 * if width/height are non-zero then override calculated width/height
641 */ 621 */
642void 622void
643rxvt_term::window_calc (unsigned int width, unsigned int height) 623rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
644{ 624{
645 short recalc_x, recalc_y; 625 short recalc_x, recalc_y;
646 int x, y, sb_w, mb_h, flags; 626 int x, y, sb_w, flags;
647 unsigned int w, h; 627 unsigned int w, h;
648 unsigned int max_width, max_height; 628 unsigned int max_width, max_height;
649 dDisp; 629 dDisp;
650 630
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; 631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
655 szHint.win_gravity = NorthWestGravity; 632 szHint.win_gravity = NorthWestGravity;
656 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
657 634
658 recalc_x = recalc_y = 0; 635 recalc_x = recalc_y = 0;
659 flags = 0; 636 flags = 0;
637
660 if (!parsed_geometry) 638 if (!parsed_geometry)
661 { 639 {
662 parsed_geometry = 1; 640 parsed_geometry = 1;
641
663 if (rs[Rs_geometry]) 642 if (rs[Rs_geometry])
664 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
644
665 if (flags & WidthValue) 645 if (flags & WidthValue)
666 { 646 {
667 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 647 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
668 szHint.flags |= USSize; 648 szHint.flags |= USSize;
669 } 649 }
650
670 if (flags & HeightValue) 651 if (flags & HeightValue)
671 { 652 {
672 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 653 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 654 szHint.flags |= USSize;
674 } 655 }
656
675 if (flags & XValue) 657 if (flags & XValue)
676 { 658 {
677 szHint.x = x; 659 szHint.x = x;
678 szHint.flags |= USPosition; 660 szHint.flags |= USPosition;
661
679 if (flags & XNegative) 662 if (flags & XNegative)
680 { 663 {
681 recalc_x = 1; 664 recalc_x = 1;
682 szHint.win_gravity = NorthEastGravity; 665 szHint.win_gravity = NorthEastGravity;
683 } 666 }
684 } 667 }
668
685 if (flags & YValue) 669 if (flags & YValue)
686 { 670 {
687 szHint.y = y; 671 szHint.y = y;
688 szHint.flags |= USPosition; 672 szHint.flags |= USPosition;
673
689 if (flags & YNegative) 674 if (flags & YNegative)
690 { 675 {
691 recalc_y = 1; 676 recalc_y = 1;
677
692 if (szHint.win_gravity == NorthEastGravity) 678 if (szHint.win_gravity == NorthEastGravity)
693 szHint.win_gravity = SouthEastGravity; 679 szHint.win_gravity = SouthEastGravity;
694 else 680 else
695 szHint.win_gravity = SouthWestGravity; 681 szHint.win_gravity = SouthWestGravity;
696 } 682 }
697 } 683 }
698 } 684 }
699 685
700 /* TODO: BOUNDS */ 686 /* TODO: BOUNDS */
701 TermWin.width = TermWin.ncol * TermWin.fwidth; 687 width = ncol * fwidth;
702 TermWin.height = TermWin.nrow * TermWin.fheight; 688 height = nrow * fheight;
703 max_width = MAX_COLS * TermWin.fwidth; 689 max_width = MAX_COLS * fwidth;
704 max_height = MAX_ROWS * TermWin.fheight; 690 max_height = MAX_ROWS * fheight;
705 691
706 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 692 szHint.base_width = szHint.base_height = 2 * int_bwidth;
707 693
708 sb_w = mb_h = 0; 694 sb_w = 0;
709 window_vt_x = window_vt_y = TermWin.int_bwidth; 695 window_vt_x = window_vt_y = int_bwidth;
710 696
711 if (scrollbar_visible ()) 697 if (scrollBar.state)
712 { 698 {
713 sb_w = scrollbar_TotalWidth (); 699 sb_w = scrollbar_TotalWidth ();
714 szHint.base_width += sb_w; 700 szHint.base_width += sb_w;
715 if (!(options & Opt_scrollBar_right)) 701 if (!OPTION (Opt_scrollBar_right))
716 window_vt_x += sb_w; 702 window_vt_x += sb_w;
717 } 703 }
718 704
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; 705 szHint.width_inc = fwidth;
727 szHint.height_inc = TermWin.fheight; 706 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 707 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 708 szHint.min_height = szHint.base_height + szHint.height_inc;
730 709
731 if (width && width - szHint.base_width < max_width) 710 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 711 {
733 szHint.width = width; 712 szHint.width = newwidth;
734 TermWin.width = width - szHint.base_width; 713 width = newwidth - szHint.base_width;
735 } 714 }
736 else 715 else
737 { 716 {
738 MIN_IT (TermWin.width, max_width); 717 min_it (width, max_width);
739 szHint.width = szHint.base_width + TermWin.width; 718 szHint.width = szHint.base_width + width;
740 } 719 }
741 720
742 if (height && height - szHint.base_height < max_height) 721 if (newheight && newheight - szHint.base_height < max_height)
743 { 722 {
744 szHint.height = height; 723 szHint.height = newheight;
745 TermWin.height = height - szHint.base_height; 724 height = newheight - szHint.base_height;
746 } 725 }
747 else 726 else
748 { 727 {
749 MIN_IT (TermWin.height, max_height); 728 min_it (height, max_height);
750 szHint.height = szHint.base_height + TermWin.height; 729 szHint.height = szHint.base_height + height;
751 } 730 }
752 731
753 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 732 if (scrollBar.state && OPTION (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 733 window_sb_x = szHint.width - sb_w;
755 734
756 if (recalc_x) 735 if (recalc_x)
757 szHint.x += (DisplayWidth (disp, display->screen) 736 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
758 - szHint.width - 2 * TermWin.ext_bwidth);
759 if (recalc_y) 737 if (recalc_y)
760 szHint.y += (DisplayHeight (disp, display->screen) 738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
761 - szHint.height - 2 * TermWin.ext_bwidth);
762 739
763 TermWin.ncol = TermWin.width / TermWin.fwidth; 740 ncol = width / fwidth;
764 TermWin.nrow = TermWin.height / TermWin.fheight; 741 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} 742}
770 743
771/*----------------------------------------------------------------------*/ 744/*----------------------------------------------------------------------*/
772/* 745/*
773 * Tell the teletype handler what size the window is. 746 * Tell the teletype handler what size the window is.
774 * Called after a window size change. 747 * Called after a window size change.
775 */ 748 */
776void 749void
777rxvt_term::tt_winch () 750rxvt_term::tt_winch ()
778{ 751{
779 if (pty.pty < 0) 752 if (pty->pty < 0)
780 return; 753 return;
781 754
782 struct winsize ws; 755 struct winsize ws;
783 756
784 ws.ws_col = TermWin.ncol; 757 ws.ws_col = ncol;
785 ws.ws_row = TermWin.nrow; 758 ws.ws_row = nrow;
786 ws.ws_xpixel = TermWin.width; 759 ws.ws_xpixel = width;
787 ws.ws_ypixel = TermWin.height; 760 ws.ws_ypixel = height;
788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 761 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
789 762
790#if 0 763#if 0
791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 764 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 765 if (cmd_pid) /* force through to the command */
793 kill (cmd_pid, SIGWINCH); 766 kill (-cmd_pid, SIGWINCH);
794#endif 767#endif
795} 768}
796 769
797/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
798/* set_fonts () - load and set the various fonts 771/* set_fonts () - load and set the various fonts
799/* 772 *
800 * init = 1 - initialize 773 * init = 1 - initialize
801 * 774 *
802 * fontname == FONT_UP - switch to bigger font 775 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font 776 * fontname == FONT_DN - switch to smaller font
804 */ 777 */
… …
816 return false; 789 return false;
817 } 790 }
818 791
819#if ENABLE_STYLES 792#if ENABLE_STYLES
820 for (int i = RS_styleCount; --i; ) 793 for (int i = RS_styleCount; --i; )
821 if (TermWin.fontset[i] != TermWin.fontset[0]) 794 if (fontset[i] != fontset[0])
822 delete TermWin.fontset[i]; 795 delete fontset[i];
823#endif 796#endif
824 797
825 delete TermWin.fontset[0]; 798 delete fontset[0];
826 TermWin.fontset[0] = fs; 799 fontset[0] = fs;
827 800
828 prop = (*fs)[1]->properties (); 801 prop = (*fs)[1]->properties ();
829 prop.height += TermWin.lineSpace; 802 prop.height += lineSpace;
830 fs->set_prop (prop); 803 fs->set_prop (prop);
831 804
832 TermWin.fwidth = prop.width; 805 fwidth = prop.width;
833 TermWin.fheight = prop.height; 806 fheight = prop.height;
834 TermWin.fweight = prop.weight; 807 fbase = prop.ascent;
835 TermWin.fslant = prop.slant;
836 TermWin.fbase = (*fs)[1]->ascent;
837 808
838 for (int style = 1; style < 4; style++) 809 for (int style = 1; style < 4; style++)
839 { 810 {
840#if ENABLE_STYLES 811#if ENABLE_STYLES
841 const char *res = rs[Rs_font + style]; 812 const char *res = rs[Rs_font + style];
842 813
843 if (res && !*res) 814 if (res && !*res)
844 TermWin.fontset[style] = TermWin.fontset[0]; 815 fontset[style] = fontset[0];
845 else 816 else
846 { 817 {
847 TermWin.fontset[style] = fs = new rxvt_fontset (this); 818 fontset[style] = fs = new rxvt_fontset (this);
848 rxvt_fontprop prop2 = prop; 819 rxvt_fontprop prop2 = prop;
849 820
850 if (res) 821 if (res)
851 prop2.weight = prop2.slant = rxvt_fontprop::unset; 822 prop2.weight = prop2.slant = rxvt_fontprop::unset;
852 else 823 else
853 { 824 {
854 res = TermWin.fontset[0]->fontdesc; 825 res = fontset[0]->fontdesc;
855 826
856 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 827 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; 828 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
858 } 829 }
859 830
860 fs->populate (res); 831 fs->populate (res);
861 fs->set_prop (prop2); 832 fs->set_prop (prop2);
862 } 833 }
863#else 834#else
864 TermWin.fontset[style] = TermWin.fontset[0]; 835 fontset[style] = fontset[0];
865#endif 836#endif
866 } 837 }
867 838
868 if (TermWin.parent[0]) 839 if (parent[0])
869 { 840 {
870 resize_all_windows (0, 0, 0); 841 resize_all_windows (0, 0, 0);
871 scr_remap_chars (); 842 scr_remap_chars ();
872 scr_touch (true); 843 scr_touch (true);
873 } 844 }
… …
875 return true; 846 return true;
876} 847}
877 848
878void rxvt_term::set_string_property (Atom prop, const char *str, int len) 849void rxvt_term::set_string_property (Atom prop, const char *str, int len)
879{ 850{
880 // TODO: SMART_WINDOW_TITLE
881 XChangeProperty (display->display, TermWin.parent[0], 851 XChangeProperty (display->display, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 852 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 853 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 854}
885 855
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 856void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 857{
888 // TODO: SMART_WINDOW_TITLE
889 wchar_t *ws = rxvt_mbstowcs (str, len); 858 wchar_t *ws = rxvt_mbstowcs (str, len);
890 char *s = rxvt_wcstoutf8 (ws); 859 char *s = rxvt_wcstoutf8 (ws);
891 860
892 XChangeProperty (display->display, TermWin.parent[0], 861 XChangeProperty (display->display, parent[0],
893 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 862 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
894 (const unsigned char *)s, strlen (s)); 863 (const unsigned char *)s, strlen (s));
895 864
896 free (s); 865 free (s);
897 free (ws); 866 free (ws);
… …
902/* xterm sequences - title, iconName, color (exptl) */ 871/* xterm sequences - title, iconName, color (exptl) */
903void 872void
904rxvt_term::set_title (const char *str) 873rxvt_term::set_title (const char *str)
905{ 874{
906 set_string_property (XA_WM_NAME, str); 875 set_string_property (XA_WM_NAME, str);
907#if ENABLE_FRILLS 876#if ENABLE_EWMH
908 set_utf8_property (xa[XA_NET_WM_NAME], str); 877 set_utf8_property (xa[XA_NET_WM_NAME], str);
909#endif 878#endif
910} 879}
911 880
912void 881void
913rxvt_term::set_icon_name (const char *str) 882rxvt_term::set_icon_name (const char *str)
914{ 883{
915 set_string_property (XA_WM_ICON_NAME, str); 884 set_string_property (XA_WM_ICON_NAME, str);
916#if ENABLE_FRILLS 885#if ENABLE_EWMH
917 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 886 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
918#endif 887#endif
919} 888}
920 889
921#ifdef XTERM_COLOR_CHANGE 890#ifdef XTERM_COLOR_CHANGE
… …
934 i = atoi (color); 903 i = atoi (color);
935 904
936 if (i >= 8 && i <= 15) 905 if (i >= 8 && i <= 15)
937 { /* bright colors */ 906 { /* bright colors */
938 i -= 8; 907 i -= 8;
939# ifndef NO_BRIGHTCOLOR
940 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
941 SET_PIXCOLOR (idx); 909 SET_PIXCOLOR (idx);
942 goto Done; 910 goto done;
943# endif
944 } 911 }
945 912
946 if (i >= 0 && i <= 7) 913 if (i >= 0 && i <= 7)
947 { /* normal colors */ 914 { /* normal colors */
948 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
949 SET_PIXCOLOR (idx); 916 SET_PIXCOLOR (idx);
950 goto Done; 917 goto done;
951 } 918 }
952 } 919 }
953 920
954 if (!rXParseAllocColor (&xcol, color)) 921 if (!rXParseAllocColor (&xcol, color))
955 return; 922 return;
… …
975 pix_colors_focused[idx] = xcol; 942 pix_colors_focused[idx] = xcol;
976 SET_PIXCOLOR (idx); 943 SET_PIXCOLOR (idx);
977 944
978 /* XSetWindowAttributes attr; */ 945 /* XSetWindowAttributes attr; */
979 /* Cursor cursor; */ 946 /* Cursor cursor; */
980Done: 947done:
948
981#ifdef OFF_FOCUS_FADING 949#if OFF_FOCUS_FADING
982 if (rs[Rs_fade]) 950 if (rs[Rs_fade])
983 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 951 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
984#endif 952#endif
985 953
986 /*TODO: handle Color_BD, scrollbar background, etc. */ 954 /*TODO: handle Color_BD, scrollbar background, etc. */
987 955
988 recolour_cursor (); 956 recolour_cursor ();
… …
1059 1027
1060/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1061 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1062 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1063void 1031void
1064rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1065{ 1033{
1066 int fix_screen; 1034 int fix_screen;
1067#ifdef SMART_RESIZE 1035 int old_width = szHint.width;
1068 int old_width = szHint.width, old_height = szHint.height; 1036 int old_height = szHint.height;
1069#endif
1070 dDisp; 1037 dDisp;
1071 1038
1072 window_calc (width, height); 1039 window_calc (newwidth, newheight);
1073 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1040 XSetWMNormalHints (disp, parent[0], &szHint);
1074 1041
1075 if (!ignoreparent) 1042 if (!ignoreparent)
1076 { 1043 {
1077#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1078 /* 1045 /*
… …
1082 int x, y, x1, y1; 1049 int x, y, x1, y1;
1083 int dx, dy; 1050 int dx, dy;
1084 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1085 Window unused_cr; 1052 Window unused_cr;
1086 1053
1087 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1054 XTranslateCoordinates (disp, parent[0], display->root,
1088 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1089 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1090 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1091 /* 1058 /*
1092 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1093 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1094 */ 1061 */
… …
1096 { 1063 {
1097 x -= x1; 1064 x -= x1;
1098 y -= y1; 1065 y -= y1;
1099 } 1066 }
1100 1067
1101 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1102 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1103 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1104 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1105 1072
1106 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1107 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1108 dx = 0; 1075 dx = 0;
… …
1111 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1112 dy = 0; 1079 dy = 0;
1113 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1114 dy /= 2; 1081 dy /= 2;
1115 1082
1116 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1117 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1118#else 1085#else
1119 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1120#endif 1087#endif
1121 } 1088 }
1122 1089
1123 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1124 1091
1125 if (fix_screen || width != old_width || height != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1126 { 1093 {
1127 if (scrollbar_visible ()) 1094 if (scrollBar.state)
1128 { 1095 {
1129 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (disp, scrollBar.win,
1130 window_sb_x, 0, 1097 window_sb_x, 0,
1131 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1132 resize_scrollbar (); 1099 resize_scrollbar ();
1133 } 1100 }
1134 1101
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, 1102 XMoveResizeWindow (disp, vt,
1141 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1142 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1104 width, height);
1143 1105
1144 scr_clear (); 1106 scr_clear ();
1145#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1146 resize_pixmap (); 1108 resize_pixmap ();
1147#endif 1109#endif
1148 } 1110 }
1149 1111
1150 if (fix_screen || old_height == 0) 1112 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 (); 1113 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 1114
1176#ifdef XPM_BACKGROUND 1115#ifdef XPM_BACKGROUND
1177 if (TermWin.pixmap) 1116 if (pixmap)
1178 scr_touch (false); 1117 scr_touch (false);
1179#endif 1118#endif
1180 1119
1181#ifdef USE_XIM 1120#ifdef USE_XIM
1182 IMSetStatusPosition (); 1121 IMSetStatusPosition ();
… …
1186/* 1125/*
1187 * Set the width/height of the vt window in characters. Units are pixels. 1126 * Set the width/height of the vt window in characters. Units are pixels.
1188 * good for toggling 80/132 columns 1127 * good for toggling 80/132 columns
1189 */ 1128 */
1190void 1129void
1191rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1130rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1192{ 1131{
1193 XWindowAttributes wattr; 1132 XWindowAttributes wattr;
1194 1133
1195 if (width == 0 || height == 0) 1134 if (newwidth == 0 || newheight == 0)
1196 { 1135 {
1197 XGetWindowAttributes (display->display, display->root, &wattr); 1136 XGetWindowAttributes (display->display, display->root, &wattr);
1137
1198 if (width == 0) 1138 if (newwidth == 0)
1199 width = wattr.width - szHint.base_width; 1139 newwidth = wattr.width - szHint.base_width;
1200 if (height == 0) 1140 if (newheight == 0)
1201 height = wattr.height - szHint.base_height; 1141 newheight = wattr.height - szHint.base_height;
1202 }
1203
1204 if (width != TermWin.width || height != TermWin.height)
1205 { 1142 }
1143
1144 if (newwidth != width || newheight != height)
1145 {
1206 width += szHint.base_width; 1146 newwidth += szHint.base_width;
1207 height += szHint.base_height; 1147 newheight += szHint.base_height;
1208 resize_all_windows (width, height, 0); 1148 resize_all_windows (newwidth, newheight, 0);
1209 } 1149 }
1210} 1150}
1211 1151
1212/* -------------------------------------------------------------------- * 1152/* -------------------------------------------------------------------- *
1213 * - X INPUT METHOD ROUTINES - * 1153 * - X INPUT METHOD ROUTINES - *
… …
1223 1163
1224void 1164void
1225rxvt_term::im_set_size (XRectangle &size) 1165rxvt_term::im_set_size (XRectangle &size)
1226{ 1166{
1227 // the int_bwidth terms make no sense to me 1167 // the int_bwidth terms make no sense to me
1228 size.x = TermWin.int_bwidth; 1168 size.x = int_bwidth;
1229 size.y = TermWin.int_bwidth; 1169 size.y = int_bwidth;
1230 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1170 size.width = Width2Pixel (ncol) + int_bwidth;
1231 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1171 size.height = Height2Pixel (nrow) + int_bwidth;
1232} 1172}
1233 1173
1234void 1174void
1235rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1175rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1236 XRectangle &status_rect, 1176 XRectangle &status_rect,
1237 const XRectangle &needed_rect) 1177 const XRectangle &needed_rect)
1238{ 1178{
1239 preedit_rect.x = needed_rect.width; 1179 preedit_rect.x = needed_rect.width;
1240 preedit_rect.y = 0; 1180 preedit_rect.y = 0;
1241 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1181 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1242 preedit_rect.height = TermWin.fheight; 1182 preedit_rect.height = fheight;
1243 1183
1244 status_rect.x = 0; 1184 status_rect.x = 0;
1245 status_rect.y = 0; 1185 status_rect.y = 0;
1246 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1186 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1247 status_rect.height = TermWin.fheight; 1187 status_rect.height = fheight;
1248} 1188}
1249 1189
1250/* Checking whether input method is running. */ 1190/* Checking whether input method is running. */
1251bool 1191bool
1252rxvt_term::IMisRunning () 1192rxvt_term::IMisRunning ()
… …
1280{ 1220{
1281 XPoint nspot; 1221 XPoint nspot;
1282 XVaNestedList preedit_attr; 1222 XVaNestedList preedit_attr;
1283 1223
1284 if (!Input_Context 1224 if (!Input_Context
1285 || !TermWin.focus 1225 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1226 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1287 return; 1227 return;
1288 1228
1289 im_set_position (nspot); 1229 im_set_position (nspot);
1290 1230
1291 if (nspot.x == spot.x && nspot.y == spot.y) 1231 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1310 input_method = 0; 1250 input_method = 0;
1311 } 1251 }
1312 1252
1313 Input_Context = 0; 1253 Input_Context = 0;
1314} 1254}
1255
1256#ifdef ENABLE_XIM_ONTHESPOT
1257
1258static void
1259xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1260{
1261 ((rxvt_term *)client_data)->make_current ();
1262 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1263}
1264
1265static void
1266xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1267{
1268 ((rxvt_term *)client_data)->make_current ();
1269 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1270}
1271
1272static void
1273xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1274{
1275 rxvt_term *term = (rxvt_term *)client_data;
1276 XIMText *text = call_data->text;
1277
1278 term->make_current ();
1279
1280 if (text)
1281 {
1282 void *str;
1283
1284 if (!text->encoding_is_wchar && text->string.multi_byte)
1285 {
1286 // of course, X makes it ugly again
1287 if (term->rs[Rs_imLocale])
1288 SET_LOCALE (term->rs[Rs_imLocale]);
1289
1290 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1291 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1292
1293 if (term->rs[Rs_imLocale])
1294 SET_LOCALE (term->locale);
1295 }
1296 else
1297 str = (void *)text->string.wide_char;
1298
1299 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1300 DT_INT, call_data->caret,
1301 DT_INT, call_data->chg_first,
1302 DT_INT, call_data->chg_length,
1303 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1304 DT_WCS_LEN, str, str ? (int)text->length : 0,
1305 DT_END));
1306 }
1307 else
1308 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1309 DT_INT, call_data->caret,
1310 DT_INT, call_data->chg_first,
1311 DT_INT, call_data->chg_length,
1312 DT_END));
1313}
1314
1315#if 0
1316static void
1317xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1318{
1319 ((rxvt_term *)client_data)->make_current ();
1320 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1321 DT_INT, call_data->position,
1322 DT_INT, call_data->direction,
1323 DT_INT, call_data->style,
1324 DT_END));
1325}
1326#endif
1327
1328#endif
1315 1329
1316/* 1330/*
1317 * Try to open a XIM with the current modifiers, then see if we can 1331 * Try to open a XIM with the current modifiers, then see if we can
1318 * open a suitable preedit type 1332 * open a suitable preedit type
1319 */ 1333 */
… …
1326 XRectangle rect, status_rect, needed_rect; 1340 XRectangle rect, status_rect, needed_rect;
1327 unsigned long fg, bg; 1341 unsigned long fg, bg;
1328 const char *p; 1342 const char *p;
1329 char **s; 1343 char **s;
1330 XIMStyles *xim_styles; 1344 XIMStyles *xim_styles;
1345#ifdef ENABLE_XIM_ONTHESPOT
1346 XIMCallback xcb[4];
1347#endif
1348
1349 set_environ (envv);
1331 1350
1332 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1351 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1333 return false; 1352 return false;
1334 1353
1335 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1336 input_method = display->get_xim (locale, modifiers); 1354 input_method = display->get_xim (locale, modifiers);
1337 if (input_method == NULL) 1355 if (input_method == NULL)
1338 return false; 1356 return false;
1339 1357
1340 xim = input_method->xim; 1358 xim = input_method->xim;
… …
1360 s = rxvt_splitcommastring (p); 1378 s = rxvt_splitcommastring (p);
1361 1379
1362 for (i = found = 0; !found && s[i]; i++) 1380 for (i = found = 0; !found && s[i]; i++)
1363 { 1381 {
1364 if (!strcmp (s[i], "OverTheSpot")) 1382 if (!strcmp (s[i], "OverTheSpot"))
1365 input_style = (XIMPreeditPosition | XIMStatusNothing); 1383 input_style = XIMPreeditPosition | XIMStatusNothing;
1366 else if (!strcmp (s[i], "OffTheSpot")) 1384 else if (!strcmp (s[i], "OffTheSpot"))
1367 input_style = (XIMPreeditArea | XIMStatusArea); 1385 input_style = XIMPreeditArea | XIMStatusArea;
1368 else if (!strcmp (s[i], "Root")) 1386 else if (!strcmp (s[i], "Root"))
1369 input_style = (XIMPreeditNothing | XIMStatusNothing); 1387 input_style = XIMPreeditNothing | XIMStatusNothing;
1370 else if (!strcmp (s[i], "None")) 1388 else if (!strcmp (s[i], "None"))
1371 input_style = (XIMPreeditNone | XIMStatusNone); 1389 input_style = XIMPreeditNone | XIMStatusNone;
1390#ifdef ENABLE_XIM_ONTHESPOT
1391 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1392 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1393#endif
1394 else
1395 input_style = XIMPreeditNothing | XIMStatusNothing;
1372 1396
1373 for (j = 0; j < xim_styles->count_styles; j++) 1397 for (j = 0; j < xim_styles->count_styles; j++)
1374 if (input_style == xim_styles->supported_styles[j]) 1398 if (input_style == xim_styles->supported_styles[j])
1375 { 1399 {
1376 rxvt_freecommastring (s); 1400 rxvt_freecommastring (s);
… …
1410 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1434 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1411 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1435 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1412 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1436 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1413 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1437 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1414 "*", 1438 "*",
1415 TermWin.fheight, 1439 fheight,
1416 TermWin.fheight + 1, TermWin.fheight - 1, 1440 fheight + 1, fheight - 1,
1417 TermWin.fheight - 2, TermWin.fheight + 2); 1441 fheight - 2, fheight + 2);
1418 1442
1419 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1443 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1420 &missing_charset_list, &missing_charset_count, &def_string); 1444 &missing_charset_list, &missing_charset_count, &def_string);
1421 1445
1422 if (missing_charset_list) 1446 if (missing_charset_list)
… …
1465 XNBackground, bg, 1489 XNBackground, bg,
1466 XNArea, &status_rect, 1490 XNArea, &status_rect,
1467 XNFontSet, fs, 1491 XNFontSet, fs,
1468 NULL); 1492 NULL);
1469 } 1493 }
1494 else if (input_style & XIMPreeditCallbacks)
1495 {
1496 im_set_position (spot);
1497
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif
1504
1505 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2],
1510#if 0
1511 XNPreeditCaretCallback, &xcb[3],
1512#endif
1513 NULL);
1514 }
1470 1515
1471 Input_Context = XCreateIC (xim, 1516 Input_Context = XCreateIC (xim,
1472 XNInputStyle, input_style, 1517 XNInputStyle, input_style,
1473 XNClientWindow, TermWin.vt, 1518 XNClientWindow, vt,
1474 XNFocusWindow, TermWin.parent[0], 1519 XNFocusWindow, parent[0],
1475 preedit_attr ? XNPreeditAttributes : NULL, 1520 preedit_attr ? XNPreeditAttributes : NULL,
1476 preedit_attr, 1521 preedit_attr,
1477 status_attr ? XNStatusAttributes : NULL, 1522 status_attr ? XNStatusAttributes : NULL,
1478 status_attr, NULL); 1523 status_attr, NULL);
1479 1524
… …
1486 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1531 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1487 im_destroy (); 1532 im_destroy ();
1488 return false; 1533 return false;
1489 } 1534 }
1490 1535
1536#if 0
1537 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input ();
1540#endif
1541
1491 if (input_style & XIMPreeditArea) 1542 if (input_style & XIMPreeditArea)
1492 IMSetStatusPosition (); 1543 IMSetStatusPosition ();
1493 1544
1494 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1495 return true; 1545 return true;
1496} 1546}
1497 1547
1498void 1548void
1499rxvt_term::im_cb () 1549rxvt_term::im_cb ()
1500{ 1550{
1501 int i, found, had_im; 1551 int i;
1502 const char *p; 1552 const char *p;
1503 char **s; 1553 char **s;
1504 char buf[IMBUFSIZ]; 1554 char buf[IMBUFSIZ];
1505 1555
1556 make_current ();
1557
1506 im_destroy (); 1558 im_destroy ();
1507 1559
1508 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1509 if (Input_Context) 1560 if (Input_Context)
1510 return; 1561 return;
1511 1562
1512#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1563#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1513 if (rs[Rs_imLocale]) 1564 if (rs[Rs_imLocale])
… …
1561{ 1612{
1562 XRectangle preedit_rect, status_rect, *needed_rect; 1613 XRectangle preedit_rect, status_rect, *needed_rect;
1563 XVaNestedList preedit_attr, status_attr; 1614 XVaNestedList preedit_attr, status_attr;
1564 1615
1565 if (!Input_Context 1616 if (!Input_Context
1566 || !TermWin.focus 1617 || !focus
1567 || !(input_style & XIMPreeditArea) 1618 || !(input_style & XIMPreeditArea)
1568 || !IMisRunning ()) 1619 || !IMisRunning ())
1569 return; 1620 return;
1570 1621
1571 /* Getting the necessary width of preedit area */ 1622 /* Getting the necessary width of preedit area */
… …
1586 XFree (preedit_attr); 1637 XFree (preedit_attr);
1587 XFree (status_attr); 1638 XFree (status_attr);
1588} 1639}
1589#endif /* USE_XIM */ 1640#endif /* USE_XIM */
1590 1641
1591/*----------------------------------------------------------------------*/
1592rxvt_t rxvt_current_term;
1593
1594/*----------------------- end-of-file (C source) -----------------------*/ 1642/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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