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

Diff Legend

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