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.117 by root, Mon Nov 29 01:20:42 2004 UTC vs.
Revision 1.138 by root, Wed Feb 16 20:32:05 2005 UTC

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

Diff Legend

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