… | |
… | |
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 "keyboard.h" |
|
|
36 | #include "rxvtperl.h" |
|
|
37 | |
|
|
38 | #include <limits> |
35 | |
39 | |
36 | #include <csignal> |
40 | #include <csignal> |
37 | #include <cstring> |
41 | #include <cstring> |
38 | |
42 | |
39 | #ifdef TTY_GID_SUPPORT |
43 | #ifdef TTY_GID_SUPPORT |
… | |
… | |
42 | |
46 | |
43 | #ifdef HAVE_TERMIOS_H |
47 | #ifdef HAVE_TERMIOS_H |
44 | # include <termios.h> |
48 | # include <termios.h> |
45 | #endif |
49 | #endif |
46 | |
50 | |
47 | #ifdef KEYSYM_RESOURCE |
|
|
48 | # include "keyboard.h" |
|
|
49 | #endif |
|
|
50 | |
|
|
51 | vector<rxvt_term *> rxvt_term::termlist; |
51 | vector<rxvt_term *> rxvt_term::termlist; |
52 | |
52 | |
53 | static char curlocale[128]; |
53 | static char curlocale[128], savelocale[128]; |
54 | |
54 | |
55 | bool |
55 | bool |
56 | rxvt_set_locale (const char *locale) |
56 | rxvt_set_locale (const char *locale) |
57 | { |
57 | { |
58 | if (!locale || !strncmp (locale, curlocale, 128)) |
58 | if (!locale || !strncmp (locale, curlocale, 128)) |
59 | return false; |
59 | return false; |
60 | |
60 | |
61 | strncpy (curlocale, locale, 128); |
61 | strncpy (curlocale, locale, 128); |
62 | setlocale (LC_CTYPE, curlocale); |
62 | setlocale (LC_CTYPE, curlocale); |
63 | return true; |
63 | return true; |
|
|
64 | } |
|
|
65 | |
|
|
66 | bool |
|
|
67 | rxvt_push_locale (const char *locale) |
|
|
68 | { |
|
|
69 | strcpy (savelocale, curlocale); |
|
|
70 | rxvt_set_locale (locale); |
|
|
71 | } |
|
|
72 | |
|
|
73 | void |
|
|
74 | rxvt_pop_locale () |
|
|
75 | { |
|
|
76 | rxvt_set_locale (savelocale); |
64 | } |
77 | } |
65 | |
78 | |
66 | #if ENABLE_COMBINING |
79 | #if ENABLE_COMBINING |
67 | class rxvt_composite_vec rxvt_composite; |
80 | class rxvt_composite_vec rxvt_composite; |
68 | |
81 | |
… | |
… | |
157 | pointer_ev (this, &rxvt_term::pointer_cb), |
170 | pointer_ev (this, &rxvt_term::pointer_cb), |
158 | #endif |
171 | #endif |
159 | #ifdef USE_XIM |
172 | #ifdef USE_XIM |
160 | im_ev (this, &rxvt_term::im_cb), |
173 | im_ev (this, &rxvt_term::im_cb), |
161 | #endif |
174 | #endif |
162 | sw_term (this, &rxvt_term::sig_term), |
|
|
163 | sw_int (this, &rxvt_term::sig_term), |
|
|
164 | sw_chld (this, &rxvt_term::sig_chld), |
|
|
165 | termwin_ev (this, &rxvt_term::x_cb), |
175 | termwin_ev (this, &rxvt_term::x_cb), |
166 | vt_ev (this, &rxvt_term::x_cb), |
176 | vt_ev (this, &rxvt_term::x_cb), |
167 | check_ev (this, &rxvt_term::check_cb), |
177 | check_ev (this, &rxvt_term::check_cb), |
168 | flush_ev (this, &rxvt_term::flush_cb), |
178 | flush_ev (this, &rxvt_term::flush_cb), |
169 | destroy_ev (this, &rxvt_term::destroy_cb), |
179 | destroy_ev (this, &rxvt_term::destroy_cb), |
… | |
… | |
196 | pty.put (); |
206 | pty.put (); |
197 | } |
207 | } |
198 | |
208 | |
199 | rxvt_term::~rxvt_term () |
209 | rxvt_term::~rxvt_term () |
200 | { |
210 | { |
|
|
211 | PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); |
|
|
212 | |
201 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
213 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
202 | |
214 | |
203 | emergency_cleanup (); |
215 | emergency_cleanup (); |
204 | |
216 | |
205 | #if ENABLE_STYLES |
217 | #if ENABLE_STYLES |
206 | for (int i = RS_styleCount; --i; ) |
218 | for (int i = RS_styleCount; --i; ) |
207 | if (TermWin.fontset[i] != TermWin.fontset[0]) |
219 | if (fontset[i] != fontset[0]) |
208 | delete TermWin.fontset[i]; |
220 | delete fontset[i]; |
209 | #endif |
221 | #endif |
210 | delete TermWin.fontset[0]; |
222 | delete fontset[0]; |
211 | |
223 | |
212 | if (display) |
224 | if (display) |
213 | { |
225 | { |
214 | dDisp; |
226 | dDisp; |
215 | |
227 | |
… | |
… | |
243 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
255 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
244 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
256 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
245 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
257 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
246 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
258 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
247 | #endif |
259 | #endif |
248 | if (TermWin.gc) XFreeGC (disp, TermWin.gc); |
260 | if (gc) XFreeGC (disp, gc); |
249 | |
261 | |
250 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
262 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
251 | delete menuBar.drawable; |
263 | delete menuBar.drawable; |
252 | //if (menuBar.win) |
264 | //if (menuBar.win) |
253 | // XDestroyWindow (disp, menuBar.win); |
265 | // XDestroyWindow (disp, menuBar.win); |
254 | #endif |
266 | #endif |
255 | delete TermWin.drawable; |
267 | delete drawable; |
256 | // destroy all windows |
268 | // destroy all windows |
257 | if (TermWin.parent[0] |
269 | if (parent[0]) |
258 | #if ENABLE_FRILLS |
|
|
259 | && !rs[Rs_embed] |
|
|
260 | #endif |
|
|
261 | ) |
|
|
262 | XDestroyWindow (disp, TermWin.parent[0]); |
270 | XDestroyWindow (disp, parent[0]); |
263 | } |
271 | } |
264 | |
272 | |
265 | // TODO: free pixcolours, colours should become part of rxvt_display |
273 | // TODO: free pixcolours, colours should become part of rxvt_display |
266 | |
274 | |
267 | delete pix_colors_focused; |
275 | delete pix_colors_focused; |
268 | #ifdef OFF_FOCUS_FADING |
276 | #if OFF_FOCUS_FADING |
269 | delete pix_colors_unfocused; |
277 | delete pix_colors_unfocused; |
270 | #endif |
278 | #endif |
271 | |
279 | |
272 | displays.put (display); |
280 | displays.put (display); |
273 | |
281 | |
… | |
… | |
291 | delete argv; |
299 | delete argv; |
292 | |
300 | |
293 | #ifdef KEYSYM_RESOURCE |
301 | #ifdef KEYSYM_RESOURCE |
294 | delete keyboard; |
302 | delete keyboard; |
295 | #endif |
303 | #endif |
|
|
304 | } |
|
|
305 | |
|
|
306 | void |
|
|
307 | rxvt_term::child_exit () |
|
|
308 | { |
|
|
309 | cmd_pid = 0; |
|
|
310 | |
|
|
311 | if (!OPTION (Opt_hold)) |
|
|
312 | destroy (); |
296 | } |
313 | } |
297 | |
314 | |
298 | void |
315 | void |
299 | rxvt_term::destroy () |
316 | rxvt_term::destroy () |
300 | { |
317 | { |
… | |
… | |
421 | { |
438 | { |
422 | if (GET_R->allowedxerror == -1) |
439 | if (GET_R->allowedxerror == -1) |
423 | GET_R->allowedxerror = event->error_code; |
440 | GET_R->allowedxerror = event->error_code; |
424 | else |
441 | else |
425 | { |
442 | { |
426 | //TODO: GET_R is most likely not the terminal which caused the error |
443 | // GET_R is most likely not the terminal which caused the error, |
427 | //TODO: maybe just output the error and continue? |
444 | // so just output the error and continue |
428 | #if ENABLE_FRILLS |
445 | #if ENABLE_FRILLS |
429 | print_x_error (display, event); |
446 | print_x_error (display, event); |
430 | #else |
447 | #else |
431 | old_xerror_handler (display, event); |
448 | old_xerror_handler (display, event); |
432 | #endif |
449 | #endif |
… | |
… | |
442 | DisplayString (display)); |
459 | DisplayString (display)); |
443 | rxvt_emergency_cleanup (); |
460 | rxvt_emergency_cleanup (); |
444 | _exit (EXIT_FAILURE); |
461 | _exit (EXIT_FAILURE); |
445 | } |
462 | } |
446 | |
463 | |
447 | /* |
|
|
448 | * Catch a fatal signal and tidy up before quitting |
|
|
449 | */ |
|
|
450 | void |
|
|
451 | rxvt_term::sig_term (sig_watcher &w) |
|
|
452 | { |
|
|
453 | #ifdef DEBUG_CMD |
|
|
454 | rxvt_warn ("caught signal %d, exiting.\n", w.signum); |
|
|
455 | #endif |
|
|
456 | rxvt_emergency_cleanup (); |
|
|
457 | signal (w.signum, SIG_DFL); |
|
|
458 | kill (getpid (), w.signum); |
|
|
459 | } |
|
|
460 | |
|
|
461 | /*----------------------------------------------------------------------*/ |
464 | /*----------------------------------------------------------------------*/ |
462 | /* rxvt_init () */ |
|
|
463 | bool |
465 | bool |
464 | rxvt_term::init (int argc, const char *const *argv) |
466 | rxvt_term::init (int argc, const char *const *argv) |
465 | { |
467 | { |
466 | SET_R (this); |
468 | SET_R (this); |
467 | |
469 | |
… | |
… | |
480 | |
482 | |
481 | #if MENUBAR_MAX |
483 | #if MENUBAR_MAX |
482 | menubar_read (rs[Rs_menu]); |
484 | menubar_read (rs[Rs_menu]); |
483 | #endif |
485 | #endif |
484 | #ifdef HAVE_SCROLLBARS |
486 | #ifdef HAVE_SCROLLBARS |
485 | if (options & Opt_scrollBar) |
487 | if (OPTION (Opt_scrollBar)) |
486 | scrollBar.setIdle (); /* set existence for size calculations */ |
488 | scrollBar.setIdle (); /* set existence for size calculations */ |
|
|
489 | #endif |
|
|
490 | |
|
|
491 | #if ENABLE_PERL |
|
|
492 | if (rs[Rs_perl_ext] && *rs[Rs_perl_ext]) |
|
|
493 | { |
|
|
494 | rxvt_perl.init (); |
|
|
495 | PERL_INVOKE ((this, HOOK_INIT, DT_END)); |
|
|
496 | } |
487 | #endif |
497 | #endif |
488 | |
498 | |
489 | create_windows (argc, argv); |
499 | create_windows (argc, argv); |
490 | |
500 | |
491 | dDisp; |
501 | dDisp; |
… | |
… | |
497 | #if 0 |
507 | #if 0 |
498 | XSynchronize (disp, True); |
508 | XSynchronize (disp, True); |
499 | #endif |
509 | #endif |
500 | |
510 | |
501 | #ifdef HAVE_SCROLLBARS |
511 | #ifdef HAVE_SCROLLBARS |
502 | if (options & Opt_scrollBar) |
512 | if (OPTION (Opt_scrollBar)) |
503 | resize_scrollbar (); /* create and map scrollbar */ |
513 | resize_scrollbar (); /* create and map scrollbar */ |
504 | #endif |
514 | #endif |
505 | #if (MENUBAR_MAX) |
515 | #if (MENUBAR_MAX) |
506 | if (menubar_visible ()) |
516 | if (menubar_visible ()) |
507 | XMapWindow (disp, menuBar.win); |
517 | XMapWindow (disp, menuBar.win); |
508 | #endif |
518 | #endif |
509 | #ifdef TRANSPARENT |
519 | #ifdef TRANSPARENT |
510 | if (options & Opt_transparent) |
520 | if (OPTION (Opt_transparent)) |
511 | { |
521 | { |
512 | XSelectInput (disp, display->root, PropertyChangeMask); |
522 | XSelectInput (disp, display->root, PropertyChangeMask); |
513 | check_our_parents (); |
523 | check_our_parents (); |
514 | rootwin_ev.start (display, display->root); |
524 | rootwin_ev.start (display, display->root); |
515 | } |
525 | } |
516 | #endif |
526 | #endif |
517 | |
527 | |
518 | XMapWindow (disp, TermWin.vt); |
528 | XMapWindow (disp, vt); |
519 | XMapWindow (disp, TermWin.parent[0]); |
529 | XMapWindow (disp, parent[0]); |
520 | |
530 | |
521 | set_colorfgbg (); |
531 | set_colorfgbg (); |
522 | |
532 | |
523 | init_command (cmd_argv); |
533 | init_command (cmd_argv); |
524 | |
534 | |
… | |
… | |
526 | |
536 | |
527 | pty_ev.start (pty.pty, EVENT_READ); |
537 | pty_ev.start (pty.pty, EVENT_READ); |
528 | |
538 | |
529 | check_ev.start (); |
539 | check_ev.start (); |
530 | |
540 | |
|
|
541 | PERL_INVOKE ((this, HOOK_START, DT_END)); |
|
|
542 | |
531 | return true; |
543 | return true; |
532 | } |
544 | } |
|
|
545 | |
|
|
546 | static struct sig_handlers |
|
|
547 | { |
|
|
548 | sig_watcher sw_chld, sw_term, sw_int; |
|
|
549 | |
|
|
550 | void sig_chld (sig_watcher &w) |
|
|
551 | { |
|
|
552 | // we are being called for every SIGCHLD, find the corresponding term |
|
|
553 | int pid; |
|
|
554 | |
|
|
555 | while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) |
|
|
556 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
|
|
557 | if (pid == (*t)->cmd_pid) |
|
|
558 | { |
|
|
559 | (*t)->child_exit (); |
|
|
560 | break; |
|
|
561 | } |
|
|
562 | } |
|
|
563 | |
|
|
564 | /* |
|
|
565 | * Catch a fatal signal and tidy up before quitting |
|
|
566 | */ |
|
|
567 | void |
|
|
568 | sig_term (sig_watcher &w) |
|
|
569 | { |
|
|
570 | #ifdef DEBUG_CMD |
|
|
571 | rxvt_warn ("caught signal %d, exiting.\n", w.signum); |
|
|
572 | #endif |
|
|
573 | rxvt_emergency_cleanup (); |
|
|
574 | signal (w.signum, SIG_DFL); |
|
|
575 | kill (getpid (), w.signum); |
|
|
576 | } |
|
|
577 | |
|
|
578 | sig_handlers () |
|
|
579 | : sw_chld (this, &sig_handlers::sig_chld), |
|
|
580 | sw_term (this, &sig_handlers::sig_term), |
|
|
581 | sw_int (this, &sig_handlers::sig_term) |
|
|
582 | { |
|
|
583 | } |
|
|
584 | } sig_handlers; |
533 | |
585 | |
534 | void |
586 | void |
535 | rxvt_init () |
587 | rxvt_init () |
536 | { |
588 | { |
537 | /* |
589 | /* |
… | |
… | |
545 | rxvt_privileges (IGNORE); |
597 | rxvt_privileges (IGNORE); |
546 | |
598 | |
547 | signal (SIGHUP, SIG_IGN); |
599 | signal (SIGHUP, SIG_IGN); |
548 | signal (SIGPIPE, SIG_IGN); |
600 | signal (SIGPIPE, SIG_IGN); |
549 | |
601 | |
|
|
602 | sig_handlers.sw_chld.start (SIGCHLD); |
|
|
603 | sig_handlers.sw_term.start (SIGTERM); |
|
|
604 | sig_handlers.sw_int.start (SIGINT); |
|
|
605 | |
550 | /* need to trap SIGURG for SVR4 (Unixware) rlogin */ |
606 | /* need to trap SIGURG for SVR4 (Unixware) rlogin */ |
551 | /* signal (SIGURG, SIG_DFL); */ |
607 | /* signal (SIGURG, SIG_DFL); */ |
552 | |
608 | |
553 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
609 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
554 | // TODO: handle this with exceptions and tolerate the memory loss |
610 | // TODO: handle this with exceptions and tolerate the memory loss |
555 | XSetIOErrorHandler (rxvt_xioerror_handler); |
611 | XSetIOErrorHandler (rxvt_xioerror_handler); |
556 | } |
|
|
557 | |
|
|
558 | /* ------------------------------------------------------------------------- * |
|
|
559 | * SIGNAL HANDLING & EXIT HANDLER * |
|
|
560 | * ------------------------------------------------------------------------- */ |
|
|
561 | /* |
|
|
562 | * Catch a SIGCHLD signal and exit if the direct child has died |
|
|
563 | */ |
|
|
564 | |
|
|
565 | void |
|
|
566 | rxvt_term::sig_chld (sig_watcher &w) |
|
|
567 | { |
|
|
568 | // we are being called for every SIGCHLD, not just ours |
|
|
569 | int pid; |
|
|
570 | |
|
|
571 | while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) |
|
|
572 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
|
|
573 | if (pid == (*t)->cmd_pid) |
|
|
574 | { |
|
|
575 | (*t)->destroy (); |
|
|
576 | break; |
|
|
577 | } |
|
|
578 | } |
612 | } |
579 | |
613 | |
580 | /* ------------------------------------------------------------------------- * |
614 | /* ------------------------------------------------------------------------- * |
581 | * MEMORY ALLOCATION WRAPPERS * |
615 | * MEMORY ALLOCATION WRAPPERS * |
582 | * ------------------------------------------------------------------------- */ |
616 | * ------------------------------------------------------------------------- */ |
… | |
… | |
589 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
623 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
590 | |
624 | |
591 | return p; |
625 | return p; |
592 | } |
626 | } |
593 | |
627 | |
594 | void * |
628 | void * |
595 | rxvt_calloc (size_t number, size_t size) |
629 | rxvt_calloc (size_t number, size_t size) |
596 | { |
630 | { |
597 | void *p = calloc (number, size); |
631 | void *p = calloc (number, size); |
598 | |
632 | |
599 | if (!p) |
633 | if (!p) |
… | |
… | |
670 | |
704 | |
671 | #ifdef UTMP_SUPPORT |
705 | #ifdef UTMP_SUPPORT |
672 | void |
706 | void |
673 | rxvt_term::privileged_utmp (rxvt_privaction action) |
707 | rxvt_term::privileged_utmp (rxvt_privaction action) |
674 | { |
708 | { |
675 | if ((options & Opt_utmpInhibit) |
709 | if (OPTION (Opt_utmpInhibit) |
676 | || !pty.name || !*pty.name) |
710 | || !pty.name || !*pty.name) |
677 | return; |
711 | return; |
678 | |
712 | |
679 | rxvt_privileges (RESTORE); |
713 | rxvt_privileges (RESTORE); |
680 | |
714 | |
… | |
… | |
691 | /* |
725 | /* |
692 | * window size/position calculcations for XSizeHint and other storage. |
726 | * window size/position calculcations for XSizeHint and other storage. |
693 | * if width/height are non-zero then override calculated width/height |
727 | * if width/height are non-zero then override calculated width/height |
694 | */ |
728 | */ |
695 | void |
729 | void |
696 | rxvt_term::window_calc (unsigned int width, unsigned int height) |
730 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
697 | { |
731 | { |
698 | short recalc_x, recalc_y; |
732 | short recalc_x, recalc_y; |
699 | int x, y, sb_w, mb_h, flags; |
733 | int x, y, sb_w, mb_h, flags; |
700 | unsigned int w, h; |
734 | unsigned int w, h; |
701 | unsigned int max_width, max_height; |
735 | unsigned int max_width, max_height; |
702 | dDisp; |
736 | dDisp; |
703 | |
737 | |
704 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
738 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
705 | TermWin.ncol, TermWin.nrow, szHint.width, |
739 | ncol, nrow, szHint.width, szHint.height)); |
706 | szHint.height)); |
740 | |
707 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
741 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
708 | szHint.win_gravity = NorthWestGravity; |
742 | szHint.win_gravity = NorthWestGravity; |
709 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
743 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
710 | |
744 | |
711 | recalc_x = recalc_y = 0; |
745 | recalc_x = recalc_y = 0; |
712 | flags = 0; |
746 | flags = 0; |
|
|
747 | |
713 | if (!parsed_geometry) |
748 | if (!parsed_geometry) |
714 | { |
749 | { |
715 | parsed_geometry = 1; |
750 | parsed_geometry = 1; |
|
|
751 | |
716 | if (rs[Rs_geometry]) |
752 | if (rs[Rs_geometry]) |
717 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
753 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
718 | |
754 | |
719 | if (flags & WidthValue) |
755 | if (flags & WidthValue) |
720 | { |
756 | { |
721 | TermWin.ncol = BOUND_POSITIVE_INT16 (w); |
757 | ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); |
722 | szHint.flags |= USSize; |
758 | szHint.flags |= USSize; |
723 | } |
759 | } |
724 | |
760 | |
725 | if (flags & HeightValue) |
761 | if (flags & HeightValue) |
726 | { |
762 | { |
727 | TermWin.nrow = BOUND_POSITIVE_INT16 (h); |
763 | nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); |
728 | szHint.flags |= USSize; |
764 | szHint.flags |= USSize; |
729 | } |
765 | } |
730 | |
766 | |
731 | if (flags & XValue) |
767 | if (flags & XValue) |
732 | { |
768 | { |
733 | szHint.x = x; |
769 | szHint.x = x; |
734 | szHint.flags |= USPosition; |
770 | szHint.flags |= USPosition; |
|
|
771 | |
735 | if (flags & XNegative) |
772 | if (flags & XNegative) |
736 | { |
773 | { |
737 | recalc_x = 1; |
774 | recalc_x = 1; |
738 | szHint.win_gravity = NorthEastGravity; |
775 | szHint.win_gravity = NorthEastGravity; |
739 | } |
776 | } |
… | |
… | |
741 | |
778 | |
742 | if (flags & YValue) |
779 | if (flags & YValue) |
743 | { |
780 | { |
744 | szHint.y = y; |
781 | szHint.y = y; |
745 | szHint.flags |= USPosition; |
782 | szHint.flags |= USPosition; |
|
|
783 | |
746 | if (flags & YNegative) |
784 | if (flags & YNegative) |
747 | { |
785 | { |
748 | recalc_y = 1; |
786 | recalc_y = 1; |
|
|
787 | |
749 | if (szHint.win_gravity == NorthEastGravity) |
788 | if (szHint.win_gravity == NorthEastGravity) |
750 | szHint.win_gravity = SouthEastGravity; |
789 | szHint.win_gravity = SouthEastGravity; |
751 | else |
790 | else |
752 | szHint.win_gravity = SouthWestGravity; |
791 | szHint.win_gravity = SouthWestGravity; |
753 | } |
792 | } |
754 | } |
793 | } |
755 | } |
794 | } |
756 | |
795 | |
757 | /* TODO: BOUNDS */ |
796 | /* TODO: BOUNDS */ |
758 | TermWin.width = TermWin.ncol * TermWin.fwidth; |
797 | width = ncol * fwidth; |
759 | TermWin.height = TermWin.nrow * TermWin.fheight; |
798 | height = nrow * fheight; |
760 | max_width = MAX_COLS * TermWin.fwidth; |
799 | max_width = MAX_COLS * fwidth; |
761 | max_height = MAX_ROWS * TermWin.fheight; |
800 | max_height = MAX_ROWS * fheight; |
762 | |
801 | |
763 | szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; |
802 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
764 | |
803 | |
765 | sb_w = mb_h = 0; |
804 | sb_w = mb_h = 0; |
766 | window_vt_x = window_vt_y = TermWin.int_bwidth; |
805 | window_vt_x = window_vt_y = int_bwidth; |
767 | |
806 | |
768 | if (scrollbar_visible ()) |
807 | if (scrollbar_visible ()) |
769 | { |
808 | { |
770 | sb_w = scrollbar_TotalWidth (); |
809 | sb_w = scrollbar_TotalWidth (); |
771 | szHint.base_width += sb_w; |
810 | szHint.base_width += sb_w; |
772 | if (!(options & Opt_scrollBar_right)) |
811 | if (!OPTION (Opt_scrollBar_right)) |
773 | window_vt_x += sb_w; |
812 | window_vt_x += sb_w; |
774 | } |
813 | } |
775 | |
814 | |
776 | if (menubar_visible ()) |
815 | if (menubar_visible ()) |
777 | { |
816 | { |
778 | mb_h = menuBar_TotalHeight (); |
817 | mb_h = menuBar_TotalHeight (); |
779 | szHint.base_height += mb_h; |
818 | szHint.base_height += mb_h; |
780 | window_vt_y += mb_h; |
819 | window_vt_y += mb_h; |
781 | } |
820 | } |
782 | |
821 | |
783 | szHint.width_inc = TermWin.fwidth; |
822 | szHint.width_inc = fwidth; |
784 | szHint.height_inc = TermWin.fheight; |
823 | szHint.height_inc = fheight; |
785 | szHint.min_width = szHint.base_width + szHint.width_inc; |
824 | szHint.min_width = szHint.base_width + szHint.width_inc; |
786 | szHint.min_height = szHint.base_height + szHint.height_inc; |
825 | szHint.min_height = szHint.base_height + szHint.height_inc; |
787 | |
826 | |
788 | if (width && width - szHint.base_width < max_width) |
827 | if (newwidth && newwidth - szHint.base_width < max_width) |
789 | { |
828 | { |
790 | szHint.width = width; |
829 | szHint.width = newwidth; |
791 | TermWin.width = width - szHint.base_width; |
830 | width = newwidth - szHint.base_width; |
792 | } |
831 | } |
793 | else |
832 | else |
794 | { |
833 | { |
795 | MIN_IT (TermWin.width, max_width); |
834 | min_it (width, max_width); |
796 | szHint.width = szHint.base_width + TermWin.width; |
835 | szHint.width = szHint.base_width + width; |
797 | } |
836 | } |
798 | |
837 | |
799 | if (height && height - szHint.base_height < max_height) |
838 | if (newheight && newheight - szHint.base_height < max_height) |
800 | { |
839 | { |
801 | szHint.height = height; |
840 | szHint.height = newheight; |
802 | TermWin.height = height - szHint.base_height; |
841 | height = newheight - szHint.base_height; |
803 | } |
842 | } |
804 | else |
843 | else |
805 | { |
844 | { |
806 | MIN_IT (TermWin.height, max_height); |
845 | min_it (height, max_height); |
807 | szHint.height = szHint.base_height + TermWin.height; |
846 | szHint.height = szHint.base_height + height; |
808 | } |
847 | } |
809 | |
848 | |
810 | if (scrollbar_visible () && (options & Opt_scrollBar_right)) |
849 | if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) |
811 | window_sb_x = szHint.width - sb_w; |
850 | window_sb_x = szHint.width - sb_w; |
812 | |
851 | |
813 | if (recalc_x) |
852 | if (recalc_x) |
814 | szHint.x += (DisplayWidth (disp, display->screen) |
853 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
815 | - szHint.width - 2 * TermWin.ext_bwidth); |
|
|
816 | if (recalc_y) |
854 | if (recalc_y) |
817 | szHint.y += (DisplayHeight (disp, display->screen) |
855 | szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; |
818 | - szHint.height - 2 * TermWin.ext_bwidth); |
|
|
819 | |
856 | |
820 | TermWin.ncol = TermWin.width / TermWin.fwidth; |
857 | ncol = width / fwidth; |
821 | TermWin.nrow = TermWin.height / TermWin.fheight; |
858 | nrow = height / fheight; |
822 | D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
859 | D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
823 | TermWin.ncol, TermWin.nrow, szHint.width, |
860 | ncol, nrow, szHint.width, |
824 | szHint.height)); |
861 | szHint.height)); |
825 | return; |
862 | return; |
826 | } |
863 | } |
827 | |
864 | |
828 | /*----------------------------------------------------------------------*/ |
865 | /*----------------------------------------------------------------------*/ |
… | |
… | |
836 | if (pty.pty < 0) |
873 | if (pty.pty < 0) |
837 | return; |
874 | return; |
838 | |
875 | |
839 | struct winsize ws; |
876 | struct winsize ws; |
840 | |
877 | |
841 | ws.ws_col = TermWin.ncol; |
878 | ws.ws_col = ncol; |
842 | ws.ws_row = TermWin.nrow; |
879 | ws.ws_row = nrow; |
843 | ws.ws_xpixel = TermWin.width; |
880 | ws.ws_xpixel = width; |
844 | ws.ws_ypixel = TermWin.height; |
881 | ws.ws_ypixel = height; |
845 | (void)ioctl (pty.pty, TIOCSWINSZ, &ws); |
882 | (void)ioctl (pty.pty, TIOCSWINSZ, &ws); |
846 | |
883 | |
847 | #if 0 |
884 | #if 0 |
848 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
885 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
849 | if (cmd_pid) /* force through to the command */ |
886 | if (cmd_pid) /* force through to the command */ |
… | |
… | |
851 | #endif |
888 | #endif |
852 | } |
889 | } |
853 | |
890 | |
854 | /*----------------------------------------------------------------------*/ |
891 | /*----------------------------------------------------------------------*/ |
855 | /* set_fonts () - load and set the various fonts |
892 | /* set_fonts () - load and set the various fonts |
856 | /* |
893 | * |
857 | * init = 1 - initialize |
894 | * init = 1 - initialize |
858 | * |
895 | * |
859 | * fontname == FONT_UP - switch to bigger font |
896 | * fontname == FONT_UP - switch to bigger font |
860 | * fontname == FONT_DN - switch to smaller font |
897 | * fontname == FONT_DN - switch to smaller font |
861 | */ |
898 | */ |
… | |
… | |
873 | return false; |
910 | return false; |
874 | } |
911 | } |
875 | |
912 | |
876 | #if ENABLE_STYLES |
913 | #if ENABLE_STYLES |
877 | for (int i = RS_styleCount; --i; ) |
914 | for (int i = RS_styleCount; --i; ) |
878 | if (TermWin.fontset[i] != TermWin.fontset[0]) |
915 | if (fontset[i] != fontset[0]) |
879 | delete TermWin.fontset[i]; |
916 | delete fontset[i]; |
880 | #endif |
917 | #endif |
881 | |
918 | |
882 | delete TermWin.fontset[0]; |
919 | delete fontset[0]; |
883 | TermWin.fontset[0] = fs; |
920 | fontset[0] = fs; |
884 | |
921 | |
885 | prop = (*fs)[1]->properties (); |
922 | prop = (*fs)[1]->properties (); |
886 | prop.height += TermWin.lineSpace; |
923 | prop.height += lineSpace; |
887 | fs->set_prop (prop); |
924 | fs->set_prop (prop); |
888 | |
925 | |
889 | TermWin.fwidth = prop.width; |
926 | fwidth = prop.width; |
890 | TermWin.fheight = prop.height; |
927 | fheight = prop.height; |
891 | TermWin.fweight = prop.weight; |
928 | fbase = prop.ascent; |
892 | TermWin.fslant = prop.slant; |
|
|
893 | TermWin.fbase = (*fs)[1]->ascent; |
|
|
894 | |
929 | |
895 | for (int style = 1; style < 4; style++) |
930 | for (int style = 1; style < 4; style++) |
896 | { |
931 | { |
897 | #if ENABLE_STYLES |
932 | #if ENABLE_STYLES |
898 | const char *res = rs[Rs_font + style]; |
933 | const char *res = rs[Rs_font + style]; |
899 | |
934 | |
900 | if (res && !*res) |
935 | if (res && !*res) |
901 | TermWin.fontset[style] = TermWin.fontset[0]; |
936 | fontset[style] = fontset[0]; |
902 | else |
937 | else |
903 | { |
938 | { |
904 | TermWin.fontset[style] = fs = new rxvt_fontset (this); |
939 | fontset[style] = fs = new rxvt_fontset (this); |
905 | rxvt_fontprop prop2 = prop; |
940 | rxvt_fontprop prop2 = prop; |
906 | |
941 | |
907 | if (res) |
942 | if (res) |
908 | prop2.weight = prop2.slant = rxvt_fontprop::unset; |
943 | prop2.weight = prop2.slant = rxvt_fontprop::unset; |
909 | else |
944 | else |
910 | { |
945 | { |
911 | res = TermWin.fontset[0]->fontdesc; |
946 | res = fontset[0]->fontdesc; |
912 | |
947 | |
913 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
948 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
914 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
949 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
915 | } |
950 | } |
916 | |
951 | |
917 | fs->populate (res); |
952 | fs->populate (res); |
918 | fs->set_prop (prop2); |
953 | fs->set_prop (prop2); |
919 | } |
954 | } |
920 | #else |
955 | #else |
921 | TermWin.fontset[style] = TermWin.fontset[0]; |
956 | fontset[style] = fontset[0]; |
922 | #endif |
957 | #endif |
923 | } |
958 | } |
924 | |
959 | |
925 | if (TermWin.parent[0]) |
960 | if (parent[0]) |
926 | { |
961 | { |
927 | resize_all_windows (0, 0, 0); |
962 | resize_all_windows (0, 0, 0); |
928 | scr_remap_chars (); |
963 | scr_remap_chars (); |
929 | scr_touch (true); |
964 | scr_touch (true); |
930 | } |
965 | } |
… | |
… | |
932 | return true; |
967 | return true; |
933 | } |
968 | } |
934 | |
969 | |
935 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
970 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
936 | { |
971 | { |
937 | // TODO: SMART_WINDOW_TITLE |
|
|
938 | XChangeProperty (display->display, TermWin.parent[0], |
972 | XChangeProperty (display->display, parent[0], |
939 | prop, XA_STRING, 8, PropModeReplace, |
973 | prop, XA_STRING, 8, PropModeReplace, |
940 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
974 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
941 | } |
975 | } |
942 | |
976 | |
943 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
977 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
944 | { |
978 | { |
945 | // TODO: SMART_WINDOW_TITLE |
|
|
946 | wchar_t *ws = rxvt_mbstowcs (str, len); |
979 | wchar_t *ws = rxvt_mbstowcs (str, len); |
947 | char *s = rxvt_wcstoutf8 (ws); |
980 | char *s = rxvt_wcstoutf8 (ws); |
948 | |
981 | |
949 | XChangeProperty (display->display, TermWin.parent[0], |
982 | XChangeProperty (display->display, parent[0], |
950 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
983 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
951 | (const unsigned char *)s, strlen (s)); |
984 | (const unsigned char *)s, strlen (s)); |
952 | |
985 | |
953 | free (s); |
986 | free (s); |
954 | free (ws); |
987 | free (ws); |
… | |
… | |
959 | /* xterm sequences - title, iconName, color (exptl) */ |
992 | /* xterm sequences - title, iconName, color (exptl) */ |
960 | void |
993 | void |
961 | rxvt_term::set_title (const char *str) |
994 | rxvt_term::set_title (const char *str) |
962 | { |
995 | { |
963 | set_string_property (XA_WM_NAME, str); |
996 | set_string_property (XA_WM_NAME, str); |
964 | #if ENABLE_FRILLS |
997 | #if ENABLE_EWMH |
965 | set_utf8_property (xa[XA_NET_WM_NAME], str); |
998 | set_utf8_property (xa[XA_NET_WM_NAME], str); |
966 | #endif |
999 | #endif |
967 | } |
1000 | } |
968 | |
1001 | |
969 | void |
1002 | void |
970 | rxvt_term::set_icon_name (const char *str) |
1003 | rxvt_term::set_icon_name (const char *str) |
971 | { |
1004 | { |
972 | set_string_property (XA_WM_ICON_NAME, str); |
1005 | set_string_property (XA_WM_ICON_NAME, str); |
973 | #if ENABLE_FRILLS |
1006 | #if ENABLE_EWMH |
974 | set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); |
1007 | set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); |
975 | #endif |
1008 | #endif |
976 | } |
1009 | } |
977 | |
1010 | |
978 | #ifdef XTERM_COLOR_CHANGE |
1011 | #ifdef XTERM_COLOR_CHANGE |
… | |
… | |
994 | { /* bright colors */ |
1027 | { /* bright colors */ |
995 | i -= 8; |
1028 | i -= 8; |
996 | # ifndef NO_BRIGHTCOLOR |
1029 | # ifndef NO_BRIGHTCOLOR |
997 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
1030 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
998 | SET_PIXCOLOR (idx); |
1031 | SET_PIXCOLOR (idx); |
999 | goto Done; |
1032 | goto done; |
1000 | # endif |
1033 | # endif |
1001 | } |
1034 | } |
1002 | |
1035 | |
1003 | if (i >= 0 && i <= 7) |
1036 | if (i >= 0 && i <= 7) |
1004 | { /* normal colors */ |
1037 | { /* normal colors */ |
1005 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
1038 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
1006 | SET_PIXCOLOR (idx); |
1039 | SET_PIXCOLOR (idx); |
1007 | goto Done; |
1040 | goto done; |
1008 | } |
1041 | } |
1009 | } |
1042 | } |
1010 | |
1043 | |
1011 | if (!rXParseAllocColor (&xcol, color)) |
1044 | if (!rXParseAllocColor (&xcol, color)) |
1012 | return; |
1045 | return; |
… | |
… | |
1032 | pix_colors_focused[idx] = xcol; |
1065 | pix_colors_focused[idx] = xcol; |
1033 | SET_PIXCOLOR (idx); |
1066 | SET_PIXCOLOR (idx); |
1034 | |
1067 | |
1035 | /* XSetWindowAttributes attr; */ |
1068 | /* XSetWindowAttributes attr; */ |
1036 | /* Cursor cursor; */ |
1069 | /* Cursor cursor; */ |
1037 | Done: |
1070 | done: |
|
|
1071 | |
1038 | #ifdef OFF_FOCUS_FADING |
1072 | #if OFF_FOCUS_FADING |
1039 | if (rs[Rs_fade]) |
1073 | if (rs[Rs_fade]) |
1040 | pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); |
1074 | pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
1041 | #endif |
1075 | #endif |
1042 | |
1076 | |
1043 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
1077 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
1044 | |
1078 | |
1045 | recolour_cursor (); |
1079 | recolour_cursor (); |
… | |
… | |
1116 | |
1150 | |
1117 | /* -------------------------------------------------------------------- * |
1151 | /* -------------------------------------------------------------------- * |
1118 | * - WINDOW RESIZING - * |
1152 | * - WINDOW RESIZING - * |
1119 | * -------------------------------------------------------------------- */ |
1153 | * -------------------------------------------------------------------- */ |
1120 | void |
1154 | void |
1121 | rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) |
1155 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1122 | { |
1156 | { |
1123 | int fix_screen; |
1157 | int fix_screen; |
1124 | #ifdef SMART_RESIZE |
|
|
1125 | int old_width = szHint.width, old_height = szHint.height; |
1158 | int old_width = szHint.width, old_height = szHint.height; |
1126 | #endif |
|
|
1127 | dDisp; |
1159 | dDisp; |
1128 | |
1160 | |
1129 | window_calc (width, height); |
1161 | window_calc (newwidth, newheight); |
1130 | XSetWMNormalHints (disp, TermWin.parent[0], &szHint); |
1162 | XSetWMNormalHints (disp, parent[0], &szHint); |
1131 | |
1163 | |
1132 | if (!ignoreparent) |
1164 | if (!ignoreparent) |
1133 | { |
1165 | { |
1134 | #ifdef SMART_RESIZE |
1166 | #ifdef SMART_RESIZE |
1135 | /* |
1167 | /* |
… | |
… | |
1139 | int x, y, x1, y1; |
1171 | int x, y, x1, y1; |
1140 | int dx, dy; |
1172 | int dx, dy; |
1141 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1173 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1142 | Window unused_cr; |
1174 | Window unused_cr; |
1143 | |
1175 | |
1144 | XTranslateCoordinates (disp, TermWin.parent[0], display->root, |
1176 | XTranslateCoordinates (disp, parent[0], display->root, |
1145 | 0, 0, &x, &y, &unused_cr); |
1177 | 0, 0, &x, &y, &unused_cr); |
1146 | XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, |
1178 | XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, |
1147 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1179 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1148 | /* |
1180 | /* |
1149 | * if display->root isn't the parent window, a WM will probably have offset |
1181 | * if display->root isn't the parent window, a WM will probably have offset |
1150 | * our position for handles and decorations. Counter it |
1182 | * our position for handles and decorations. Counter it |
1151 | */ |
1183 | */ |
… | |
… | |
1168 | if (y < y1) /* top half */ |
1200 | if (y < y1) /* top half */ |
1169 | dy = 0; |
1201 | dy = 0; |
1170 | else if (y == y1) /* exact center */ |
1202 | else if (y == y1) /* exact center */ |
1171 | dy /= 2; |
1203 | dy /= 2; |
1172 | |
1204 | |
1173 | XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, |
1205 | XMoveResizeWindow (disp, parent[0], x + dx, y + dy, |
1174 | szHint.width, szHint.height); |
1206 | szHint.width, szHint.height); |
1175 | #else |
1207 | #else |
1176 | XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); |
1208 | XResizeWindow (disp, parent[0], szHint.width, szHint.height); |
1177 | #endif |
1209 | #endif |
1178 | } |
1210 | } |
1179 | |
1211 | |
1180 | fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; |
1212 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1181 | |
1213 | |
1182 | if (fix_screen || width != old_width || height != old_height) |
1214 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1183 | { |
1215 | { |
1184 | if (scrollbar_visible ()) |
1216 | if (scrollbar_visible ()) |
1185 | { |
1217 | { |
1186 | XMoveResizeWindow (disp, scrollBar.win, |
1218 | XMoveResizeWindow (disp, scrollBar.win, |
1187 | window_sb_x, 0, |
1219 | window_sb_x, 0, |
… | |
… | |
1190 | } |
1222 | } |
1191 | |
1223 | |
1192 | if (menubar_visible ()) |
1224 | if (menubar_visible ()) |
1193 | XMoveResizeWindow (disp, menuBar.win, |
1225 | XMoveResizeWindow (disp, menuBar.win, |
1194 | window_vt_x, 0, |
1226 | window_vt_x, 0, |
1195 | TermWin_TotalWidth (), menuBar_TotalHeight ()); |
1227 | width, menuBar_TotalHeight ()); |
1196 | |
1228 | |
1197 | XMoveResizeWindow (disp, TermWin.vt, |
1229 | XMoveResizeWindow (disp, vt, |
1198 | window_vt_x, window_vt_y, |
1230 | window_vt_x, window_vt_y, |
1199 | TermWin_TotalWidth (), TermWin_TotalHeight ()); |
1231 | width, height); |
1200 | |
1232 | |
1201 | scr_clear (); |
1233 | scr_clear (); |
1202 | #ifdef XPM_BACKGROUND |
1234 | #ifdef XPM_BACKGROUND |
1203 | resize_pixmap (); |
1235 | resize_pixmap (); |
1204 | #endif |
1236 | #endif |
… | |
… | |
1210 | int old_ncol = prev_ncol; |
1242 | int old_ncol = prev_ncol; |
1211 | |
1243 | |
1212 | /* scr_reset only works on the primary screen */ |
1244 | /* scr_reset only works on the primary screen */ |
1213 | if (old_height) /* this is not the first time through */ |
1245 | if (old_height) /* this is not the first time through */ |
1214 | { |
1246 | { |
1215 | unsigned int ncol = TermWin.ncol; |
1247 | unsigned int ocol = ncol; |
1216 | TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
1248 | ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
1217 | curr_screen = scr_change_screen (PRIMARY); |
1249 | curr_screen = scr_change_screen (PRIMARY); |
1218 | TermWin.ncol = ncol; |
1250 | ncol = ocol; |
1219 | } |
1251 | } |
1220 | |
1252 | |
1221 | scr_reset (); |
1253 | scr_reset (); |
1222 | |
1254 | |
1223 | if (curr_screen >= 0) /* this is not the first time through */ |
1255 | if (curr_screen >= 0) /* this is not the first time through */ |
1224 | { |
1256 | { |
1225 | scr_change_screen (curr_screen); |
1257 | scr_change_screen (curr_screen); |
1226 | selection_check (old_ncol != TermWin.ncol ? 4 : 0); |
1258 | selection_check (old_ncol != ncol ? 4 : 0); |
1227 | } |
1259 | } |
1228 | } |
1260 | } |
1229 | |
1261 | |
1230 | old_width = szHint.width; |
1262 | old_width = szHint.width; |
1231 | old_height = szHint.height; |
1263 | old_height = szHint.height; |
1232 | |
1264 | |
1233 | #ifdef XPM_BACKGROUND |
1265 | #ifdef XPM_BACKGROUND |
1234 | if (TermWin.pixmap) |
1266 | if (pixmap) |
1235 | scr_touch (false); |
1267 | scr_touch (false); |
1236 | #endif |
1268 | #endif |
1237 | |
1269 | |
1238 | #ifdef USE_XIM |
1270 | #ifdef USE_XIM |
1239 | IMSetStatusPosition (); |
1271 | IMSetStatusPosition (); |
… | |
… | |
1243 | /* |
1275 | /* |
1244 | * Set the width/height of the vt window in characters. Units are pixels. |
1276 | * Set the width/height of the vt window in characters. Units are pixels. |
1245 | * good for toggling 80/132 columns |
1277 | * good for toggling 80/132 columns |
1246 | */ |
1278 | */ |
1247 | void |
1279 | void |
1248 | rxvt_term::set_widthheight (unsigned int width, unsigned int height) |
1280 | rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight) |
1249 | { |
1281 | { |
1250 | XWindowAttributes wattr; |
1282 | XWindowAttributes wattr; |
1251 | |
1283 | |
1252 | if (width == 0 || height == 0) |
1284 | if (newwidth == 0 || newheight == 0) |
1253 | { |
1285 | { |
1254 | XGetWindowAttributes (display->display, display->root, &wattr); |
1286 | XGetWindowAttributes (display->display, display->root, &wattr); |
|
|
1287 | |
1255 | if (width == 0) |
1288 | if (newwidth == 0) |
1256 | width = wattr.width - szHint.base_width; |
1289 | newwidth = wattr.width - szHint.base_width; |
1257 | if (height == 0) |
1290 | if (newheight == 0) |
1258 | height = wattr.height - szHint.base_height; |
1291 | newheight = wattr.height - szHint.base_height; |
1259 | } |
|
|
1260 | |
|
|
1261 | if (width != TermWin.width || height != TermWin.height) |
|
|
1262 | { |
1292 | } |
|
|
1293 | |
|
|
1294 | if (newwidth != width || newheight != height) |
|
|
1295 | { |
1263 | width += szHint.base_width; |
1296 | newwidth += szHint.base_width; |
1264 | height += szHint.base_height; |
1297 | newheight += szHint.base_height; |
1265 | resize_all_windows (width, height, 0); |
1298 | resize_all_windows (newwidth, newheight, 0); |
1266 | } |
1299 | } |
1267 | } |
1300 | } |
1268 | |
1301 | |
1269 | /* -------------------------------------------------------------------- * |
1302 | /* -------------------------------------------------------------------- * |
1270 | * - X INPUT METHOD ROUTINES - * |
1303 | * - X INPUT METHOD ROUTINES - * |
… | |
… | |
1280 | |
1313 | |
1281 | void |
1314 | void |
1282 | rxvt_term::im_set_size (XRectangle &size) |
1315 | rxvt_term::im_set_size (XRectangle &size) |
1283 | { |
1316 | { |
1284 | // the int_bwidth terms make no sense to me |
1317 | // the int_bwidth terms make no sense to me |
1285 | size.x = TermWin.int_bwidth; |
1318 | size.x = int_bwidth; |
1286 | size.y = TermWin.int_bwidth; |
1319 | size.y = int_bwidth; |
1287 | size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; |
1320 | size.width = Width2Pixel (ncol) + int_bwidth; |
1288 | size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; |
1321 | size.height = Height2Pixel (nrow) + int_bwidth; |
1289 | } |
1322 | } |
1290 | |
1323 | |
1291 | void |
1324 | void |
1292 | rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, |
1325 | rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, |
1293 | XRectangle &status_rect, |
1326 | XRectangle &status_rect, |
1294 | const XRectangle &needed_rect) |
1327 | const XRectangle &needed_rect) |
1295 | { |
1328 | { |
1296 | preedit_rect.x = needed_rect.width; |
1329 | preedit_rect.x = needed_rect.width; |
1297 | preedit_rect.y = 0; |
1330 | preedit_rect.y = 0; |
1298 | preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; |
1331 | preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1; |
1299 | preedit_rect.height = TermWin.fheight; |
1332 | preedit_rect.height = fheight; |
1300 | |
1333 | |
1301 | status_rect.x = 0; |
1334 | status_rect.x = 0; |
1302 | status_rect.y = 0; |
1335 | status_rect.y = 0; |
1303 | status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; |
1336 | status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1; |
1304 | status_rect.height = TermWin.fheight; |
1337 | status_rect.height = fheight; |
1305 | } |
1338 | } |
1306 | |
1339 | |
1307 | /* Checking whether input method is running. */ |
1340 | /* Checking whether input method is running. */ |
1308 | bool |
1341 | bool |
1309 | rxvt_term::IMisRunning () |
1342 | rxvt_term::IMisRunning () |
… | |
… | |
1337 | { |
1370 | { |
1338 | XPoint nspot; |
1371 | XPoint nspot; |
1339 | XVaNestedList preedit_attr; |
1372 | XVaNestedList preedit_attr; |
1340 | |
1373 | |
1341 | if (!Input_Context |
1374 | if (!Input_Context |
1342 | || !TermWin.focus |
1375 | || !focus |
1343 | || !(input_style & XIMPreeditPosition)) |
1376 | || !(input_style & XIMPreeditPosition)) |
1344 | return; |
1377 | return; |
1345 | |
1378 | |
1346 | im_set_position (nspot); |
1379 | im_set_position (nspot); |
1347 | |
1380 | |
… | |
… | |
1467 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1500 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1468 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1501 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1469 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1502 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1470 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1503 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1471 | "*", |
1504 | "*", |
1472 | TermWin.fheight, |
1505 | fheight, |
1473 | TermWin.fheight + 1, TermWin.fheight - 1, |
1506 | fheight + 1, fheight - 1, |
1474 | TermWin.fheight - 2, TermWin.fheight + 2); |
1507 | fheight - 2, fheight + 2); |
1475 | |
1508 | |
1476 | fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1509 | fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1477 | &missing_charset_list, &missing_charset_count, &def_string); |
1510 | &missing_charset_list, &missing_charset_count, &def_string); |
1478 | |
1511 | |
1479 | if (missing_charset_list) |
1512 | if (missing_charset_list) |
… | |
… | |
1525 | NULL); |
1558 | NULL); |
1526 | } |
1559 | } |
1527 | |
1560 | |
1528 | Input_Context = XCreateIC (xim, |
1561 | Input_Context = XCreateIC (xim, |
1529 | XNInputStyle, input_style, |
1562 | XNInputStyle, input_style, |
1530 | XNClientWindow, TermWin.vt, |
1563 | XNClientWindow, vt, |
1531 | XNFocusWindow, TermWin.parent[0], |
1564 | XNFocusWindow, parent[0], |
1532 | preedit_attr ? XNPreeditAttributes : NULL, |
1565 | preedit_attr ? XNPreeditAttributes : NULL, |
1533 | preedit_attr, |
1566 | preedit_attr, |
1534 | status_attr ? XNStatusAttributes : NULL, |
1567 | status_attr ? XNStatusAttributes : NULL, |
1535 | status_attr, NULL); |
1568 | status_attr, NULL); |
1536 | |
1569 | |
… | |
… | |
1553 | } |
1586 | } |
1554 | |
1587 | |
1555 | void |
1588 | void |
1556 | rxvt_term::im_cb () |
1589 | rxvt_term::im_cb () |
1557 | { |
1590 | { |
1558 | int i, found, had_im; |
1591 | int i; |
1559 | const char *p; |
1592 | const char *p; |
1560 | char **s; |
1593 | char **s; |
1561 | char buf[IMBUFSIZ]; |
1594 | char buf[IMBUFSIZ]; |
1562 | |
1595 | |
1563 | SET_R (this); |
1596 | SET_R (this); |
… | |
… | |
1620 | { |
1653 | { |
1621 | XRectangle preedit_rect, status_rect, *needed_rect; |
1654 | XRectangle preedit_rect, status_rect, *needed_rect; |
1622 | XVaNestedList preedit_attr, status_attr; |
1655 | XVaNestedList preedit_attr, status_attr; |
1623 | |
1656 | |
1624 | if (!Input_Context |
1657 | if (!Input_Context |
1625 | || !TermWin.focus |
1658 | || !focus |
1626 | || !(input_style & XIMPreeditArea) |
1659 | || !(input_style & XIMPreeditArea) |
1627 | || !IMisRunning ()) |
1660 | || !IMisRunning ()) |
1628 | return; |
1661 | return; |
1629 | |
1662 | |
1630 | /* Getting the necessary width of preedit area */ |
1663 | /* Getting the necessary width of preedit area */ |