ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.121 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.149 by root, Sun Dec 18 00:59:42 2005 UTC

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

Diff Legend

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