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

Diff Legend

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