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.94 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.151 by root, Wed Dec 21 19:50:16 2005 UTC

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