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.118 by root, Thu Dec 9 06:20:41 2004 UTC vs.
Revision 1.155 by root, Mon Jan 2 15:35:43 2006 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 */ 35#include "keyboard.h"
36#include "rxvtperl.h"
36 37
38#include <limits>
39
37#include <signal.h> 40#include <csignal>
41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
40# include <grp.h> 44# include <grp.h>
41#endif 45#endif
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46
47#include <cstring>
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
… …
155 pointer_ev (this, &rxvt_term::pointer_cb), 157 pointer_ev (this, &rxvt_term::pointer_cb),
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),
161 sw_chld (this, &rxvt_term::sig_chld),
162 termwin_ev (this, &rxvt_term::x_cb), 162 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 163 vt_ev (this, &rxvt_term::x_cb),
164 check_ev (this, &rxvt_term::check_cb), 164 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 165 flush_ev (this, &rxvt_term::flush_cb),
166 destroy_ev (this, &rxvt_term::destroy_cb), 166 destroy_ev (this, &rxvt_term::destroy_cb),
… …
168 incr_ev (this, &rxvt_term::incr_cb) 168 incr_ev (this, &rxvt_term::incr_cb)
169{ 169{
170 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 170 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
171 171
172 termlist.push_back (this); 172 termlist.push_back (this);
173}
174 173
175rxvt_term::~rxvt_term () 174#ifdef KEYSYM_RESOURCE
176{ 175 keyboard = new keyboard_manager;
177 termlist.erase (find (termlist.begin (), termlist.end(), this));
178 176
177 if (!keyboard)
178 rxvt_fatal ("out of memory, aborting.\n");
179#endif
180}
181
182// clean up the most important stuff, do *not* call x or free mem etc.
183// for use before an emergency exit
184void rxvt_term::emergency_cleanup ()
185{
179 if (cmd_pid) 186 if (cmd_pid)
180 kill (-cmd_pid, SIGHUP); 187 kill (-cmd_pid, SIGHUP);
181 188
182 pty.put ();
183
184#ifdef UTMP_SUPPORT 189#ifdef UTMP_SUPPORT
185 privileged_utmp (RESTORE); 190 privileged_utmp (RESTORE);
186#endif 191#endif
187 192
193 pty.put ();
194}
195
196rxvt_term::~rxvt_term ()
197{
198 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
199
200 termlist.erase (find (termlist.begin (), termlist.end(), this));
201
202 emergency_cleanup ();
203
188#if ENABLE_STYLES 204#if ENABLE_STYLES
189 for (int i = RS_styleCount; --i; ) 205 for (int i = RS_styleCount; --i; )
190 if (TermWin.fontset[i] != TermWin.fontset[0]) 206 if (fontset[i] != fontset[0])
191 delete TermWin.fontset[i]; 207 delete fontset[i];
192#endif 208#endif
193 delete TermWin.fontset[0]; 209 delete fontset[0];
194 210
195 if (display) 211 if (display)
196 { 212 {
213 dDisp;
214
197 selection_clear (); 215 selection_clear ();
198 216
199#ifdef USE_XIM 217#ifdef USE_XIM
200 im_destroy (); 218 im_destroy ();
201#endif 219#endif
202#ifdef MENUBAR 220#ifdef MENUBAR
203 if (menubarGC) XFreeGC (display->display, menubarGC); 221 if (menubarGC) XFreeGC (disp, menubarGC);
204#endif 222#endif
205#ifdef XTERM_SCROLLBAR 223#ifdef XTERM_SCROLLBAR
206 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 224 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
207 if (ShadowGC) XFreeGC (display->display, ShadowGC); 225 if (ShadowGC) XFreeGC (disp, ShadowGC);
208#endif 226#endif
209#ifdef PLAIN_SCROLLBAR 227#ifdef PLAIN_SCROLLBAR
210 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 228 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
211#endif 229#endif
212#ifdef NEXT_SCROLLBAR 230#ifdef NEXT_SCROLLBAR
213 if (blackGC) XFreeGC (display->display, blackGC); 231 if (blackGC) XFreeGC (disp, blackGC);
214 if (whiteGC) XFreeGC (display->display, whiteGC); 232 if (whiteGC) XFreeGC (disp, whiteGC);
215 if (grayGC) XFreeGC (display->display, grayGC); 233 if (grayGC) XFreeGC (disp, grayGC);
216 if (darkGC) XFreeGC (display->display, darkGC); 234 if (darkGC) XFreeGC (disp, darkGC);
217 if (stippleGC) XFreeGC (display->display, stippleGC); 235 if (stippleGC) XFreeGC (disp, stippleGC);
218 if (dimple) XFreePixmap (display->display, dimple); 236 if (dimple) XFreePixmap (disp, dimple);
219 if (upArrow) XFreePixmap (display->display, upArrow); 237 if (upArrow) XFreePixmap (disp, upArrow);
220 if (downArrow) XFreePixmap (display->display, downArrow); 238 if (downArrow) XFreePixmap (disp, downArrow);
221 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 239 if (upArrowHi) XFreePixmap (disp, upArrowHi);
222 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 240 if (downArrowHi) XFreePixmap (disp, downArrowHi);
223#endif 241#endif
224#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
225 if (topShadowGC) XFreeGC (display->display, topShadowGC); 243 if (topShadowGC) XFreeGC (disp, topShadowGC);
226 if (botShadowGC) XFreeGC (display->display, botShadowGC); 244 if (botShadowGC) XFreeGC (disp, botShadowGC);
227 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 245 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
228#endif 246#endif
229 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 247 if (gc) XFreeGC (disp, gc);
230 248
231#if defined(MENUBAR) && (MENUBAR_MAX > 1) 249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
232 delete menuBar.drawable; 250 delete menuBar.drawable;
233 //if (menuBar.win) 251 //if (menuBar.win)
234 // XDestroyWindow (display->display, menuBar.win); 252 // XDestroyWindow (disp, menuBar.win);
235#endif 253#endif
236 delete TermWin.drawable; 254 delete drawable;
237 // destroy all windows 255 // destroy all windows
238 if (TermWin.parent[0]) 256 if (parent[0])
239 XDestroyWindow (display->display, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
240 } 258 }
241 259
242 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
243 261
244 delete pix_colors_focused; 262 delete pix_colors_focused;
245#ifdef OFF_FOCUS_FADING 263#if OFF_FOCUS_FADING
246 delete pix_colors_unfocused; 264 delete pix_colors_unfocused;
247#endif 265#endif
248 266
249 displays.put (display); 267 displays.put (display);
250 268
251 scr_release (); 269 scr_release ();
252 270
253 /* clear all resources */ 271 /* clear all resources */
254 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
255 free (allocated[i]); 273 free (allocated [i]);
256 274
257 free (selection.text); 275 free (selection.text);
258 // TODO: manage env vars in child only(!) 276 // TODO: manage env vars in child only(!)
259 free (env_windowid); 277 free (env_windowid);
260 free (env_display); 278 free (env_display);
261 free (env_term); 279 free (env_term);
262 free (env_colorfgbg); 280 free (env_colorfgbg);
263 free (locale); 281 free (locale);
264#if 0 282 free (v_buffer);
265 free (codeset); 283 free (incr_buf);
266#endif
267 284
268 delete envv; 285 delete envv;
269 delete argv; 286 delete argv;
287
288#ifdef KEYSYM_RESOURCE
289 delete keyboard;
290#endif
291}
292
293void
294rxvt_term::child_exit ()
295{
296 cmd_pid = 0;
297
298 if (!OPTION (Opt_hold))
299 destroy ();
270} 300}
271 301
272void 302void
273rxvt_term::destroy () 303rxvt_term::destroy ()
274{ 304{
… …
326 356
327 delete this; 357 delete this;
328} 358}
329 359
330/*----------------------------------------------------------------------*/ 360/*----------------------------------------------------------------------*/
331/* rxvt_init () */ 361/*
362 * Exit gracefully, clearing the utmp entry and restoring tty attributes
363 * TODO: if debugging, this should free up any known resources if we can
364 */
365static XErrorHandler old_xerror_handler;
366
367static void
368rxvt_emergency_cleanup ()
369{
370 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
371 (*t)->emergency_cleanup ();
372}
373
374#if ENABLE_FRILLS
375static void
376print_x_error (Display *dpy, XErrorEvent *event)
377{
378 char buffer[BUFSIZ];
379 char mesg[BUFSIZ];
380 char number[32];
381 char *mtype = "XlibMessage";
382 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
383 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
384 rxvt_warn ("An X Error occured, trying to continue after report.\n");
385 rxvt_warn ("%s: %s\n", mesg, buffer);
386 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
387 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
388 sprintf(number, "%d", event->request_code);
389 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
390 rxvt_warn ("(which is %s)\n", buffer);
391 if (event->request_code >= 128) {
392 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
393 mesg, BUFSIZ);
394 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
395 }
396 if ((event->error_code == BadWindow) ||
397 (event->error_code == BadPixmap) ||
398 (event->error_code == BadCursor) ||
399 (event->error_code == BadFont) ||
400 (event->error_code == BadDrawable) ||
401 (event->error_code == BadColor) ||
402 (event->error_code == BadGC) ||
403 (event->error_code == BadIDChoice) ||
404 (event->error_code == BadValue) ||
405 (event->error_code == BadAtom)) {
406 if (event->error_code == BadValue)
407 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
408 mesg, BUFSIZ);
409 else if (event->error_code == BadAtom)
410 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
411 mesg, BUFSIZ);
412 else
413 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
414 mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
416 }
417 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
418 mesg, BUFSIZ);
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
420}
421#endif
422
423int
424rxvt_xerror_handler (Display *display, XErrorEvent *event)
425{
426 if (GET_R->allowedxerror == -1)
427 GET_R->allowedxerror = event->error_code;
428 else
429 {
430 // GET_R is most likely not the terminal which caused the error,
431 // so just output the error and continue
432#if ENABLE_FRILLS
433 print_x_error (display, event);
434#else
435 old_xerror_handler (display, event);
436#endif
437 }
438
439 return 0;
440}
441
442int
443rxvt_xioerror_handler (Display *display)
444{
445 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
446 DisplayString (display));
447 rxvt_emergency_cleanup ();
448 _exit (EXIT_FAILURE);
449}
450
451/*----------------------------------------------------------------------*/
332bool 452bool
333rxvt_term::init (int argc, const char *const *argv) 453rxvt_term::init (int argc, const char *const *argv)
334{ 454{
335 SET_R (this); 455 SET_R (this);
336 456
457 set_locale ("");
458
337 if (!init_vars ()) 459 if (!init_vars ())
338 return false; 460 return false;
339 461
340 init_secondary (); 462 init_secondary ();
341 463
342 const char **cmd_argv = init_resources (argc, argv); 464 const char **cmd_argv = init_resources (argc, argv);
343 465
344 set_locale (""); 466#ifdef KEYSYM_RESOURCE
467 keyboard->register_done ();
468#endif
345 469
346#if MENUBAR_MAX 470#if MENUBAR_MAX
347 menubar_read (rs[Rs_menu]); 471 menubar_read (rs[Rs_menu]);
348#endif 472#endif
349#ifdef HAVE_SCROLLBARS 473#ifdef HAVE_SCROLLBARS
350 if (options & Opt_scrollBar) 474 if (OPTION (Opt_scrollBar))
351 scrollBar.setIdle (); /* set existence for size calculations */ 475 scrollBar.setIdle (); /* set existence for size calculations */
352#endif 476#endif
353 477
478#if ENABLE_PERL
479 rxvt_perl.init ();
480#endif
481
482 PERL_INVOKE ((this, HOOK_INIT, DT_END));
483
354 create_windows (argc, argv); 484 create_windows (argc, argv);
355 485
486 dDisp;
487
356 init_xlocale (); 488 init_xlocale ();
357 489
358 scr_reset (); /* initialize screen */ 490 scr_reset (); /* initialize screen */
359 491
360#if 0 492#if 0
361 XSynchronize (display->display, True); 493 XSynchronize (disp, True);
362#endif 494#endif
363 495
364#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
365 if (options & Opt_scrollBar) 497 if (OPTION (Opt_scrollBar))
366 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
367#endif 499#endif
368#if (MENUBAR_MAX) 500#if (MENUBAR_MAX)
369 if (menubar_visible ()) 501 if (menubar_visible ())
370 XMapWindow (display->display, menuBar.win); 502 XMapWindow (disp, menuBar.win);
371#endif 503#endif
372#ifdef TRANSPARENT 504#ifdef TRANSPARENT
373 if (options & Opt_transparent) 505 if (OPTION (Opt_transparent))
374 { 506 {
375 XSelectInput (display->display, display->root, PropertyChangeMask); 507 XSelectInput (disp, display->root, PropertyChangeMask);
376 check_our_parents (); 508 check_our_parents ();
377 rootwin_ev.start (display, display->root); 509 rootwin_ev.start (display, display->root);
378 } 510 }
379#endif 511#endif
380 512
381 XMapWindow (display->display, TermWin.vt); 513 XMapWindow (disp, vt);
382 XMapWindow (display->display, TermWin.parent[0]); 514 XMapWindow (disp, parent[0]);
383 515
384 set_colorfgbg (); 516 set_colorfgbg ();
385 517
386 init_command (cmd_argv); 518 init_command (cmd_argv);
387 519
520 free (cmd_argv);
521
388 pty_ev.start (pty.pty, EVENT_READ); 522 pty_ev.start (pty.pty, EVENT_READ);
389 523
390 check_ev.start (); 524 check_ev.start ();
391 525
526 PERL_INVOKE ((this, HOOK_START, DT_END));
527
392 return true; 528 return true;
393} 529}
394 530
395static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 531static struct sig_handlers
532{
533 sig_watcher sw_chld, sw_term, sw_int;
534
535 void sig_chld (sig_watcher &w)
536 {
537 // we are being called for every SIGCHLD, find the corresponding term
538 int pid;
539
540 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
541 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
542 if (pid == (*t)->cmd_pid)
543 {
544 (*t)->child_exit ();
545 break;
546 }
547 }
548
549 /*
550 * Catch a fatal signal and tidy up before quitting
551 */
552 void
553 sig_term (sig_watcher &w)
554 {
555#ifdef DEBUG_CMD
556 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
557#endif
558 rxvt_emergency_cleanup ();
559 signal (w.signum, SIG_DFL);
560 kill (getpid (), w.signum);
561 }
562
563 sig_handlers ()
564 : sw_chld (this, &sig_handlers::sig_chld),
565 sw_term (this, &sig_handlers::sig_term),
566 sw_int (this, &sig_handlers::sig_term)
567 {
568 }
569} sig_handlers;
396 570
397void 571void
398rxvt_init () 572rxvt_init ()
399{ 573{
400 /* 574 /*
… …
408 rxvt_privileges (IGNORE); 582 rxvt_privileges (IGNORE);
409 583
410 signal (SIGHUP, SIG_IGN); 584 signal (SIGHUP, SIG_IGN);
411 signal (SIGPIPE, SIG_IGN); 585 signal (SIGPIPE, SIG_IGN);
412 586
587 sig_handlers.sw_chld.start (SIGCHLD);
588 sig_handlers.sw_term.start (SIGTERM);
589 sig_handlers.sw_int.start (SIGINT);
590
413 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 591 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
414 /* signal (SIGURG, SIG_DFL); */ 592 /* signal (SIGURG, SIG_DFL); */
415 593
416 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 594 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
417 // TODO: handle this with exceptions and tolerate the memory loss 595 // TODO: handle this with exceptions and tolerate the memory loss
418 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 596 XSetIOErrorHandler (rxvt_xioerror_handler);
419}
420
421/* ------------------------------------------------------------------------- *
422 * SIGNAL HANDLING & EXIT HANDLER *
423 * ------------------------------------------------------------------------- */
424/*
425 * Catch a SIGCHLD signal and exit if the direct child has died
426 */
427
428void
429rxvt_term::sig_chld (sig_watcher &w)
430{
431 // we are being called for every SIGCHLD, not just ours
432 int pid;
433
434 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
435 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
436 if (pid == (*t)->cmd_pid)
437 {
438 (*t)->destroy ();
439 break;
440 }
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} 597}
484 598
485/* ------------------------------------------------------------------------- * 599/* ------------------------------------------------------------------------- *
486 * MEMORY ALLOCATION WRAPPERS * 600 * MEMORY ALLOCATION WRAPPERS *
487 * ------------------------------------------------------------------------- */ 601 * ------------------------------------------------------------------------- */
… …
494 rxvt_fatal ("memory allocation failure. aborting.\n"); 608 rxvt_fatal ("memory allocation failure. aborting.\n");
495 609
496 return p; 610 return p;
497} 611}
498 612
499/* INTPROTO */ 613void *
500void *
501rxvt_calloc (size_t number, size_t size) 614rxvt_calloc (size_t number, size_t size)
502{ 615{
503 void *p = calloc (number, size); 616 void *p = calloc (number, size);
504 617
505 if (!p) 618 if (!p)
506 rxvt_fatal ("memory allocation failure. aborting.\n"); 619 rxvt_fatal ("memory allocation failure. aborting.\n");
507 620
508 return p; 621 return p;
509} 622}
510 623
511/* INTPROTO */
512void * 624void *
513rxvt_realloc (void *ptr, size_t size) 625rxvt_realloc (void *ptr, size_t size)
514{ 626{
515 void *p = realloc (ptr, size); 627 void *p = realloc (ptr, size);
516 628
… …
577 689
578#ifdef UTMP_SUPPORT 690#ifdef UTMP_SUPPORT
579void 691void
580rxvt_term::privileged_utmp (rxvt_privaction action) 692rxvt_term::privileged_utmp (rxvt_privaction action)
581{ 693{
582 if ((options & Opt_utmpInhibit) 694 if (OPTION (Opt_utmpInhibit)
583 || !pty.name || !*pty.name) 695 || !pty.name || !*pty.name)
584 return; 696 return;
585 697
586 rxvt_privileges (RESTORE); 698 rxvt_privileges (RESTORE);
587 699
… …
598/* 710/*
599 * window size/position calculcations for XSizeHint and other storage. 711 * window size/position calculcations for XSizeHint and other storage.
600 * if width/height are non-zero then override calculated width/height 712 * if width/height are non-zero then override calculated width/height
601 */ 713 */
602void 714void
603rxvt_term::window_calc (unsigned int width, unsigned int height) 715rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
604{ 716{
605 short recalc_x, recalc_y; 717 short recalc_x, recalc_y;
606 int x, y, sb_w, mb_h, flags; 718 int x, y, sb_w, mb_h, flags;
607 unsigned int w, h; 719 unsigned int w, h;
608 unsigned int max_width, max_height; 720 unsigned int max_width, max_height;
721 dDisp;
609 722
610 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 723 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
611 TermWin.ncol, TermWin.nrow, szHint.width, 724 ncol, nrow, szHint.width, szHint.height));
612 szHint.height)); 725
613 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 726 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
614 szHint.win_gravity = NorthWestGravity; 727 szHint.win_gravity = NorthWestGravity;
615 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 728 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
616 729
617 recalc_x = recalc_y = 0; 730 recalc_x = recalc_y = 0;
618 flags = 0; 731 flags = 0;
732
619 if (!parsed_geometry) 733 if (!parsed_geometry)
620 { 734 {
621 parsed_geometry = 1; 735 parsed_geometry = 1;
736
622 if (rs[Rs_geometry]) 737 if (rs[Rs_geometry])
623 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 738 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
739
624 if (flags & WidthValue) 740 if (flags & WidthValue)
625 { 741 {
626 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 742 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
627 szHint.flags |= USSize; 743 szHint.flags |= USSize;
628 } 744 }
745
629 if (flags & HeightValue) 746 if (flags & HeightValue)
630 { 747 {
631 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 748 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
632 szHint.flags |= USSize; 749 szHint.flags |= USSize;
633 } 750 }
751
634 if (flags & XValue) 752 if (flags & XValue)
635 { 753 {
636 szHint.x = x; 754 szHint.x = x;
637 szHint.flags |= USPosition; 755 szHint.flags |= USPosition;
756
638 if (flags & XNegative) 757 if (flags & XNegative)
639 { 758 {
640 recalc_x = 1; 759 recalc_x = 1;
641 szHint.win_gravity = NorthEastGravity; 760 szHint.win_gravity = NorthEastGravity;
642 } 761 }
643 } 762 }
763
644 if (flags & YValue) 764 if (flags & YValue)
645 { 765 {
646 szHint.y = y; 766 szHint.y = y;
647 szHint.flags |= USPosition; 767 szHint.flags |= USPosition;
768
648 if (flags & YNegative) 769 if (flags & YNegative)
649 { 770 {
650 recalc_y = 1; 771 recalc_y = 1;
772
651 if (szHint.win_gravity == NorthEastGravity) 773 if (szHint.win_gravity == NorthEastGravity)
652 szHint.win_gravity = SouthEastGravity; 774 szHint.win_gravity = SouthEastGravity;
653 else 775 else
654 szHint.win_gravity = SouthWestGravity; 776 szHint.win_gravity = SouthWestGravity;
655 } 777 }
656 } 778 }
657 } 779 }
658 780
659 /* TODO: BOUNDS */ 781 /* TODO: BOUNDS */
660 TermWin.width = TermWin.ncol * TermWin.fwidth; 782 width = ncol * fwidth;
661 TermWin.height = TermWin.nrow * TermWin.fheight; 783 height = nrow * fheight;
662 max_width = MAX_COLS * TermWin.fwidth; 784 max_width = MAX_COLS * fwidth;
663 max_height = MAX_ROWS * TermWin.fheight; 785 max_height = MAX_ROWS * fheight;
664 786
665 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 787 szHint.base_width = szHint.base_height = 2 * int_bwidth;
666 788
667 sb_w = mb_h = 0; 789 sb_w = mb_h = 0;
668 window_vt_x = window_vt_y = TermWin.int_bwidth; 790 window_vt_x = window_vt_y = int_bwidth;
669 791
670 if (scrollbar_visible ()) 792 if (scrollbar_visible ())
671 { 793 {
672 sb_w = scrollbar_TotalWidth (); 794 sb_w = scrollbar_TotalWidth ();
673 szHint.base_width += sb_w; 795 szHint.base_width += sb_w;
674 if (!(options & Opt_scrollBar_right)) 796 if (!OPTION (Opt_scrollBar_right))
675 window_vt_x += sb_w; 797 window_vt_x += sb_w;
676 } 798 }
677 799
678 if (menubar_visible ()) 800 if (menubar_visible ())
679 { 801 {
680 mb_h = menuBar_TotalHeight (); 802 mb_h = menuBar_TotalHeight ();
681 szHint.base_height += mb_h; 803 szHint.base_height += mb_h;
682 window_vt_y += mb_h; 804 window_vt_y += mb_h;
683 } 805 }
684 806
685 szHint.width_inc = TermWin.fwidth; 807 szHint.width_inc = fwidth;
686 szHint.height_inc = TermWin.fheight; 808 szHint.height_inc = fheight;
687 szHint.min_width = szHint.base_width + szHint.width_inc; 809 szHint.min_width = szHint.base_width + szHint.width_inc;
688 szHint.min_height = szHint.base_height + szHint.height_inc; 810 szHint.min_height = szHint.base_height + szHint.height_inc;
689 811
690 if (width && width - szHint.base_width < max_width) 812 if (newwidth && newwidth - szHint.base_width < max_width)
691 { 813 {
692 szHint.width = width; 814 szHint.width = newwidth;
693 TermWin.width = width - szHint.base_width; 815 width = newwidth - szHint.base_width;
694 } 816 }
695 else 817 else
696 { 818 {
697 MIN_IT (TermWin.width, max_width); 819 min_it (width, max_width);
698 szHint.width = szHint.base_width + TermWin.width; 820 szHint.width = szHint.base_width + width;
699 } 821 }
700 822
701 if (height && height - szHint.base_height < max_height) 823 if (newheight && newheight - szHint.base_height < max_height)
702 { 824 {
703 szHint.height = height; 825 szHint.height = newheight;
704 TermWin.height = height - szHint.base_height; 826 height = newheight - szHint.base_height;
705 } 827 }
706 else 828 else
707 { 829 {
708 MIN_IT (TermWin.height, max_height); 830 min_it (height, max_height);
709 szHint.height = szHint.base_height + TermWin.height; 831 szHint.height = szHint.base_height + height;
710 } 832 }
711 833
712 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 834 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
713 window_sb_x = szHint.width - sb_w; 835 window_sb_x = szHint.width - sb_w;
714 836
715 if (recalc_x) 837 if (recalc_x)
716 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 838 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
717 - szHint.width - 2 * TermWin.ext_bwidth);
718 if (recalc_y) 839 if (recalc_y)
719 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 840 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
720 - szHint.height - 2 * TermWin.ext_bwidth);
721 841
722 TermWin.ncol = TermWin.width / TermWin.fwidth; 842 ncol = width / fwidth;
723 TermWin.nrow = TermWin.height / TermWin.fheight; 843 nrow = height / fheight;
724 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 844 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
725 TermWin.ncol, TermWin.nrow, szHint.width, 845 ncol, nrow, szHint.width,
726 szHint.height)); 846 szHint.height));
727 return; 847 return;
728} 848}
729 849
730/*----------------------------------------------------------------------*/ 850/*----------------------------------------------------------------------*/
… …
738 if (pty.pty < 0) 858 if (pty.pty < 0)
739 return; 859 return;
740 860
741 struct winsize ws; 861 struct winsize ws;
742 862
743 ws.ws_col = TermWin.ncol; 863 ws.ws_col = ncol;
744 ws.ws_row = TermWin.nrow; 864 ws.ws_row = nrow;
745 ws.ws_xpixel = TermWin.width; 865 ws.ws_xpixel = width;
746 ws.ws_ypixel = TermWin.height; 866 ws.ws_ypixel = height;
747 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 867 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
748 868
749#if 0 869#if 0
750 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 870 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
751 if (cmd_pid) /* force through to the command */ 871 if (cmd_pid) /* force through to the command */
752 kill (cmd_pid, SIGWINCH); 872 kill (-cmd_pid, SIGWINCH);
753#endif 873#endif
754} 874}
755 875
756/*----------------------------------------------------------------------*/ 876/*----------------------------------------------------------------------*/
757/* set_fonts () - load and set the various fonts 877/* set_fonts () - load and set the various fonts
758/* 878 *
759 * init = 1 - initialize 879 * init = 1 - initialize
760 * 880 *
761 * fontname == FONT_UP - switch to bigger font 881 * fontname == FONT_UP - switch to bigger font
762 * fontname == FONT_DN - switch to smaller font 882 * fontname == FONT_DN - switch to smaller font
763 */ 883 */
… …
775 return false; 895 return false;
776 } 896 }
777 897
778#if ENABLE_STYLES 898#if ENABLE_STYLES
779 for (int i = RS_styleCount; --i; ) 899 for (int i = RS_styleCount; --i; )
780 if (TermWin.fontset[i] != TermWin.fontset[0]) 900 if (fontset[i] != fontset[0])
781 delete TermWin.fontset[i]; 901 delete fontset[i];
782#endif 902#endif
783 903
784 delete TermWin.fontset[0]; 904 delete fontset[0];
785 TermWin.fontset[0] = fs; 905 fontset[0] = fs;
786 906
787 prop = (*fs)[1]->properties (); 907 prop = (*fs)[1]->properties ();
908 prop.height += lineSpace;
788 fs->set_prop (prop); 909 fs->set_prop (prop);
789 910
790 TermWin.fwidth = prop.width; 911 fwidth = prop.width;
791 TermWin.fheight = prop.height; 912 fheight = prop.height;
792 TermWin.fweight = prop.weight;
793 TermWin.fslant = prop.slant;
794 TermWin.fbase = (*fs)[1]->ascent; 913 fbase = (*fs)[1]->ascent;
795 914
796 for (int style = 1; style < 4; style++) 915 for (int style = 1; style < 4; style++)
797 { 916 {
798#if ENABLE_STYLES 917#if ENABLE_STYLES
799 const char *res = rs[Rs_font + style]; 918 const char *res = rs[Rs_font + style];
800 919
801 if (res && !*res) 920 if (res && !*res)
802 TermWin.fontset[style] = TermWin.fontset[0]; 921 fontset[style] = fontset[0];
803 else 922 else
804 { 923 {
805 TermWin.fontset[style] = fs = new rxvt_fontset (this); 924 fontset[style] = fs = new rxvt_fontset (this);
806 rxvt_fontprop prop2 = prop; 925 rxvt_fontprop prop2 = prop;
807 926
808 if (res) 927 if (res)
809 prop2.weight = prop2.slant = rxvt_fontprop::unset; 928 prop2.weight = prop2.slant = rxvt_fontprop::unset;
810 else 929 else
811 { 930 {
812 res = TermWin.fontset[0]->fontdesc; 931 res = fontset[0]->fontdesc;
813 932
814 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 933 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
815 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 934 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
816 } 935 }
817 936
818 fs->populate (res); 937 fs->populate (res);
819 fs->set_prop (prop2); 938 fs->set_prop (prop2);
820 } 939 }
821#else 940#else
822 TermWin.fontset[style] = TermWin.fontset[0]; 941 fontset[style] = fontset[0];
823#endif 942#endif
824 } 943 }
825 944
826 if (TermWin.parent[0]) 945 if (parent[0])
827 { 946 {
828 resize_all_windows (0, 0, 0); 947 resize_all_windows (0, 0, 0);
829 scr_remap_chars (); 948 scr_remap_chars ();
830 scr_touch (true); 949 scr_touch (true);
831 } 950 }
… …
833 return true; 952 return true;
834} 953}
835 954
836void rxvt_term::set_string_property (Atom prop, const char *str, int len) 955void rxvt_term::set_string_property (Atom prop, const char *str, int len)
837{ 956{
838 // TODO: SMART_WINDOW_TITLE
839 XChangeProperty (display->display, TermWin.parent[0], 957 XChangeProperty (display->display, parent[0],
840 prop, XA_STRING, 8, PropModeReplace, 958 prop, XA_STRING, 8, PropModeReplace,
841 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 959 (const unsigned char *)str, len >= 0 ? len : strlen (str));
842} 960}
843 961
844void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 962void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
845{ 963{
846 // TODO: SMART_WINDOW_TITLE
847 wchar_t *ws = rxvt_mbstowcs (str, len); 964 wchar_t *ws = rxvt_mbstowcs (str, len);
848 char *s = rxvt_wcstoutf8 (ws); 965 char *s = rxvt_wcstoutf8 (ws);
849 966
850 XChangeProperty (display->display, TermWin.parent[0], 967 XChangeProperty (display->display, parent[0],
851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 968 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
852 (const unsigned char *)s, strlen (s)); 969 (const unsigned char *)s, strlen (s));
853 970
854 free (s); 971 free (s);
855 free (ws); 972 free (ws);
… …
860/* xterm sequences - title, iconName, color (exptl) */ 977/* xterm sequences - title, iconName, color (exptl) */
861void 978void
862rxvt_term::set_title (const char *str) 979rxvt_term::set_title (const char *str)
863{ 980{
864 set_string_property (XA_WM_NAME, str); 981 set_string_property (XA_WM_NAME, str);
865#if ENABLE_FRILLS 982#if ENABLE_EWMH
866 set_utf8_property (display->atom ("_NET_WM_NAME"), str); 983 set_utf8_property (xa[XA_NET_WM_NAME], str);
867#endif 984#endif
868} 985}
869 986
870void 987void
871rxvt_term::set_icon_name (const char *str) 988rxvt_term::set_icon_name (const char *str)
872{ 989{
873 set_string_property (XA_WM_ICON_NAME, str); 990 set_string_property (XA_WM_ICON_NAME, str);
874#if ENABLE_FRILLS 991#if ENABLE_EWMH
875 set_utf8_property (display->atom ("_NET_WM_ICON_NAME"), str); 992 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
876#endif 993#endif
877} 994}
878 995
879#ifdef XTERM_COLOR_CHANGE 996#ifdef XTERM_COLOR_CHANGE
880void 997void
… …
888 1005
889 /* handle color aliases */ 1006 /* handle color aliases */
890 if (isdigit (*color)) 1007 if (isdigit (*color))
891 { 1008 {
892 i = atoi (color); 1009 i = atoi (color);
1010
893 if (i >= 8 && i <= 15) 1011 if (i >= 8 && i <= 15)
894 { /* bright colors */ 1012 { /* bright colors */
895 i -= 8; 1013 i -= 8;
896# ifndef NO_BRIGHTCOLOR 1014# ifndef NO_BRIGHTCOLOR
897 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1015 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
898 SET_PIXCOLOR (idx); 1016 SET_PIXCOLOR (idx);
899 goto Done; 1017 goto done;
900# endif 1018# endif
901
902 } 1019 }
1020
903 if (i >= 0 && i <= 7) 1021 if (i >= 0 && i <= 7)
904 { /* normal colors */ 1022 { /* normal colors */
905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1023 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
906 SET_PIXCOLOR (idx); 1024 SET_PIXCOLOR (idx);
907 goto Done; 1025 goto done;
908 } 1026 }
909 } 1027 }
910 1028
911 if (!rXParseAllocColor (& xcol, color)) 1029 if (!rXParseAllocColor (&xcol, color))
912 return; 1030 return;
913 1031
914 /* XStoreColor (display->display, display->cmap, XColor*); */ 1032 /* XStoreColor (display->display, display->cmap, XColor*); */
915 1033
916 /* 1034 /*
… …
932 pix_colors_focused[idx] = xcol; 1050 pix_colors_focused[idx] = xcol;
933 SET_PIXCOLOR (idx); 1051 SET_PIXCOLOR (idx);
934 1052
935 /* XSetWindowAttributes attr; */ 1053 /* XSetWindowAttributes attr; */
936 /* Cursor cursor; */ 1054 /* Cursor cursor; */
937Done: 1055done:
1056
938#ifdef OFF_FOCUS_FADING 1057#if OFF_FOCUS_FADING
939 if (rs[Rs_fade]) 1058 if (rs[Rs_fade])
940 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1059 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
941#endif 1060#endif
942 1061
943 /*TODO: handle Color_BD, scrollbar background, etc. */ 1062 /*TODO: handle Color_BD, scrollbar background, etc. */
944 1063
945 recolour_cursor (); 1064 recolour_cursor ();
… …
999 1118
1000 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1119 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1001} 1120}
1002 1121
1003/*----------------------------------------------------------------------*/ 1122/*----------------------------------------------------------------------*/
1004/*
1005 * Colour determination for low colour displays, routine from
1006 * Hans de Goede <hans@highrise.nl>
1007 */
1008 1123
1009int 1124int
1010rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1125rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1011{ 1126{
1012 if (!screen_in_out->set (display, colour)) 1127 if (!screen_in_out->set (display, colour))
… …
1020 1135
1021/* -------------------------------------------------------------------- * 1136/* -------------------------------------------------------------------- *
1022 * - WINDOW RESIZING - * 1137 * - WINDOW RESIZING - *
1023 * -------------------------------------------------------------------- */ 1138 * -------------------------------------------------------------------- */
1024void 1139void
1025rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1140rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1026{ 1141{
1027 int fix_screen; 1142 int fix_screen;
1028
1029#ifdef SMART_RESIZE
1030 int old_width = szHint.width, old_height = szHint.height; 1143 int old_width = szHint.width, old_height = szHint.height;
1031#endif 1144 dDisp;
1032 1145
1033 window_calc (width, height); 1146 window_calc (newwidth, newheight);
1034 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1147 XSetWMNormalHints (disp, parent[0], &szHint);
1035 1148
1036 if (!ignoreparent) 1149 if (!ignoreparent)
1037 { 1150 {
1038#ifdef SMART_RESIZE 1151#ifdef SMART_RESIZE
1039 /* 1152 /*
… …
1043 int x, y, x1, y1; 1156 int x, y, x1, y1;
1044 int dx, dy; 1157 int dx, dy;
1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1158 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1046 Window unused_cr; 1159 Window unused_cr;
1047 1160
1048 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1161 XTranslateCoordinates (disp, parent[0], display->root,
1049 0, 0, &x, &y, &unused_cr); 1162 0, 0, &x, &y, &unused_cr);
1050 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1163 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1164 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1052 /* 1165 /*
1053 * if display->root isn't the parent window, a WM will probably have offset 1166 * if display->root isn't the parent window, a WM will probably have offset
1054 * our position for handles and decorations. Counter it 1167 * our position for handles and decorations. Counter it
1055 */ 1168 */
… …
1057 { 1170 {
1058 x -= x1; 1171 x -= x1;
1059 y -= y1; 1172 y -= y1;
1060 } 1173 }
1061 1174
1062 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1175 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1063 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1176 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1064 dx = old_width - szHint.width; 1177 dx = old_width - szHint.width;
1065 dy = old_height - szHint.height; 1178 dy = old_height - szHint.height;
1066 1179
1067 /* Check position of the center of the window */ 1180 /* Check position of the center of the window */
1068 if (x < x1) /* left half */ 1181 if (x < x1) /* left half */
… …
1072 if (y < y1) /* top half */ 1185 if (y < y1) /* top half */
1073 dy = 0; 1186 dy = 0;
1074 else if (y == y1) /* exact center */ 1187 else if (y == y1) /* exact center */
1075 dy /= 2; 1188 dy /= 2;
1076 1189
1077 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1190 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1078 szHint.width, szHint.height); 1191 szHint.width, szHint.height);
1079#else 1192#else
1080 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1193 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1081#endif 1194#endif
1082 } 1195 }
1083 1196
1084 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1197 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1085 1198
1086 if (fix_screen || width != old_width || height != old_height) 1199 if (fix_screen || newwidth != old_width || newheight != old_height)
1087 { 1200 {
1088 if (scrollbar_visible ()) 1201 if (scrollbar_visible ())
1089 { 1202 {
1090 XMoveResizeWindow (display->display, scrollBar.win, 1203 XMoveResizeWindow (disp, scrollBar.win,
1091 window_sb_x, 0, 1204 window_sb_x, 0,
1092 scrollbar_TotalWidth (), szHint.height); 1205 scrollbar_TotalWidth (), szHint.height);
1093 resize_scrollbar (); 1206 resize_scrollbar ();
1094 } 1207 }
1095 1208
1096 if (menubar_visible ()) 1209 if (menubar_visible ())
1097 XMoveResizeWindow (display->display, menuBar.win, 1210 XMoveResizeWindow (disp, menuBar.win,
1098 window_vt_x, 0, 1211 window_vt_x, 0,
1099 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1212 TermWin_TotalWidth (), menuBar_TotalHeight ());
1100 1213
1101 XMoveResizeWindow (display->display, TermWin.vt, 1214 XMoveResizeWindow (disp, vt,
1102 window_vt_x, window_vt_y, 1215 window_vt_x, window_vt_y,
1103 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1216 TermWin_TotalWidth (), TermWin_TotalHeight ());
1217
1104 scr_clear (); 1218 scr_clear ();
1105#ifdef XPM_BACKGROUND 1219#ifdef XPM_BACKGROUND
1106 resize_pixmap (); 1220 resize_pixmap ();
1107#endif 1221#endif
1108 } 1222 }
… …
1113 int old_ncol = prev_ncol; 1227 int old_ncol = prev_ncol;
1114 1228
1115 /* scr_reset only works on the primary screen */ 1229 /* scr_reset only works on the primary screen */
1116 if (old_height) /* this is not the first time through */ 1230 if (old_height) /* this is not the first time through */
1117 { 1231 {
1118 unsigned int ncol = TermWin.ncol; 1232 unsigned int ocol = ncol;
1119 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1233 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1120 curr_screen = scr_change_screen (PRIMARY); 1234 curr_screen = scr_change_screen (PRIMARY);
1121 TermWin.ncol = ncol; 1235 ncol = ocol;
1122 } 1236 }
1123 1237
1124 scr_reset (); 1238 scr_reset ();
1125 1239
1126 if (curr_screen >= 0) /* this is not the first time through */ 1240 if (curr_screen >= 0) /* this is not the first time through */
1127 { 1241 {
1128 scr_change_screen (curr_screen); 1242 scr_change_screen (curr_screen);
1129 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1243 selection_check (old_ncol != ncol ? 4 : 0);
1130 } 1244 }
1131 } 1245 }
1132 1246
1133 old_width = szHint.width; 1247 old_width = szHint.width;
1134 old_height = szHint.height; 1248 old_height = szHint.height;
1249
1250#ifdef XPM_BACKGROUND
1251 if (pixmap)
1252 scr_touch (false);
1253#endif
1135 1254
1136#ifdef USE_XIM 1255#ifdef USE_XIM
1137 IMSetStatusPosition (); 1256 IMSetStatusPosition ();
1138#endif 1257#endif
1139} 1258}
… …
1141/* 1260/*
1142 * Set the width/height of the vt window in characters. Units are pixels. 1261 * Set the width/height of the vt window in characters. Units are pixels.
1143 * good for toggling 80/132 columns 1262 * good for toggling 80/132 columns
1144 */ 1263 */
1145void 1264void
1146rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1265rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1147{ 1266{
1148 XWindowAttributes wattr; 1267 XWindowAttributes wattr;
1149 1268
1150 if (width == 0 || height == 0) 1269 if (newwidth == 0 || newheight == 0)
1151 { 1270 {
1152 XGetWindowAttributes (display->display, display->root, &wattr); 1271 XGetWindowAttributes (display->display, display->root, &wattr);
1272
1153 if (width == 0) 1273 if (newwidth == 0)
1154 width = wattr.width - szHint.base_width; 1274 newwidth = wattr.width - szHint.base_width;
1155 if (height == 0) 1275 if (newheight == 0)
1156 height = wattr.height - szHint.base_height; 1276 newheight = wattr.height - szHint.base_height;
1157 }
1158
1159 if (width != TermWin.width || height != TermWin.height)
1160 { 1277 }
1278
1279 if (newwidth != width || newheight != height)
1280 {
1161 width += szHint.base_width; 1281 newwidth += szHint.base_width;
1162 height += szHint.base_height; 1282 newheight += szHint.base_height;
1163 resize_all_windows (width, height, 0); 1283 resize_all_windows (newwidth, newheight, 0);
1164 } 1284 }
1165} 1285}
1166 1286
1167/* -------------------------------------------------------------------- * 1287/* -------------------------------------------------------------------- *
1168 * - X INPUT METHOD ROUTINES - * 1288 * - X INPUT METHOD ROUTINES - *
… …
1178 1298
1179void 1299void
1180rxvt_term::im_set_size (XRectangle &size) 1300rxvt_term::im_set_size (XRectangle &size)
1181{ 1301{
1182 // the int_bwidth terms make no sense to me 1302 // the int_bwidth terms make no sense to me
1183 size.x = TermWin.int_bwidth; 1303 size.x = int_bwidth;
1184 size.y = TermWin.int_bwidth; 1304 size.y = int_bwidth;
1185 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1305 size.width = Width2Pixel (ncol) + int_bwidth;
1186 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1306 size.height = Height2Pixel (nrow) + int_bwidth;
1187} 1307}
1188 1308
1189void 1309void
1190rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1310rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1191 XRectangle &status_rect, 1311 XRectangle &status_rect,
1192 const XRectangle &needed_rect) 1312 const XRectangle &needed_rect)
1193{ 1313{
1194 preedit_rect.x = needed_rect.width; 1314 preedit_rect.x = needed_rect.width;
1195 preedit_rect.y = 0; 1315 preedit_rect.y = 0;
1196 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1316 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1197 preedit_rect.height = TermWin.fheight; 1317 preedit_rect.height = fheight;
1198 1318
1199 status_rect.x = 0; 1319 status_rect.x = 0;
1200 status_rect.y = 0; 1320 status_rect.y = 0;
1201 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1321 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1202 status_rect.height = TermWin.fheight; 1322 status_rect.height = fheight;
1203} 1323}
1204 1324
1205/* Checking whether input method is running. */ 1325/* Checking whether input method is running. */
1206bool 1326bool
1207rxvt_term::IMisRunning () 1327rxvt_term::IMisRunning ()
… …
1235{ 1355{
1236 XPoint nspot; 1356 XPoint nspot;
1237 XVaNestedList preedit_attr; 1357 XVaNestedList preedit_attr;
1238 1358
1239 if (!Input_Context 1359 if (!Input_Context
1240 || !TermWin.focus 1360 || !focus
1241 || !(input_style & XIMPreeditPosition)) 1361 || !(input_style & XIMPreeditPosition))
1242 return; 1362 return;
1243 1363
1244 im_set_position (nspot); 1364 im_set_position (nspot);
1245 1365
… …
1365 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1485 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1366 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1486 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1367 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1487 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1368 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1488 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1369 "*", 1489 "*",
1370 TermWin.fheight, 1490 fheight,
1371 TermWin.fheight + 1, TermWin.fheight - 1, 1491 fheight + 1, fheight - 1,
1372 TermWin.fheight - 2, TermWin.fheight + 2); 1492 fheight - 2, fheight + 2);
1373 1493
1374 fs = XCreateFontSet (display->display, pat, 1494 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1375 &missing_charset_list, &missing_charset_count, &def_string); 1495 &missing_charset_list, &missing_charset_count, &def_string);
1376 1496
1377 if (missing_charset_list) 1497 if (missing_charset_list)
1378 XFreeStringList (missing_charset_list); 1498 XFreeStringList (missing_charset_list);
1379 1499
… …
1423 NULL); 1543 NULL);
1424 } 1544 }
1425 1545
1426 Input_Context = XCreateIC (xim, 1546 Input_Context = XCreateIC (xim,
1427 XNInputStyle, input_style, 1547 XNInputStyle, input_style,
1428 XNClientWindow, TermWin.vt, 1548 XNClientWindow, vt,
1429 XNFocusWindow, TermWin.parent[0], 1549 XNFocusWindow, parent[0],
1430 preedit_attr ? XNPreeditAttributes : NULL, 1550 preedit_attr ? XNPreeditAttributes : NULL,
1431 preedit_attr, 1551 preedit_attr,
1432 status_attr ? XNStatusAttributes : NULL, 1552 status_attr ? XNStatusAttributes : NULL,
1433 status_attr, NULL); 1553 status_attr, NULL);
1434 1554
… …
1451} 1571}
1452 1572
1453void 1573void
1454rxvt_term::im_cb () 1574rxvt_term::im_cb ()
1455{ 1575{
1456 int i, found, had_im; 1576 int i;
1457 const char *p; 1577 const char *p;
1458 char **s; 1578 char **s;
1459 char buf[IMBUFSIZ]; 1579 char buf[IMBUFSIZ];
1580
1581 SET_R (this);
1460 1582
1461 im_destroy (); 1583 im_destroy ();
1462 1584
1463 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1585 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1464 if (Input_Context) 1586 if (Input_Context)
… …
1516{ 1638{
1517 XRectangle preedit_rect, status_rect, *needed_rect; 1639 XRectangle preedit_rect, status_rect, *needed_rect;
1518 XVaNestedList preedit_attr, status_attr; 1640 XVaNestedList preedit_attr, status_attr;
1519 1641
1520 if (!Input_Context 1642 if (!Input_Context
1521 || !TermWin.focus 1643 || !focus
1522 || !(input_style & XIMPreeditArea) 1644 || !(input_style & XIMPreeditArea)
1523 || !IMisRunning ()) 1645 || !IMisRunning ())
1524 return; 1646 return;
1525 1647
1526 /* Getting the necessary width of preedit area */ 1648 /* Getting the necessary width of preedit area */

Diff Legend

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