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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.119 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.156 by root, Mon Jan 2 18:20:23 2006 UTC

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

Diff Legend

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