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.121 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.137 by root, Tue Feb 15 16:04:45 2005 UTC

… …
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 "main.intpro" /* PROTOS for internal routines */
36 36
37#include <signal.h> 37#include <csignal>
38#include <cstring>
38 39
39#ifdef TTY_GID_SUPPORT 40#ifdef TTY_GID_SUPPORT
40# include <grp.h> 41# include <grp.h>
41#endif 42#endif
42 43
43#ifdef HAVE_TERMIOS_H 44#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45# include <termios.h>
45#endif 46#endif
46 47
47#include <cstring> 48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
48 51
49vector<rxvt_term *> rxvt_term::termlist; 52vector<rxvt_term *> rxvt_term::termlist;
50 53
51static char curlocale[128]; 54static char curlocale[128];
52 55
… …
156#endif 159#endif
157#ifdef USE_XIM 160#ifdef USE_XIM
158 im_ev (this, &rxvt_term::im_cb), 161 im_ev (this, &rxvt_term::im_cb),
159#endif 162#endif
160 sw_term (this, &rxvt_term::sig_term), 163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
161 sw_chld (this, &rxvt_term::sig_chld), 165 sw_chld (this, &rxvt_term::sig_chld),
162 termwin_ev (this, &rxvt_term::x_cb), 166 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 167 vt_ev (this, &rxvt_term::x_cb),
164 check_ev (this, &rxvt_term::check_cb), 168 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 169 flush_ev (this, &rxvt_term::flush_cb),
… …
168 incr_ev (this, &rxvt_term::incr_cb) 172 incr_ev (this, &rxvt_term::incr_cb)
169{ 173{
170 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 174 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
171 175
172 termlist.push_back (this); 176 termlist.push_back (this);
173}
174 177
175rxvt_term::~rxvt_term () 178#ifdef KEYSYM_RESOURCE
176{ 179 keyboard = new keyboard_manager;
177 termlist.erase (find (termlist.begin (), termlist.end(), this));
178 180
181 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n");
183#endif
184}
185
186// clean up the most important stuff, do *not* call x or free mem etc.
187// for use before an emergency exit
188void rxvt_term::emergency_cleanup ()
189{
179 if (cmd_pid) 190 if (cmd_pid)
180 kill (-cmd_pid, SIGHUP); 191 kill (-cmd_pid, SIGHUP);
181 192
182 pty.put ();
183
184#ifdef UTMP_SUPPORT 193#ifdef UTMP_SUPPORT
185 privileged_utmp (RESTORE); 194 privileged_utmp (RESTORE);
186#endif 195#endif
196
197 pty.put ();
198}
199
200rxvt_term::~rxvt_term ()
201{
202 termlist.erase (find (termlist.begin (), termlist.end(), this));
203
204 emergency_cleanup ();
187 205
188#if ENABLE_STYLES 206#if ENABLE_STYLES
189 for (int i = RS_styleCount; --i; ) 207 for (int i = RS_styleCount; --i; )
190 if (TermWin.fontset[i] != TermWin.fontset[0]) 208 if (TermWin.fontset[i] != TermWin.fontset[0])
191 delete TermWin.fontset[i]; 209 delete TermWin.fontset[i];
192#endif 210#endif
193 delete TermWin.fontset[0]; 211 delete TermWin.fontset[0];
194 212
195 if (display) 213 if (display)
196 { 214 {
215 dDisp;
216
197 selection_clear (); 217 selection_clear ();
198 218
199#ifdef USE_XIM 219#ifdef USE_XIM
200 im_destroy (); 220 im_destroy ();
201#endif 221#endif
202#ifdef MENUBAR 222#ifdef MENUBAR
203 if (menubarGC) XFreeGC (display->display, menubarGC); 223 if (menubarGC) XFreeGC (disp, menubarGC);
204#endif 224#endif
205#ifdef XTERM_SCROLLBAR 225#ifdef XTERM_SCROLLBAR
206 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
207 if (ShadowGC) XFreeGC (display->display, ShadowGC); 227 if (ShadowGC) XFreeGC (disp, ShadowGC);
208#endif 228#endif
209#ifdef PLAIN_SCROLLBAR 229#ifdef PLAIN_SCROLLBAR
210 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
211#endif 231#endif
212#ifdef NEXT_SCROLLBAR 232#ifdef NEXT_SCROLLBAR
213 if (blackGC) XFreeGC (display->display, blackGC); 233 if (blackGC) XFreeGC (disp, blackGC);
214 if (whiteGC) XFreeGC (display->display, whiteGC); 234 if (whiteGC) XFreeGC (disp, whiteGC);
215 if (grayGC) XFreeGC (display->display, grayGC); 235 if (grayGC) XFreeGC (disp, grayGC);
216 if (darkGC) XFreeGC (display->display, darkGC); 236 if (darkGC) XFreeGC (disp, darkGC);
217 if (stippleGC) XFreeGC (display->display, stippleGC); 237 if (stippleGC) XFreeGC (disp, stippleGC);
218 if (dimple) XFreePixmap (display->display, dimple); 238 if (dimple) XFreePixmap (disp, dimple);
219 if (upArrow) XFreePixmap (display->display, upArrow); 239 if (upArrow) XFreePixmap (disp, upArrow);
220 if (downArrow) XFreePixmap (display->display, downArrow); 240 if (downArrow) XFreePixmap (disp, downArrow);
221 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 241 if (upArrowHi) XFreePixmap (disp, upArrowHi);
222 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 242 if (downArrowHi) XFreePixmap (disp, downArrowHi);
223#endif 243#endif
224#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
225 if (topShadowGC) XFreeGC (display->display, topShadowGC); 245 if (topShadowGC) XFreeGC (disp, topShadowGC);
226 if (botShadowGC) XFreeGC (display->display, botShadowGC); 246 if (botShadowGC) XFreeGC (disp, botShadowGC);
227 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 247 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
228#endif 248#endif
229 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 249 if (TermWin.gc) XFreeGC (disp, TermWin.gc);
230 250
231#if defined(MENUBAR) && (MENUBAR_MAX > 1) 251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
232 delete menuBar.drawable; 252 delete menuBar.drawable;
233 //if (menuBar.win) 253 //if (menuBar.win)
234 // XDestroyWindow (display->display, menuBar.win); 254 // XDestroyWindow (disp, menuBar.win);
235#endif 255#endif
236 delete TermWin.drawable; 256 delete TermWin.drawable;
237 // destroy all windows 257 // destroy all windows
238 if (TermWin.parent[0]) 258 if (TermWin.parent[0]
259#if ENABLE_FRILLS
260 && !rs[Rs_embed]
261#endif
262 )
239 XDestroyWindow (display->display, TermWin.parent[0]); 263 XDestroyWindow (disp, TermWin.parent[0]);
240 } 264 }
241 265
242 // TODO: free pixcolours, colours should become part of rxvt_display 266 // TODO: free pixcolours, colours should become part of rxvt_display
243 267
244 delete pix_colors_focused; 268 delete pix_colors_focused;
… …
250 274
251 scr_release (); 275 scr_release ();
252 276
253 /* clear all resources */ 277 /* clear all resources */
254 for (int i = 0; i < allocated.size (); i++) 278 for (int i = 0; i < allocated.size (); i++)
255 free (allocated[i]); 279 free (allocated [i]);
256 280
257 free (selection.text); 281 free (selection.text);
258 // TODO: manage env vars in child only(!) 282 // TODO: manage env vars in child only(!)
259 free (env_windowid); 283 free (env_windowid);
260 free (env_display); 284 free (env_display);
… …
264 free (v_buffer); 288 free (v_buffer);
265 free (incr_buf); 289 free (incr_buf);
266 290
267 delete envv; 291 delete envv;
268 delete argv; 292 delete argv;
293
294#ifdef KEYSYM_RESOURCE
295 delete keyboard;
296#endif
269} 297}
270 298
271void 299void
272rxvt_term::destroy () 300rxvt_term::destroy ()
273{ 301{
… …
325 353
326 delete this; 354 delete this;
327} 355}
328 356
329/*----------------------------------------------------------------------*/ 357/*----------------------------------------------------------------------*/
358/*
359 * Exit gracefully, clearing the utmp entry and restoring tty attributes
360 * TODO: if debugging, this should free up any known resources if we can
361 */
362static XErrorHandler old_xerror_handler;
363
364static void
365rxvt_emergency_cleanup ()
366{
367 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
368 (*t)->emergency_cleanup ();
369}
370
371#if ENABLE_FRILLS
372static void
373print_x_error (Display *dpy, XErrorEvent *event)
374{
375 char buffer[BUFSIZ];
376 char mesg[BUFSIZ];
377 char number[32];
378 char *mtype = "XlibMessage";
379 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
380 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
381 rxvt_warn ("An X Error occured, trying to continue after report.\n");
382 rxvt_warn ("%s: %s\n", mesg, buffer);
383 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
384 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
385 sprintf(number, "%d", event->request_code);
386 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
387 rxvt_warn ("(which is %s)\n", buffer);
388 if (event->request_code >= 128) {
389 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
390 mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
392 }
393 if ((event->error_code == BadWindow) ||
394 (event->error_code == BadPixmap) ||
395 (event->error_code == BadCursor) ||
396 (event->error_code == BadFont) ||
397 (event->error_code == BadDrawable) ||
398 (event->error_code == BadColor) ||
399 (event->error_code == BadGC) ||
400 (event->error_code == BadIDChoice) ||
401 (event->error_code == BadValue) ||
402 (event->error_code == BadAtom)) {
403 if (event->error_code == BadValue)
404 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
405 mesg, BUFSIZ);
406 else if (event->error_code == BadAtom)
407 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
408 mesg, BUFSIZ);
409 else
410 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
411 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
413 }
414 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
415 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
417}
418#endif
419
420int
421rxvt_xerror_handler (Display *display, XErrorEvent *event)
422{
423 if (GET_R->allowedxerror == -1)
424 GET_R->allowedxerror = event->error_code;
425 else
426 {
427 //TODO: GET_R is most likely not the terminal which caused the error
428 //TODO: maybe just output the error and continue?
429#if ENABLE_FRILLS
430 print_x_error (display, event);
431#else
432 old_xerror_handler (display, event);
433#endif
434 }
435
436 return 0;
437}
438
439int
440rxvt_xioerror_handler (Display *display)
441{
442 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
443 DisplayString (display));
444 rxvt_emergency_cleanup ();
445 _exit (EXIT_FAILURE);
446}
447
448/*
449 * Catch a fatal signal and tidy up before quitting
450 */
451void
452rxvt_term::sig_term (sig_watcher &w)
453{
454#ifdef DEBUG_CMD
455 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
456#endif
457 rxvt_emergency_cleanup ();
458 signal (w.signum, SIG_DFL);
459 kill (getpid (), w.signum);
460}
461
462/*----------------------------------------------------------------------*/
330/* rxvt_init () */ 463/* rxvt_init () */
331bool 464bool
332rxvt_term::init (int argc, const char *const *argv) 465rxvt_term::init (int argc, const char *const *argv)
333{ 466{
334 SET_R (this); 467 SET_R (this);
335 468
469 set_locale ("");
470
336 if (!init_vars ()) 471 if (!init_vars ())
337 return false; 472 return false;
338 473
339 init_secondary (); 474 init_secondary ();
340 475
341 const char **cmd_argv = init_resources (argc, argv); 476 const char **cmd_argv = init_resources (argc, argv);
342 477
343 set_locale (""); 478#ifdef KEYSYM_RESOURCE
479 keyboard->register_done ();
480#endif
344 481
345#if MENUBAR_MAX 482#if MENUBAR_MAX
346 menubar_read (rs[Rs_menu]); 483 menubar_read (rs[Rs_menu]);
347#endif 484#endif
348#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
… …
350 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
351#endif 488#endif
352 489
353 create_windows (argc, argv); 490 create_windows (argc, argv);
354 491
492 dDisp;
493
355 init_xlocale (); 494 init_xlocale ();
356 495
357 scr_reset (); /* initialize screen */ 496 scr_reset (); /* initialize screen */
358 497
359#if 0 498#if 0
360 XSynchronize (display->display, True); 499 XSynchronize (disp, True);
361#endif 500#endif
362 501
363#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
364 if (options & Opt_scrollBar) 503 if (options & Opt_scrollBar)
365 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
366#endif 505#endif
367#if (MENUBAR_MAX) 506#if (MENUBAR_MAX)
368 if (menubar_visible ()) 507 if (menubar_visible ())
369 XMapWindow (display->display, menuBar.win); 508 XMapWindow (disp, menuBar.win);
370#endif 509#endif
371#ifdef TRANSPARENT 510#ifdef TRANSPARENT
372 if (options & Opt_transparent) 511 if (options & Opt_transparent)
373 { 512 {
374 XSelectInput (display->display, display->root, PropertyChangeMask); 513 XSelectInput (disp, display->root, PropertyChangeMask);
375 check_our_parents (); 514 check_our_parents ();
376 rootwin_ev.start (display, display->root); 515 rootwin_ev.start (display, display->root);
377 } 516 }
378#endif 517#endif
379 518
380 XMapWindow (display->display, TermWin.vt); 519 XMapWindow (disp, TermWin.vt);
381 XMapWindow (display->display, TermWin.parent[0]); 520 XMapWindow (disp, TermWin.parent[0]);
382 521
383 set_colorfgbg (); 522 set_colorfgbg ();
384 523
385 init_command (cmd_argv); 524 init_command (cmd_argv);
386 525
526 free (cmd_argv);
527
387 pty_ev.start (pty.pty, EVENT_READ); 528 pty_ev.start (pty.pty, EVENT_READ);
388 529
389 check_ev.start (); 530 check_ev.start ();
390 531
391 return true; 532 return true;
392} 533}
393
394static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
395 534
396void 535void
397rxvt_init () 536rxvt_init ()
398{ 537{
399 /* 538 /*
… …
412 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 551 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
413 /* signal (SIGURG, SIG_DFL); */ 552 /* signal (SIGURG, SIG_DFL); */
414 553
415 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 554 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
416 // TODO: handle this with exceptions and tolerate the memory loss 555 // TODO: handle this with exceptions and tolerate the memory loss
417 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 556 XSetIOErrorHandler (rxvt_xioerror_handler);
418} 557}
419 558
420/* ------------------------------------------------------------------------- * 559/* ------------------------------------------------------------------------- *
421 * SIGNAL HANDLING & EXIT HANDLER * 560 * SIGNAL HANDLING & EXIT HANDLER *
422 * ------------------------------------------------------------------------- */ 561 * ------------------------------------------------------------------------- */
… …
435 if (pid == (*t)->cmd_pid) 574 if (pid == (*t)->cmd_pid)
436 { 575 {
437 (*t)->destroy (); 576 (*t)->destroy ();
438 break; 577 break;
439 } 578 }
440}
441
442/*----------------------------------------------------------------------*/
443/*
444 * Exit gracefully, clearing the utmp entry and restoring tty attributes
445 * TODO: if debugging, this should free up any known resources if we can
446 */
447void
448rxvt_destroy_all ()
449{
450 // TODO: rxvtd should clean up all ressources
451 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
452 (*t)->destroy ();
453}
454
455/*
456 * Catch a fatal signal and tidy up before quitting
457 */
458void
459rxvt_term::sig_term (sig_watcher &w)
460{
461#ifdef DEBUG_CMD
462 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
463#endif
464 rxvt_destroy_all ();
465 signal (w.signum, SIG_DFL);
466 kill (getpid (), w.signum);
467}
468
469/* INTPROTO */
470int
471rxvt_xerror_handler (Display *display, XErrorEvent *event)
472{
473 if (GET_R->allowedxerror == -1)
474 GET_R->allowedxerror = event->error_code;
475 else
476 {
477 old_xerror_handler (display, event);
478 GET_R->destroy ();
479 }
480
481 return 0;
482} 579}
483 580
484/* ------------------------------------------------------------------------- * 581/* ------------------------------------------------------------------------- *
485 * MEMORY ALLOCATION WRAPPERS * 582 * MEMORY ALLOCATION WRAPPERS *
486 * ------------------------------------------------------------------------- */ 583 * ------------------------------------------------------------------------- */
… …
599 * if width/height are non-zero then override calculated width/height 696 * if width/height are non-zero then override calculated width/height
600 */ 697 */
601void 698void
602rxvt_term::window_calc (unsigned int width, unsigned int height) 699rxvt_term::window_calc (unsigned int width, unsigned int height)
603{ 700{
604 short recalc_x, recalc_y; 701 short recalc_x, recalc_y;
605 int x, y, sb_w, mb_h, flags; 702 int x, y, sb_w, mb_h, flags;
606 unsigned int w, h; 703 unsigned int w, h;
607 unsigned int max_width, max_height; 704 unsigned int max_width, max_height;
705 dDisp;
608 706
609 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 707 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
610 TermWin.ncol, TermWin.nrow, szHint.width, 708 TermWin.ncol, TermWin.nrow, szHint.width,
611 szHint.height)); 709 szHint.height));
612 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 710 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
… …
618 if (!parsed_geometry) 716 if (!parsed_geometry)
619 { 717 {
620 parsed_geometry = 1; 718 parsed_geometry = 1;
621 if (rs[Rs_geometry]) 719 if (rs[Rs_geometry])
622 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 720 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
721
623 if (flags & WidthValue) 722 if (flags & WidthValue)
624 { 723 {
625 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 724 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
626 szHint.flags |= USSize; 725 szHint.flags |= USSize;
627 } 726 }
727
628 if (flags & HeightValue) 728 if (flags & HeightValue)
629 { 729 {
630 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 730 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
631 szHint.flags |= USSize; 731 szHint.flags |= USSize;
632 } 732 }
733
633 if (flags & XValue) 734 if (flags & XValue)
634 { 735 {
635 szHint.x = x; 736 szHint.x = x;
636 szHint.flags |= USPosition; 737 szHint.flags |= USPosition;
637 if (flags & XNegative) 738 if (flags & XNegative)
638 { 739 {
639 recalc_x = 1; 740 recalc_x = 1;
640 szHint.win_gravity = NorthEastGravity; 741 szHint.win_gravity = NorthEastGravity;
641 } 742 }
642 } 743 }
744
643 if (flags & YValue) 745 if (flags & YValue)
644 { 746 {
645 szHint.y = y; 747 szHint.y = y;
646 szHint.flags |= USPosition; 748 szHint.flags |= USPosition;
647 if (flags & YNegative) 749 if (flags & YNegative)
… …
710 812
711 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 813 if (scrollbar_visible () && (options & Opt_scrollBar_right))
712 window_sb_x = szHint.width - sb_w; 814 window_sb_x = szHint.width - sb_w;
713 815
714 if (recalc_x) 816 if (recalc_x)
715 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 817 szHint.x += (DisplayWidth (disp, display->screen)
716 - szHint.width - 2 * TermWin.ext_bwidth); 818 - szHint.width - 2 * TermWin.ext_bwidth);
717 if (recalc_y) 819 if (recalc_y)
718 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 820 szHint.y += (DisplayHeight (disp, display->screen)
719 - szHint.height - 2 * TermWin.ext_bwidth); 821 - szHint.height - 2 * TermWin.ext_bwidth);
720 822
721 TermWin.ncol = TermWin.width / TermWin.fwidth; 823 TermWin.ncol = TermWin.width / TermWin.fwidth;
722 TermWin.nrow = TermWin.height / TermWin.fheight; 824 TermWin.nrow = TermWin.height / TermWin.fheight;
723 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 825 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
782 884
783 delete TermWin.fontset[0]; 885 delete TermWin.fontset[0];
784 TermWin.fontset[0] = fs; 886 TermWin.fontset[0] = fs;
785 887
786 prop = (*fs)[1]->properties (); 888 prop = (*fs)[1]->properties ();
889 prop.height += TermWin.lineSpace;
787 fs->set_prop (prop); 890 fs->set_prop (prop);
788 891
789 TermWin.fwidth = prop.width; 892 TermWin.fwidth = prop.width;
790 TermWin.fheight = prop.height; 893 TermWin.fheight = prop.height;
791 TermWin.fweight = prop.weight; 894 TermWin.fweight = prop.weight;
… …
887 990
888 /* handle color aliases */ 991 /* handle color aliases */
889 if (isdigit (*color)) 992 if (isdigit (*color))
890 { 993 {
891 i = atoi (color); 994 i = atoi (color);
995
892 if (i >= 8 && i <= 15) 996 if (i >= 8 && i <= 15)
893 { /* bright colors */ 997 { /* bright colors */
894 i -= 8; 998 i -= 8;
895# ifndef NO_BRIGHTCOLOR 999# ifndef NO_BRIGHTCOLOR
896 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
897 SET_PIXCOLOR (idx); 1001 SET_PIXCOLOR (idx);
898 goto Done; 1002 goto Done;
899# endif 1003# endif
900
901 } 1004 }
1005
902 if (i >= 0 && i <= 7) 1006 if (i >= 0 && i <= 7)
903 { /* normal colors */ 1007 { /* normal colors */
904 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
905 SET_PIXCOLOR (idx); 1009 SET_PIXCOLOR (idx);
906 goto Done; 1010 goto Done;
907 } 1011 }
908 } 1012 }
909 1013
910 if (!rXParseAllocColor (& xcol, color)) 1014 if (!rXParseAllocColor (&xcol, color))
911 return; 1015 return;
912 1016
913 /* XStoreColor (display->display, display->cmap, XColor*); */ 1017 /* XStoreColor (display->display, display->cmap, XColor*); */
914 1018
915 /* 1019 /*
… …
998 1102
999 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1103 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1000} 1104}
1001 1105
1002/*----------------------------------------------------------------------*/ 1106/*----------------------------------------------------------------------*/
1003/*
1004 * Colour determination for low colour displays, routine from
1005 * Hans de Goede <hans@highrise.nl>
1006 */
1007 1107
1008int 1108int
1009rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1109rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1010{ 1110{
1011 if (!screen_in_out->set (display, colour)) 1111 if (!screen_in_out->set (display, colour))
… …
1022 * -------------------------------------------------------------------- */ 1122 * -------------------------------------------------------------------- */
1023void 1123void
1024rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1124rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1025{ 1125{
1026 int fix_screen; 1126 int fix_screen;
1027
1028#ifdef SMART_RESIZE 1127#ifdef SMART_RESIZE
1029 int old_width = szHint.width, old_height = szHint.height; 1128 int old_width = szHint.width, old_height = szHint.height;
1030#endif 1129#endif
1130 dDisp;
1031 1131
1032 window_calc (width, height); 1132 window_calc (width, height);
1033 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1133 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1034 1134
1035 if (!ignoreparent) 1135 if (!ignoreparent)
1036 { 1136 {
1037#ifdef SMART_RESIZE 1137#ifdef SMART_RESIZE
1038 /* 1138 /*
… …
1042 int x, y, x1, y1; 1142 int x, y, x1, y1;
1043 int dx, dy; 1143 int dx, dy;
1044 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1144 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1045 Window unused_cr; 1145 Window unused_cr;
1046 1146
1047 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1147 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1048 0, 0, &x, &y, &unused_cr); 1148 0, 0, &x, &y, &unused_cr);
1049 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1149 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1050 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1150 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1051 /* 1151 /*
1052 * if display->root isn't the parent window, a WM will probably have offset 1152 * if display->root isn't the parent window, a WM will probably have offset
1053 * our position for handles and decorations. Counter it 1153 * our position for handles and decorations. Counter it
1054 */ 1154 */
… …
1056 { 1156 {
1057 x -= x1; 1157 x -= x1;
1058 y -= y1; 1158 y -= y1;
1059 } 1159 }
1060 1160
1061 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1161 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1062 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1162 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1063 dx = old_width - szHint.width; 1163 dx = old_width - szHint.width;
1064 dy = old_height - szHint.height; 1164 dy = old_height - szHint.height;
1065 1165
1066 /* Check position of the center of the window */ 1166 /* Check position of the center of the window */
1067 if (x < x1) /* left half */ 1167 if (x < x1) /* left half */
… …
1071 if (y < y1) /* top half */ 1171 if (y < y1) /* top half */
1072 dy = 0; 1172 dy = 0;
1073 else if (y == y1) /* exact center */ 1173 else if (y == y1) /* exact center */
1074 dy /= 2; 1174 dy /= 2;
1075 1175
1076 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1176 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1077 szHint.width, szHint.height); 1177 szHint.width, szHint.height);
1078#else 1178#else
1079 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1179 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1080#endif 1180#endif
1081 } 1181 }
1082 1182
1083 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1183 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1084 1184
1085 if (fix_screen || width != old_width || height != old_height) 1185 if (fix_screen || width != old_width || height != old_height)
1086 { 1186 {
1087 if (scrollbar_visible ()) 1187 if (scrollbar_visible ())
1088 { 1188 {
1089 XMoveResizeWindow (display->display, scrollBar.win, 1189 XMoveResizeWindow (disp, scrollBar.win,
1090 window_sb_x, 0, 1190 window_sb_x, 0,
1091 scrollbar_TotalWidth (), szHint.height); 1191 scrollbar_TotalWidth (), szHint.height);
1092 resize_scrollbar (); 1192 resize_scrollbar ();
1093 } 1193 }
1094 1194
1095 if (menubar_visible ()) 1195 if (menubar_visible ())
1096 XMoveResizeWindow (display->display, menuBar.win, 1196 XMoveResizeWindow (disp, menuBar.win,
1097 window_vt_x, 0, 1197 window_vt_x, 0,
1098 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1198 TermWin_TotalWidth (), menuBar_TotalHeight ());
1099 1199
1100 XMoveResizeWindow (display->display, TermWin.vt, 1200 XMoveResizeWindow (disp, TermWin.vt,
1101 window_vt_x, window_vt_y, 1201 window_vt_x, window_vt_y,
1102 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1202 TermWin_TotalWidth (), TermWin_TotalHeight ());
1203
1103 scr_clear (); 1204 scr_clear ();
1104#ifdef XPM_BACKGROUND 1205#ifdef XPM_BACKGROUND
1105 resize_pixmap (); 1206 resize_pixmap ();
1106#endif 1207#endif
1107 } 1208 }
… …
1129 } 1230 }
1130 } 1231 }
1131 1232
1132 old_width = szHint.width; 1233 old_width = szHint.width;
1133 old_height = szHint.height; 1234 old_height = szHint.height;
1235
1236#ifdef XPM_BACKGROUND
1237 if (TermWin.pixmap)
1238 scr_touch (false);
1239#endif
1134 1240
1135#ifdef USE_XIM 1241#ifdef USE_XIM
1136 IMSetStatusPosition (); 1242 IMSetStatusPosition ();
1137#endif 1243#endif
1138} 1244}
… …
1368 "*", 1474 "*",
1369 TermWin.fheight, 1475 TermWin.fheight,
1370 TermWin.fheight + 1, TermWin.fheight - 1, 1476 TermWin.fheight + 1, TermWin.fheight - 1,
1371 TermWin.fheight - 2, TermWin.fheight + 2); 1477 TermWin.fheight - 2, TermWin.fheight + 2);
1372 1478
1373 fs = XCreateFontSet (display->display, pat, 1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1374 &missing_charset_list, &missing_charset_count, &def_string); 1480 &missing_charset_list, &missing_charset_count, &def_string);
1375 1481
1376 if (missing_charset_list) 1482 if (missing_charset_list)
1377 XFreeStringList (missing_charset_list); 1483 XFreeStringList (missing_charset_list);
1378 1484
… …
1454{ 1560{
1455 int i, found, had_im; 1561 int i, found, had_im;
1456 const char *p; 1562 const char *p;
1457 char **s; 1563 char **s;
1458 char buf[IMBUFSIZ]; 1564 char buf[IMBUFSIZ];
1565
1566 SET_R (this);
1459 1567
1460 im_destroy (); 1568 im_destroy ();
1461 1569
1462 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1463 if (Input_Context) 1571 if (Input_Context)

Diff Legend

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