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

Diff Legend

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