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.152 by root, Thu Dec 22 16:44:10 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);
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 (!(options & 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
… …
351 scrollBar.setIdle (); /* set existence for size calculations */ 475 scrollBar.setIdle (); /* set existence for size calculations */
352#endif 476#endif
353 477
354 create_windows (argc, argv); 478 create_windows (argc, argv);
355 479
480 dDisp;
481
356 init_xlocale (); 482 init_xlocale ();
357 483
358 scr_reset (); /* initialize screen */ 484 scr_reset (); /* initialize screen */
359 485
360#if 0 486#if 0
361 XSynchronize (display->display, True); 487 XSynchronize (disp, True);
362#endif 488#endif
363 489
364#ifdef HAVE_SCROLLBARS 490#ifdef HAVE_SCROLLBARS
365 if (options & Opt_scrollBar) 491 if (options & Opt_scrollBar)
366 resize_scrollbar (); /* create and map scrollbar */ 492 resize_scrollbar (); /* create and map scrollbar */
367#endif 493#endif
368#if (MENUBAR_MAX) 494#if (MENUBAR_MAX)
369 if (menubar_visible ()) 495 if (menubar_visible ())
370 XMapWindow (display->display, menuBar.win); 496 XMapWindow (disp, menuBar.win);
371#endif 497#endif
372#ifdef TRANSPARENT 498#ifdef TRANSPARENT
373 if (options & Opt_transparent) 499 if (options & Opt_transparent)
374 { 500 {
375 XSelectInput (display->display, display->root, PropertyChangeMask); 501 XSelectInput (disp, display->root, PropertyChangeMask);
376 check_our_parents (); 502 check_our_parents ();
377 rootwin_ev.start (display, display->root); 503 rootwin_ev.start (display, display->root);
378 } 504 }
379#endif 505#endif
380 506
381 XMapWindow (display->display, TermWin.vt); 507 XMapWindow (disp, vt);
382 XMapWindow (display->display, TermWin.parent[0]); 508 XMapWindow (disp, parent[0]);
383 509
384 set_colorfgbg (); 510 set_colorfgbg ();
385 511
386 init_command (cmd_argv); 512 init_command (cmd_argv);
387 513
514 free (cmd_argv);
515
388 pty_ev.start (pty.pty, EVENT_READ); 516 pty_ev.start (pty.pty, EVENT_READ);
389 517
390 check_ev.start (); 518 check_ev.start ();
391 519
392 return true; 520 return true;
393} 521}
394 522
395static 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;
396 562
397void 563void
398rxvt_init () 564rxvt_init ()
399{ 565{
400 /* 566 /*
… …
408 rxvt_privileges (IGNORE); 574 rxvt_privileges (IGNORE);
409 575
410 signal (SIGHUP, SIG_IGN); 576 signal (SIGHUP, SIG_IGN);
411 signal (SIGPIPE, SIG_IGN); 577 signal (SIGPIPE, SIG_IGN);
412 578
579 sig_handlers.sw_chld.start (SIGCHLD);
580 sig_handlers.sw_term.start (SIGTERM);
581 sig_handlers.sw_int.start (SIGINT);
582
413 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 583 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
414 /* signal (SIGURG, SIG_DFL); */ 584 /* signal (SIGURG, SIG_DFL); */
415 585
416 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
417 // TODO: handle this with exceptions and tolerate the memory loss 587 // TODO: handle this with exceptions and tolerate the memory loss
418 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 588 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} 589}
484 590
485/* ------------------------------------------------------------------------- * 591/* ------------------------------------------------------------------------- *
486 * MEMORY ALLOCATION WRAPPERS * 592 * MEMORY ALLOCATION WRAPPERS *
487 * ------------------------------------------------------------------------- */ 593 * ------------------------------------------------------------------------- */
… …
494 rxvt_fatal ("memory allocation failure. aborting.\n"); 600 rxvt_fatal ("memory allocation failure. aborting.\n");
495 601
496 return p; 602 return p;
497} 603}
498 604
499/* INTPROTO */ 605void *
500void *
501rxvt_calloc (size_t number, size_t size) 606rxvt_calloc (size_t number, size_t size)
502{ 607{
503 void *p = calloc (number, size); 608 void *p = calloc (number, size);
504 609
505 if (!p) 610 if (!p)
506 rxvt_fatal ("memory allocation failure. aborting.\n"); 611 rxvt_fatal ("memory allocation failure. aborting.\n");
507 612
508 return p; 613 return p;
509} 614}
510 615
511/* INTPROTO */
512void * 616void *
513rxvt_realloc (void *ptr, size_t size) 617rxvt_realloc (void *ptr, size_t size)
514{ 618{
515 void *p = realloc (ptr, size); 619 void *p = realloc (ptr, size);
516 620
… …
598/* 702/*
599 * window size/position calculcations for XSizeHint and other storage. 703 * window size/position calculcations for XSizeHint and other storage.
600 * if width/height are non-zero then override calculated width/height 704 * if width/height are non-zero then override calculated width/height
601 */ 705 */
602void 706void
603rxvt_term::window_calc (unsigned int width, unsigned int height) 707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
604{ 708{
605 short recalc_x, recalc_y; 709 short recalc_x, recalc_y;
606 int x, y, sb_w, mb_h, flags; 710 int x, y, sb_w, mb_h, flags;
607 unsigned int w, h; 711 unsigned int w, h;
608 unsigned int max_width, max_height; 712 unsigned int max_width, max_height;
713 dDisp;
609 714
610 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",
611 TermWin.ncol, TermWin.nrow, szHint.width, 716 ncol, nrow, szHint.width, szHint.height));
612 szHint.height)); 717
613 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 718 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
614 szHint.win_gravity = NorthWestGravity; 719 szHint.win_gravity = NorthWestGravity;
615 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 720 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
616 721
617 recalc_x = recalc_y = 0; 722 recalc_x = recalc_y = 0;
618 flags = 0; 723 flags = 0;
724
619 if (!parsed_geometry) 725 if (!parsed_geometry)
620 { 726 {
621 parsed_geometry = 1; 727 parsed_geometry = 1;
728
622 if (rs[Rs_geometry]) 729 if (rs[Rs_geometry])
623 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 730 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
731
624 if (flags & WidthValue) 732 if (flags & WidthValue)
625 { 733 {
626 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 734 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
627 szHint.flags |= USSize; 735 szHint.flags |= USSize;
628 } 736 }
737
629 if (flags & HeightValue) 738 if (flags & HeightValue)
630 { 739 {
631 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 740 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
632 szHint.flags |= USSize; 741 szHint.flags |= USSize;
633 } 742 }
743
634 if (flags & XValue) 744 if (flags & XValue)
635 { 745 {
636 szHint.x = x; 746 szHint.x = x;
637 szHint.flags |= USPosition; 747 szHint.flags |= USPosition;
748
638 if (flags & XNegative) 749 if (flags & XNegative)
639 { 750 {
640 recalc_x = 1; 751 recalc_x = 1;
641 szHint.win_gravity = NorthEastGravity; 752 szHint.win_gravity = NorthEastGravity;
642 } 753 }
643 } 754 }
755
644 if (flags & YValue) 756 if (flags & YValue)
645 { 757 {
646 szHint.y = y; 758 szHint.y = y;
647 szHint.flags |= USPosition; 759 szHint.flags |= USPosition;
760
648 if (flags & YNegative) 761 if (flags & YNegative)
649 { 762 {
650 recalc_y = 1; 763 recalc_y = 1;
764
651 if (szHint.win_gravity == NorthEastGravity) 765 if (szHint.win_gravity == NorthEastGravity)
652 szHint.win_gravity = SouthEastGravity; 766 szHint.win_gravity = SouthEastGravity;
653 else 767 else
654 szHint.win_gravity = SouthWestGravity; 768 szHint.win_gravity = SouthWestGravity;
655 } 769 }
656 } 770 }
657 } 771 }
658 772
659 /* TODO: BOUNDS */ 773 /* TODO: BOUNDS */
660 TermWin.width = TermWin.ncol * TermWin.fwidth; 774 width = ncol * fwidth;
661 TermWin.height = TermWin.nrow * TermWin.fheight; 775 height = nrow * fheight;
662 max_width = MAX_COLS * TermWin.fwidth; 776 max_width = MAX_COLS * fwidth;
663 max_height = MAX_ROWS * TermWin.fheight; 777 max_height = MAX_ROWS * fheight;
664 778
665 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 779 szHint.base_width = szHint.base_height = 2 * int_bwidth;
666 780
667 sb_w = mb_h = 0; 781 sb_w = mb_h = 0;
668 window_vt_x = window_vt_y = TermWin.int_bwidth; 782 window_vt_x = window_vt_y = int_bwidth;
669 783
670 if (scrollbar_visible ()) 784 if (scrollbar_visible ())
671 { 785 {
672 sb_w = scrollbar_TotalWidth (); 786 sb_w = scrollbar_TotalWidth ();
673 szHint.base_width += sb_w; 787 szHint.base_width += sb_w;
… …
680 mb_h = menuBar_TotalHeight (); 794 mb_h = menuBar_TotalHeight ();
681 szHint.base_height += mb_h; 795 szHint.base_height += mb_h;
682 window_vt_y += mb_h; 796 window_vt_y += mb_h;
683 } 797 }
684 798
685 szHint.width_inc = TermWin.fwidth; 799 szHint.width_inc = fwidth;
686 szHint.height_inc = TermWin.fheight; 800 szHint.height_inc = fheight;
687 szHint.min_width = szHint.base_width + szHint.width_inc; 801 szHint.min_width = szHint.base_width + szHint.width_inc;
688 szHint.min_height = szHint.base_height + szHint.height_inc; 802 szHint.min_height = szHint.base_height + szHint.height_inc;
689 803
690 if (width && width - szHint.base_width < max_width) 804 if (newwidth && newwidth - szHint.base_width < max_width)
691 { 805 {
692 szHint.width = width; 806 szHint.width = newwidth;
693 TermWin.width = width - szHint.base_width; 807 width = newwidth - szHint.base_width;
694 } 808 }
695 else 809 else
696 { 810 {
697 MIN_IT (TermWin.width, max_width); 811 min_it (width, max_width);
698 szHint.width = szHint.base_width + TermWin.width; 812 szHint.width = szHint.base_width + width;
699 } 813 }
700 814
701 if (height && height - szHint.base_height < max_height) 815 if (newheight && newheight - szHint.base_height < max_height)
702 { 816 {
703 szHint.height = height; 817 szHint.height = newheight;
704 TermWin.height = height - szHint.base_height; 818 height = newheight - szHint.base_height;
705 } 819 }
706 else 820 else
707 { 821 {
708 MIN_IT (TermWin.height, max_height); 822 min_it (height, max_height);
709 szHint.height = szHint.base_height + TermWin.height; 823 szHint.height = szHint.base_height + height;
710 } 824 }
711 825
712 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 826 if (scrollbar_visible () && (options & Opt_scrollBar_right))
713 window_sb_x = szHint.width - sb_w; 827 window_sb_x = szHint.width - sb_w;
714 828
715 if (recalc_x) 829 if (recalc_x)
716 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
717 - szHint.width - 2 * TermWin.ext_bwidth);
718 if (recalc_y) 831 if (recalc_y)
719 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 832 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
720 - szHint.height - 2 * TermWin.ext_bwidth);
721 833
722 TermWin.ncol = TermWin.width / TermWin.fwidth; 834 ncol = width / fwidth;
723 TermWin.nrow = TermWin.height / TermWin.fheight; 835 nrow = height / fheight;
724 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",
725 TermWin.ncol, TermWin.nrow, szHint.width, 837 ncol, nrow, szHint.width,
726 szHint.height)); 838 szHint.height));
727 return; 839 return;
728} 840}
729 841
730/*----------------------------------------------------------------------*/ 842/*----------------------------------------------------------------------*/
… …
738 if (pty.pty < 0) 850 if (pty.pty < 0)
739 return; 851 return;
740 852
741 struct winsize ws; 853 struct winsize ws;
742 854
743 ws.ws_col = TermWin.ncol; 855 ws.ws_col = ncol;
744 ws.ws_row = TermWin.nrow; 856 ws.ws_row = nrow;
745 ws.ws_xpixel = TermWin.width; 857 ws.ws_xpixel = width;
746 ws.ws_ypixel = TermWin.height; 858 ws.ws_ypixel = height;
747 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
748 860
749#if 0 861#if 0
750 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
751 if (cmd_pid) /* force through to the command */ 863 if (cmd_pid) /* force through to the command */
752 kill (cmd_pid, SIGWINCH); 864 kill (-cmd_pid, SIGWINCH);
753#endif 865#endif
754} 866}
755 867
756/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
757/* set_fonts () - load and set the various fonts 869/* set_fonts () - load and set the various fonts
758/* 870 *
759 * init = 1 - initialize 871 * init = 1 - initialize
760 * 872 *
761 * fontname == FONT_UP - switch to bigger font 873 * fontname == FONT_UP - switch to bigger font
762 * fontname == FONT_DN - switch to smaller font 874 * fontname == FONT_DN - switch to smaller font
763 */ 875 */
… …
775 return false; 887 return false;
776 } 888 }
777 889
778#if ENABLE_STYLES 890#if ENABLE_STYLES
779 for (int i = RS_styleCount; --i; ) 891 for (int i = RS_styleCount; --i; )
780 if (TermWin.fontset[i] != TermWin.fontset[0]) 892 if (fontset[i] != fontset[0])
781 delete TermWin.fontset[i]; 893 delete fontset[i];
782#endif 894#endif
783 895
784 delete TermWin.fontset[0]; 896 delete fontset[0];
785 TermWin.fontset[0] = fs; 897 fontset[0] = fs;
786 898
787 prop = (*fs)[1]->properties (); 899 prop = (*fs)[1]->properties ();
900 prop.height += lineSpace;
788 fs->set_prop (prop); 901 fs->set_prop (prop);
789 902
790 TermWin.fwidth = prop.width; 903 fwidth = prop.width;
791 TermWin.fheight = prop.height; 904 fheight = prop.height;
792 TermWin.fweight = prop.weight;
793 TermWin.fslant = prop.slant;
794 TermWin.fbase = (*fs)[1]->ascent; 905 fbase = (*fs)[1]->ascent;
795 906
796 for (int style = 1; style < 4; style++) 907 for (int style = 1; style < 4; style++)
797 { 908 {
798#if ENABLE_STYLES 909#if ENABLE_STYLES
799 const char *res = rs[Rs_font + style]; 910 const char *res = rs[Rs_font + style];
800 911
801 if (res && !*res) 912 if (res && !*res)
802 TermWin.fontset[style] = TermWin.fontset[0]; 913 fontset[style] = fontset[0];
803 else 914 else
804 { 915 {
805 TermWin.fontset[style] = fs = new rxvt_fontset (this); 916 fontset[style] = fs = new rxvt_fontset (this);
806 rxvt_fontprop prop2 = prop; 917 rxvt_fontprop prop2 = prop;
807 918
808 if (res) 919 if (res)
809 prop2.weight = prop2.slant = rxvt_fontprop::unset; 920 prop2.weight = prop2.slant = rxvt_fontprop::unset;
810 else 921 else
811 { 922 {
812 res = TermWin.fontset[0]->fontdesc; 923 res = fontset[0]->fontdesc;
813 924
814 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;
815 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;
816 } 927 }
817 928
818 fs->populate (res); 929 fs->populate (res);
819 fs->set_prop (prop2); 930 fs->set_prop (prop2);
820 } 931 }
821#else 932#else
822 TermWin.fontset[style] = TermWin.fontset[0]; 933 fontset[style] = fontset[0];
823#endif 934#endif
824 } 935 }
825 936
826 if (TermWin.parent[0]) 937 if (parent[0])
827 { 938 {
828 resize_all_windows (0, 0, 0); 939 resize_all_windows (0, 0, 0);
829 scr_remap_chars (); 940 scr_remap_chars ();
830 scr_touch (true); 941 scr_touch (true);
831 } 942 }
… …
834} 945}
835 946
836void 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)
837{ 948{
838 // TODO: SMART_WINDOW_TITLE 949 // TODO: SMART_WINDOW_TITLE
839 XChangeProperty (display->display, TermWin.parent[0], 950 XChangeProperty (display->display, parent[0],
840 prop, XA_STRING, 8, PropModeReplace, 951 prop, XA_STRING, 8, PropModeReplace,
841 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 952 (const unsigned char *)str, len >= 0 ? len : strlen (str));
842} 953}
843 954
844void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 955void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
845{ 956{
846 // TODO: SMART_WINDOW_TITLE 957 // TODO: SMART_WINDOW_TITLE
847 wchar_t *ws = rxvt_mbstowcs (str, len); 958 wchar_t *ws = rxvt_mbstowcs (str, len);
848 char *s = rxvt_wcstoutf8 (ws); 959 char *s = rxvt_wcstoutf8 (ws);
849 960
850 XChangeProperty (display->display, TermWin.parent[0], 961 XChangeProperty (display->display, parent[0],
851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 962 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
852 (const unsigned char *)s, strlen (s)); 963 (const unsigned char *)s, strlen (s));
853 964
854 free (s); 965 free (s);
855 free (ws); 966 free (ws);
… …
860/* xterm sequences - title, iconName, color (exptl) */ 971/* xterm sequences - title, iconName, color (exptl) */
861void 972void
862rxvt_term::set_title (const char *str) 973rxvt_term::set_title (const char *str)
863{ 974{
864 set_string_property (XA_WM_NAME, str); 975 set_string_property (XA_WM_NAME, str);
865#if ENABLE_FRILLS 976#if ENABLE_EWMH
866 set_utf8_property (display->atom ("_NET_WM_NAME"), str); 977 set_utf8_property (xa[XA_NET_WM_NAME], str);
867#endif 978#endif
868} 979}
869 980
870void 981void
871rxvt_term::set_icon_name (const char *str) 982rxvt_term::set_icon_name (const char *str)
872{ 983{
873 set_string_property (XA_WM_ICON_NAME, str); 984 set_string_property (XA_WM_ICON_NAME, str);
874#if ENABLE_FRILLS 985#if ENABLE_EWMH
875 set_utf8_property (display->atom ("_NET_WM_ICON_NAME"), str); 986 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
876#endif 987#endif
877} 988}
878 989
879#ifdef XTERM_COLOR_CHANGE 990#ifdef XTERM_COLOR_CHANGE
880void 991void
… …
888 999
889 /* handle color aliases */ 1000 /* handle color aliases */
890 if (isdigit (*color)) 1001 if (isdigit (*color))
891 { 1002 {
892 i = atoi (color); 1003 i = atoi (color);
1004
893 if (i >= 8 && i <= 15) 1005 if (i >= 8 && i <= 15)
894 { /* bright colors */ 1006 { /* bright colors */
895 i -= 8; 1007 i -= 8;
896# ifndef NO_BRIGHTCOLOR 1008# ifndef NO_BRIGHTCOLOR
897 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1009 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
898 SET_PIXCOLOR (idx); 1010 SET_PIXCOLOR (idx);
899 goto Done; 1011 goto done;
900# endif 1012# endif
901
902 } 1013 }
1014
903 if (i >= 0 && i <= 7) 1015 if (i >= 0 && i <= 7)
904 { /* normal colors */ 1016 { /* normal colors */
905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1017 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
906 SET_PIXCOLOR (idx); 1018 SET_PIXCOLOR (idx);
907 goto Done; 1019 goto done;
908 } 1020 }
909 } 1021 }
910 1022
911 if (!rXParseAllocColor (& xcol, color)) 1023 if (!rXParseAllocColor (&xcol, color))
912 return; 1024 return;
913 1025
914 /* XStoreColor (display->display, display->cmap, XColor*); */ 1026 /* XStoreColor (display->display, display->cmap, XColor*); */
915 1027
916 /* 1028 /*
… …
932 pix_colors_focused[idx] = xcol; 1044 pix_colors_focused[idx] = xcol;
933 SET_PIXCOLOR (idx); 1045 SET_PIXCOLOR (idx);
934 1046
935 /* XSetWindowAttributes attr; */ 1047 /* XSetWindowAttributes attr; */
936 /* Cursor cursor; */ 1048 /* Cursor cursor; */
937Done: 1049done:
1050
938#ifdef OFF_FOCUS_FADING 1051#if OFF_FOCUS_FADING
939 if (rs[Rs_fade]) 1052 if (rs[Rs_fade])
940 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1053 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
941#endif 1054#endif
942 1055
943 /*TODO: handle Color_BD, scrollbar background, etc. */ 1056 /*TODO: handle Color_BD, scrollbar background, etc. */
944 1057
945 recolour_cursor (); 1058 recolour_cursor ();
… …
999 1112
1000 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1113 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1001} 1114}
1002 1115
1003/*----------------------------------------------------------------------*/ 1116/*----------------------------------------------------------------------*/
1004/*
1005 * Colour determination for low colour displays, routine from
1006 * Hans de Goede <hans@highrise.nl>
1007 */
1008 1117
1009int 1118int
1010rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1119rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1011{ 1120{
1012 if (!screen_in_out->set (display, colour)) 1121 if (!screen_in_out->set (display, colour))
… …
1020 1129
1021/* -------------------------------------------------------------------- * 1130/* -------------------------------------------------------------------- *
1022 * - WINDOW RESIZING - * 1131 * - WINDOW RESIZING - *
1023 * -------------------------------------------------------------------- */ 1132 * -------------------------------------------------------------------- */
1024void 1133void
1025rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1134rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1026{ 1135{
1027 int fix_screen; 1136 int fix_screen;
1028
1029#ifdef SMART_RESIZE
1030 int old_width = szHint.width, old_height = szHint.height; 1137 int old_width = szHint.width, old_height = szHint.height;
1031#endif 1138 dDisp;
1032 1139
1033 window_calc (width, height); 1140 window_calc (newwidth, newheight);
1034 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1141 XSetWMNormalHints (disp, parent[0], &szHint);
1035 1142
1036 if (!ignoreparent) 1143 if (!ignoreparent)
1037 { 1144 {
1038#ifdef SMART_RESIZE 1145#ifdef SMART_RESIZE
1039 /* 1146 /*
… …
1043 int x, y, x1, y1; 1150 int x, y, x1, y1;
1044 int dx, dy; 1151 int dx, dy;
1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1152 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1046 Window unused_cr; 1153 Window unused_cr;
1047 1154
1048 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1155 XTranslateCoordinates (disp, parent[0], display->root,
1049 0, 0, &x, &y, &unused_cr); 1156 0, 0, &x, &y, &unused_cr);
1050 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1157 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1158 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1052 /* 1159 /*
1053 * if display->root isn't the parent window, a WM will probably have offset 1160 * if display->root isn't the parent window, a WM will probably have offset
1054 * our position for handles and decorations. Counter it 1161 * our position for handles and decorations. Counter it
1055 */ 1162 */
… …
1057 { 1164 {
1058 x -= x1; 1165 x -= x1;
1059 y -= y1; 1166 y -= y1;
1060 } 1167 }
1061 1168
1062 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1169 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1063 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1170 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1064 dx = old_width - szHint.width; 1171 dx = old_width - szHint.width;
1065 dy = old_height - szHint.height; 1172 dy = old_height - szHint.height;
1066 1173
1067 /* Check position of the center of the window */ 1174 /* Check position of the center of the window */
1068 if (x < x1) /* left half */ 1175 if (x < x1) /* left half */
… …
1072 if (y < y1) /* top half */ 1179 if (y < y1) /* top half */
1073 dy = 0; 1180 dy = 0;
1074 else if (y == y1) /* exact center */ 1181 else if (y == y1) /* exact center */
1075 dy /= 2; 1182 dy /= 2;
1076 1183
1077 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1184 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1078 szHint.width, szHint.height); 1185 szHint.width, szHint.height);
1079#else 1186#else
1080 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1187 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1081#endif 1188#endif
1082 } 1189 }
1083 1190
1084 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1191 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1085 1192
1086 if (fix_screen || width != old_width || height != old_height) 1193 if (fix_screen || newwidth != old_width || newheight != old_height)
1087 { 1194 {
1088 if (scrollbar_visible ()) 1195 if (scrollbar_visible ())
1089 { 1196 {
1090 XMoveResizeWindow (display->display, scrollBar.win, 1197 XMoveResizeWindow (disp, scrollBar.win,
1091 window_sb_x, 0, 1198 window_sb_x, 0,
1092 scrollbar_TotalWidth (), szHint.height); 1199 scrollbar_TotalWidth (), szHint.height);
1093 resize_scrollbar (); 1200 resize_scrollbar ();
1094 } 1201 }
1095 1202
1096 if (menubar_visible ()) 1203 if (menubar_visible ())
1097 XMoveResizeWindow (display->display, menuBar.win, 1204 XMoveResizeWindow (disp, menuBar.win,
1098 window_vt_x, 0, 1205 window_vt_x, 0,
1099 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1206 TermWin_TotalWidth (), menuBar_TotalHeight ());
1100 1207
1101 XMoveResizeWindow (display->display, TermWin.vt, 1208 XMoveResizeWindow (disp, vt,
1102 window_vt_x, window_vt_y, 1209 window_vt_x, window_vt_y,
1103 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1210 TermWin_TotalWidth (), TermWin_TotalHeight ());
1211
1104 scr_clear (); 1212 scr_clear ();
1105#ifdef XPM_BACKGROUND 1213#ifdef XPM_BACKGROUND
1106 resize_pixmap (); 1214 resize_pixmap ();
1107#endif 1215#endif
1108 } 1216 }
… …
1113 int old_ncol = prev_ncol; 1221 int old_ncol = prev_ncol;
1114 1222
1115 /* scr_reset only works on the primary screen */ 1223 /* scr_reset only works on the primary screen */
1116 if (old_height) /* this is not the first time through */ 1224 if (old_height) /* this is not the first time through */
1117 { 1225 {
1118 unsigned int ncol = TermWin.ncol; 1226 unsigned int ocol = ncol;
1119 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1227 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1120 curr_screen = scr_change_screen (PRIMARY); 1228 curr_screen = scr_change_screen (PRIMARY);
1121 TermWin.ncol = ncol; 1229 ncol = ocol;
1122 } 1230 }
1123 1231
1124 scr_reset (); 1232 scr_reset ();
1125 1233
1126 if (curr_screen >= 0) /* this is not the first time through */ 1234 if (curr_screen >= 0) /* this is not the first time through */
1127 { 1235 {
1128 scr_change_screen (curr_screen); 1236 scr_change_screen (curr_screen);
1129 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1237 selection_check (old_ncol != ncol ? 4 : 0);
1130 } 1238 }
1131 } 1239 }
1132 1240
1133 old_width = szHint.width; 1241 old_width = szHint.width;
1134 old_height = szHint.height; 1242 old_height = szHint.height;
1243
1244#ifdef XPM_BACKGROUND
1245 if (pixmap)
1246 scr_touch (false);
1247#endif
1135 1248
1136#ifdef USE_XIM 1249#ifdef USE_XIM
1137 IMSetStatusPosition (); 1250 IMSetStatusPosition ();
1138#endif 1251#endif
1139} 1252}
… …
1141/* 1254/*
1142 * Set the width/height of the vt window in characters. Units are pixels. 1255 * Set the width/height of the vt window in characters. Units are pixels.
1143 * good for toggling 80/132 columns 1256 * good for toggling 80/132 columns
1144 */ 1257 */
1145void 1258void
1146rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1259rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1147{ 1260{
1148 XWindowAttributes wattr; 1261 XWindowAttributes wattr;
1149 1262
1150 if (width == 0 || height == 0) 1263 if (newwidth == 0 || newheight == 0)
1151 { 1264 {
1152 XGetWindowAttributes (display->display, display->root, &wattr); 1265 XGetWindowAttributes (display->display, display->root, &wattr);
1266
1153 if (width == 0) 1267 if (newwidth == 0)
1154 width = wattr.width - szHint.base_width; 1268 newwidth = wattr.width - szHint.base_width;
1155 if (height == 0) 1269 if (newheight == 0)
1156 height = wattr.height - szHint.base_height; 1270 newheight = wattr.height - szHint.base_height;
1157 }
1158
1159 if (width != TermWin.width || height != TermWin.height)
1160 { 1271 }
1272
1273 if (newwidth != width || newheight != height)
1274 {
1161 width += szHint.base_width; 1275 newwidth += szHint.base_width;
1162 height += szHint.base_height; 1276 newheight += szHint.base_height;
1163 resize_all_windows (width, height, 0); 1277 resize_all_windows (newwidth, newheight, 0);
1164 } 1278 }
1165} 1279}
1166 1280
1167/* -------------------------------------------------------------------- * 1281/* -------------------------------------------------------------------- *
1168 * - X INPUT METHOD ROUTINES - * 1282 * - X INPUT METHOD ROUTINES - *
… …
1178 1292
1179void 1293void
1180rxvt_term::im_set_size (XRectangle &size) 1294rxvt_term::im_set_size (XRectangle &size)
1181{ 1295{
1182 // the int_bwidth terms make no sense to me 1296 // the int_bwidth terms make no sense to me
1183 size.x = TermWin.int_bwidth; 1297 size.x = int_bwidth;
1184 size.y = TermWin.int_bwidth; 1298 size.y = int_bwidth;
1185 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1299 size.width = Width2Pixel (ncol) + int_bwidth;
1186 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1300 size.height = Height2Pixel (nrow) + int_bwidth;
1187} 1301}
1188 1302
1189void 1303void
1190rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1304rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1191 XRectangle &status_rect, 1305 XRectangle &status_rect,
1192 const XRectangle &needed_rect) 1306 const XRectangle &needed_rect)
1193{ 1307{
1194 preedit_rect.x = needed_rect.width; 1308 preedit_rect.x = needed_rect.width;
1195 preedit_rect.y = 0; 1309 preedit_rect.y = 0;
1196 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1310 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1197 preedit_rect.height = TermWin.fheight; 1311 preedit_rect.height = fheight;
1198 1312
1199 status_rect.x = 0; 1313 status_rect.x = 0;
1200 status_rect.y = 0; 1314 status_rect.y = 0;
1201 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1315 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1202 status_rect.height = TermWin.fheight; 1316 status_rect.height = fheight;
1203} 1317}
1204 1318
1205/* Checking whether input method is running. */ 1319/* Checking whether input method is running. */
1206bool 1320bool
1207rxvt_term::IMisRunning () 1321rxvt_term::IMisRunning ()
… …
1235{ 1349{
1236 XPoint nspot; 1350 XPoint nspot;
1237 XVaNestedList preedit_attr; 1351 XVaNestedList preedit_attr;
1238 1352
1239 if (!Input_Context 1353 if (!Input_Context
1240 || !TermWin.focus 1354 || !focus
1241 || !(input_style & XIMPreeditPosition)) 1355 || !(input_style & XIMPreeditPosition))
1242 return; 1356 return;
1243 1357
1244 im_set_position (nspot); 1358 im_set_position (nspot);
1245 1359
… …
1365 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1479 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1366 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1480 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1367 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1481 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1368 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1482 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1369 "*", 1483 "*",
1370 TermWin.fheight, 1484 fheight,
1371 TermWin.fheight + 1, TermWin.fheight - 1, 1485 fheight + 1, fheight - 1,
1372 TermWin.fheight - 2, TermWin.fheight + 2); 1486 fheight - 2, fheight + 2);
1373 1487
1374 fs = XCreateFontSet (display->display, pat, 1488 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1375 &missing_charset_list, &missing_charset_count, &def_string); 1489 &missing_charset_list, &missing_charset_count, &def_string);
1376 1490
1377 if (missing_charset_list) 1491 if (missing_charset_list)
1378 XFreeStringList (missing_charset_list); 1492 XFreeStringList (missing_charset_list);
1379 1493
… …
1423 NULL); 1537 NULL);
1424 } 1538 }
1425 1539
1426 Input_Context = XCreateIC (xim, 1540 Input_Context = XCreateIC (xim,
1427 XNInputStyle, input_style, 1541 XNInputStyle, input_style,
1428 XNClientWindow, TermWin.vt, 1542 XNClientWindow, vt,
1429 XNFocusWindow, TermWin.parent[0], 1543 XNFocusWindow, parent[0],
1430 preedit_attr ? XNPreeditAttributes : NULL, 1544 preedit_attr ? XNPreeditAttributes : NULL,
1431 preedit_attr, 1545 preedit_attr,
1432 status_attr ? XNStatusAttributes : NULL, 1546 status_attr ? XNStatusAttributes : NULL,
1433 status_attr, NULL); 1547 status_attr, NULL);
1434 1548
… …
1451} 1565}
1452 1566
1453void 1567void
1454rxvt_term::im_cb () 1568rxvt_term::im_cb ()
1455{ 1569{
1456 int i, found, had_im; 1570 int i;
1457 const char *p; 1571 const char *p;
1458 char **s; 1572 char **s;
1459 char buf[IMBUFSIZ]; 1573 char buf[IMBUFSIZ];
1574
1575 SET_R (this);
1460 1576
1461 im_destroy (); 1577 im_destroy ();
1462 1578
1463 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1579 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1464 if (Input_Context) 1580 if (Input_Context)
… …
1516{ 1632{
1517 XRectangle preedit_rect, status_rect, *needed_rect; 1633 XRectangle preedit_rect, status_rect, *needed_rect;
1518 XVaNestedList preedit_attr, status_attr; 1634 XVaNestedList preedit_attr, status_attr;
1519 1635
1520 if (!Input_Context 1636 if (!Input_Context
1521 || !TermWin.focus 1637 || !focus
1522 || !(input_style & XIMPreeditArea) 1638 || !(input_style & XIMPreeditArea)
1523 || !IMisRunning ()) 1639 || !IMisRunning ())
1524 return; 1640 return;
1525 1641
1526 /* Getting the necessary width of preedit area */ 1642 /* Getting the necessary width of preedit area */

Diff Legend

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