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.108 by root, Wed Aug 25 05:03:33 2004 UTC vs.
Revision 1.149 by root, Sun Dec 18 00:59:42 2005 UTC

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

Diff Legend

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