… | |
… | |
11 | * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> |
11 | * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> |
12 | * - extensive modifications |
12 | * - extensive modifications |
13 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
13 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
14 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
14 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
15 | * - extensive modifications |
15 | * - extensive modifications |
16 | * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> |
16 | * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> |
17 | * |
17 | * |
18 | * This program is free software; you can redistribute it and/or modify |
18 | * This program is free software; you can redistribute it and/or modify |
19 | * it under the terms of the GNU General Public License as published by |
19 | * it under the terms of the GNU General Public License as published by |
20 | * the Free Software Foundation; either version 2 of the License, or |
20 | * the Free Software Foundation; either version 2 of the License, or |
21 | * (at your option) any later version. |
21 | * (at your option) any later version. |
… | |
… | |
101 | { |
101 | { |
102 | if (cc->c2 == c2) return c1; |
102 | if (cc->c2 == c2) return c1; |
103 | cc = (*this)[cc->c1]; |
103 | cc = (*this)[cc->c1]; |
104 | } |
104 | } |
105 | |
105 | |
106 | // check to see wether this combination already exists otherwise |
106 | // check to see whether this combination already exists otherwise |
107 | for (cc = v.end (); cc-- > v.begin (); ) |
107 | for (cc = v.end (); cc-- > v.begin (); ) |
108 | { |
108 | { |
109 | if (cc->c1 == c1 && cc->c2 == c2) |
109 | if (cc->c1 == c1 && cc->c2 == c2) |
110 | return COMPOSE_LO + (cc - v.begin ()); |
110 | return COMPOSE_LO + (cc - v.begin ()); |
111 | } |
111 | } |
… | |
… | |
172 | slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); |
172 | slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); |
173 | #endif |
173 | #endif |
174 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
174 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
175 | rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), |
175 | rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), |
176 | #endif |
176 | #endif |
177 | #ifdef HAVE_SCROLLBARS |
|
|
178 | scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), |
177 | scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), |
179 | #endif |
|
|
180 | #ifdef USE_XIM |
178 | #ifdef USE_XIM |
181 | im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), |
179 | im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), |
182 | #endif |
180 | #endif |
183 | #ifdef POINTER_BLANK |
181 | #ifdef POINTER_BLANK |
184 | pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); |
182 | pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); |
… | |
… | |
226 | if (fontset[i] != fontset[0]) |
224 | if (fontset[i] != fontset[0]) |
227 | delete fontset[i]; |
225 | delete fontset[i]; |
228 | #endif |
226 | #endif |
229 | delete fontset[0]; |
227 | delete fontset[0]; |
230 | |
228 | |
|
|
229 | #ifdef HAVE_BG_PIXMAP |
|
|
230 | bgPixmap.destroy (); |
|
|
231 | #endif |
|
|
232 | #ifdef HAVE_AFTERIMAGE |
|
|
233 | if (asv) |
|
|
234 | destroy_asvisual (asv, 0); |
|
|
235 | if (asimman) |
|
|
236 | destroy_image_manager (asimman, 0); |
|
|
237 | #endif |
|
|
238 | |
231 | if (display) |
239 | if (display) |
232 | { |
240 | { |
233 | selection_clear (); |
241 | selection_clear (); |
|
|
242 | selection_clear (true); |
234 | |
243 | |
235 | #ifdef USE_XIM |
244 | #ifdef USE_XIM |
236 | im_destroy (); |
245 | im_destroy (); |
237 | #endif |
246 | #endif |
238 | #ifdef XTERM_SCROLLBAR |
247 | scrollBar.destroy (); |
239 | if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); |
|
|
240 | if (ShadowGC) XFreeGC (dpy, ShadowGC); |
|
|
241 | #endif |
|
|
242 | #ifdef PLAIN_SCROLLBAR |
|
|
243 | if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC); |
|
|
244 | #endif |
|
|
245 | #ifdef NEXT_SCROLLBAR |
|
|
246 | if (blackGC) XFreeGC (dpy, blackGC); |
|
|
247 | if (whiteGC) XFreeGC (dpy, whiteGC); |
|
|
248 | if (grayGC) XFreeGC (dpy, grayGC); |
|
|
249 | if (darkGC) XFreeGC (dpy, darkGC); |
|
|
250 | if (stippleGC) XFreeGC (dpy, stippleGC); |
|
|
251 | if (dimple) XFreePixmap (dpy, dimple); |
|
|
252 | if (upArrow) XFreePixmap (dpy, upArrow); |
|
|
253 | if (downArrow) XFreePixmap (dpy, downArrow); |
|
|
254 | if (upArrowHi) XFreePixmap (dpy, upArrowHi); |
|
|
255 | if (downArrowHi) XFreePixmap (dpy, downArrowHi); |
|
|
256 | #endif |
|
|
257 | #ifdef RXVT_SCROLLBAR |
|
|
258 | if (topShadowGC) XFreeGC (dpy, topShadowGC); |
|
|
259 | if (botShadowGC) XFreeGC (dpy, botShadowGC); |
|
|
260 | if (scrollbarGC) XFreeGC (dpy, scrollbarGC); |
|
|
261 | #endif |
|
|
262 | if (gc) XFreeGC (dpy, gc); |
248 | if (gc) XFreeGC (dpy, gc); |
263 | |
249 | |
264 | delete drawable; |
250 | delete drawable; |
265 | // destroy all windows |
251 | // destroy all windows |
266 | if (parent[0]) |
252 | if (parent[0]) |
… | |
… | |
274 | pix_colors_unfocused [i].free (this); |
260 | pix_colors_unfocused [i].free (this); |
275 | #endif |
261 | #endif |
276 | } |
262 | } |
277 | |
263 | |
278 | clear (); |
264 | clear (); |
279 | } |
|
|
280 | |
265 | |
281 | #ifdef HAVE_BG_PIXMAP |
|
|
282 | bgPixmap.destroy (); |
|
|
283 | #endif |
|
|
284 | display->flush (); /* ideally .put should do this */ |
266 | display->flush (); /* ideally .put should do this */ |
285 | displays.put (display); |
267 | displays.put (display); |
|
|
268 | } |
286 | |
269 | |
287 | scr_release (); |
270 | scr_release (); |
288 | |
271 | |
289 | /* clear all resources */ |
272 | /* clear all resources */ |
290 | for (int i = 0; i < allocated.size (); i++) |
273 | for (int i = 0; i < allocated.size (); i++) |
291 | free (allocated [i]); |
274 | free (allocated [i]); |
292 | |
275 | |
293 | free (selection.text); |
276 | free (selection.text); |
|
|
277 | free (selection.clip_text); |
294 | // TODO: manage env vars in child only(!) |
278 | // TODO: manage env vars in child only(!) |
295 | free (env_display); |
279 | free (env_display); |
296 | free (env_term); |
280 | free (env_term); |
297 | free (locale); |
281 | free (locale); |
298 | free (v_buffer); |
282 | free (v_buffer); |
… | |
… | |
336 | if (display) |
320 | if (display) |
337 | { |
321 | { |
338 | #if USE_XIM |
322 | #if USE_XIM |
339 | im_ev.stop (display); |
323 | im_ev.stop (display); |
340 | #endif |
324 | #endif |
341 | #if HAVE_SCROLLBARS |
|
|
342 | scrollbar_ev.stop (display); |
325 | scrollbar_ev.stop (display); |
343 | #endif |
|
|
344 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
326 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
345 | rootwin_ev.stop (display); |
327 | rootwin_ev.stop (display); |
346 | #endif |
328 | #endif |
347 | incr_ev.stop (); |
329 | incr_ev.stop (); |
348 | termwin_ev.stop (display); |
330 | termwin_ev.stop (display); |
… | |
… | |
467 | DisplayString (display)); |
449 | DisplayString (display)); |
468 | rxvt_emergency_cleanup (); |
450 | rxvt_emergency_cleanup (); |
469 | _exit (EXIT_FAILURE); |
451 | _exit (EXIT_FAILURE); |
470 | } |
452 | } |
471 | |
453 | |
472 | /*----------------------------------------------------------------------*/ |
|
|
473 | void |
|
|
474 | rxvt_term::init (int argc, const char *const *argv, stringvec *envv) |
|
|
475 | { |
|
|
476 | this->envv = envv; |
|
|
477 | |
|
|
478 | SET_R (this); |
|
|
479 | set_locale (""); |
|
|
480 | set_environ (envv); // few things in X do not call setlocale :( |
|
|
481 | |
|
|
482 | init_vars (); |
|
|
483 | |
|
|
484 | init_secondary (); |
|
|
485 | |
|
|
486 | const char **cmd_argv = init_resources (argc, argv); |
|
|
487 | |
|
|
488 | #ifdef KEYSYM_RESOURCE |
|
|
489 | keyboard->register_done (); |
|
|
490 | #endif |
|
|
491 | |
|
|
492 | #ifdef HAVE_SCROLLBARS |
|
|
493 | if (option (Opt_scrollBar)) |
|
|
494 | scrollBar.setIdle (); /* set existence for size calculations */ |
|
|
495 | #endif |
|
|
496 | |
|
|
497 | pty = ptytty::create (); |
|
|
498 | |
|
|
499 | create_windows (argc, argv); |
|
|
500 | |
|
|
501 | init_xlocale (); |
|
|
502 | |
|
|
503 | scr_reset (); // initialize screen |
|
|
504 | |
|
|
505 | #if 0 |
|
|
506 | XSynchronize (dpy, True); |
|
|
507 | #endif |
|
|
508 | |
|
|
509 | #ifdef HAVE_SCROLLBARS |
|
|
510 | if (option (Opt_scrollBar)) |
|
|
511 | resize_scrollbar (); /* create and map scrollbar */ |
|
|
512 | #endif |
|
|
513 | #ifdef HAVE_BG_PIXMAP |
|
|
514 | { |
|
|
515 | bgPixmap.set_target (this); |
|
|
516 | |
|
|
517 | #ifdef ENABLE_TRANSPARENCY |
|
|
518 | if (option (Opt_transparent)) |
|
|
519 | { |
|
|
520 | bgPixmap.set_transparent (); |
|
|
521 | |
|
|
522 | #ifdef HAVE_AFTERIMAGE |
|
|
523 | if (rs [Rs_blurradius]) |
|
|
524 | bgPixmap.set_blur_radius (rs [Rs_blurradius]); |
|
|
525 | #endif |
|
|
526 | if (ISSET_PIXCOLOR (Color_tint)) |
|
|
527 | bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
|
|
528 | |
|
|
529 | if (rs [Rs_shade]) |
|
|
530 | bgPixmap.set_shade (rs [Rs_shade]); |
|
|
531 | |
|
|
532 | bgPixmap.set_root_pixmap (); |
|
|
533 | XSelectInput (dpy, display->root, PropertyChangeMask); |
|
|
534 | rootwin_ev.start (display, display->root); |
|
|
535 | } |
|
|
536 | #endif |
|
|
537 | |
|
|
538 | #ifdef BG_IMAGE_FROM_FILE |
|
|
539 | if (rs[Rs_backgroundPixmap]) |
|
|
540 | { |
|
|
541 | const char *p = rs[Rs_backgroundPixmap]; |
|
|
542 | |
|
|
543 | if ((p = strchr (p, ';')) != 0) |
|
|
544 | { |
|
|
545 | p++; |
|
|
546 | bgPixmap.set_geometry (p); |
|
|
547 | } |
|
|
548 | else |
|
|
549 | bgPixmap.set_defaultGeometry (); |
|
|
550 | |
|
|
551 | if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) |
|
|
552 | if (!bgPixmap.window_position_sensitive ()) |
|
|
553 | update_background (); |
|
|
554 | } |
|
|
555 | #endif |
|
|
556 | } |
|
|
557 | #endif |
|
|
558 | |
|
|
559 | #if ENABLE_PERL |
|
|
560 | rootwin_ev.start (display, display->root); |
|
|
561 | #endif |
|
|
562 | |
|
|
563 | set_colorfgbg (); |
|
|
564 | |
|
|
565 | init_command (cmd_argv); |
|
|
566 | |
|
|
567 | free (cmd_argv); |
|
|
568 | |
|
|
569 | if (pty->pty >= 0) |
|
|
570 | pty_ev.start (pty->pty, ev::READ); |
|
|
571 | |
|
|
572 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
|
|
573 | |
|
|
574 | #if ENABLE_XEMBED |
|
|
575 | if (rs[Rs_embed]) |
|
|
576 | { |
|
|
577 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
578 | |
|
|
579 | XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
580 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
581 | } |
|
|
582 | #endif |
|
|
583 | |
|
|
584 | XMapWindow (dpy, vt); |
|
|
585 | XMapWindow (dpy, parent[0]); |
|
|
586 | } |
|
|
587 | |
|
|
588 | static struct sig_handlers |
454 | static struct sig_handlers |
589 | { |
455 | { |
590 | ev::sig sw_term, sw_int; |
456 | ev::sig sw_term, sw_int; |
591 | |
457 | |
592 | /* |
458 | /* |
… | |
… | |
644 | */ |
510 | */ |
645 | void |
511 | void |
646 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
512 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
647 | { |
513 | { |
648 | short recalc_x, recalc_y; |
514 | short recalc_x, recalc_y; |
649 | int x, y, sb_w, flags; |
515 | int x, y, flags; |
650 | unsigned int w, h; |
516 | unsigned int w, h; |
651 | unsigned int max_width, max_height; |
517 | unsigned int max_width, max_height; |
652 | |
518 | |
653 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
519 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
654 | szHint.win_gravity = NorthWestGravity; |
520 | szHint.win_gravity = NorthWestGravity; |
… | |
… | |
664 | if (rs[Rs_geometry]) |
530 | if (rs[Rs_geometry]) |
665 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
531 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
666 | |
532 | |
667 | if (flags & WidthValue) |
533 | if (flags & WidthValue) |
668 | { |
534 | { |
|
|
535 | if (!w) |
|
|
536 | rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n"); |
|
|
537 | |
669 | ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); |
538 | ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ()); |
670 | szHint.flags |= USSize; |
539 | szHint.flags |= USSize; |
671 | } |
540 | } |
672 | |
541 | |
673 | if (flags & HeightValue) |
542 | if (flags & HeightValue) |
674 | { |
543 | { |
|
|
544 | if (!h) |
|
|
545 | rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n"); |
|
|
546 | |
675 | nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); |
547 | nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ()); |
676 | szHint.flags |= USSize; |
548 | szHint.flags |= USSize; |
677 | } |
549 | } |
678 | |
550 | |
679 | if (flags & XValue) |
551 | if (flags & XValue) |
680 | { |
552 | { |
… | |
… | |
711 | max_width = MAX_COLS * fwidth; |
583 | max_width = MAX_COLS * fwidth; |
712 | max_height = MAX_ROWS * fheight; |
584 | max_height = MAX_ROWS * fheight; |
713 | |
585 | |
714 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
586 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
715 | |
587 | |
716 | sb_w = 0; |
|
|
717 | window_vt_x = window_vt_y = int_bwidth; |
588 | window_vt_x = window_vt_y = int_bwidth; |
718 | |
589 | |
719 | if (scrollBar.state) |
590 | if (scrollBar.state) |
720 | { |
591 | { |
721 | sb_w = scrollbar_TotalWidth (); |
592 | int sb_w = scrollBar.total_width (); |
722 | szHint.base_width += sb_w; |
593 | szHint.base_width += sb_w; |
723 | |
594 | |
724 | if (!option (Opt_scrollBar_right)) |
595 | if (!option (Opt_scrollBar_right)) |
725 | window_vt_x += sb_w; |
596 | window_vt_x += sb_w; |
726 | } |
597 | } |
… | |
… | |
750 | { |
621 | { |
751 | min_it (height, max_height); |
622 | min_it (height, max_height); |
752 | szHint.height = szHint.base_height + height; |
623 | szHint.height = szHint.base_height + height; |
753 | } |
624 | } |
754 | |
625 | |
755 | if (scrollBar.state && option (Opt_scrollBar_right)) |
|
|
756 | window_sb_x = szHint.width - sb_w; |
|
|
757 | |
|
|
758 | if (recalc_x) |
626 | if (recalc_x) |
759 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
627 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
760 | |
628 | |
761 | if (recalc_y) |
629 | if (recalc_y) |
762 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
630 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
763 | |
631 | |
764 | ncol = width / fwidth; |
632 | ncol = width / fwidth; |
765 | nrow = height / fheight; |
633 | nrow = height / fheight; |
766 | } |
634 | } |
767 | |
635 | |
768 | /*----------------------------------------------------------------------*/ |
636 | /*----------------------------------------------------------------------*/ |
769 | /* |
637 | /* |
… | |
… | |
780 | |
648 | |
781 | ws.ws_col = ncol; |
649 | ws.ws_col = ncol; |
782 | ws.ws_row = nrow; |
650 | ws.ws_row = nrow; |
783 | ws.ws_xpixel = width; |
651 | ws.ws_xpixel = width; |
784 | ws.ws_ypixel = height; |
652 | ws.ws_ypixel = height; |
785 | (void)ioctl (pty->pty, TIOCSWINSZ, &ws); |
653 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
786 | |
654 | |
787 | #if 0 |
655 | #if 0 |
788 | // TIOCSWINSZ is supposed to do this automatically and correctly |
656 | // TIOCSWINSZ is supposed to do this automatically and correctly |
789 | if (cmd_pid) /* force through to the command */ |
657 | if (cmd_pid) /* force through to the command */ |
790 | kill (-cmd_pid, SIGWINCH); |
658 | kill (-cmd_pid, SIGWINCH); |
… | |
… | |
822 | delete fontset[0]; |
690 | delete fontset[0]; |
823 | fontset[0] = fs; |
691 | fontset[0] = fs; |
824 | |
692 | |
825 | prop = (*fs)[1]->properties (); |
693 | prop = (*fs)[1]->properties (); |
826 | prop.height += lineSpace; |
694 | prop.height += lineSpace; |
|
|
695 | prop.width += letterSpace; |
827 | |
696 | |
828 | fs->set_prop (prop, false); |
697 | fs->set_prop (prop, false); |
829 | |
698 | |
830 | fwidth = prop.width; |
699 | fwidth = prop.width; |
831 | fheight = prop.height; |
700 | fheight = prop.height; |
… | |
… | |
920 | void |
789 | void |
921 | rxvt_term::set_window_color (int idx, const char *color) |
790 | rxvt_term::set_window_color (int idx, const char *color) |
922 | { |
791 | { |
923 | #ifdef XTERM_COLOR_CHANGE |
792 | #ifdef XTERM_COLOR_CHANGE |
924 | rxvt_color xcol; |
793 | rxvt_color xcol; |
925 | int i; |
|
|
926 | |
794 | |
927 | if (color == NULL || *color == '\0') |
795 | if (color == NULL || *color == '\0') |
928 | return; |
796 | return; |
929 | |
797 | |
930 | color = strdup (color); |
798 | color = strdup (color); |
… | |
… | |
932 | rs[Rs_color + idx] = color; |
800 | rs[Rs_color + idx] = color; |
933 | |
801 | |
934 | /* handle color aliases */ |
802 | /* handle color aliases */ |
935 | if (isdigit (*color)) |
803 | if (isdigit (*color)) |
936 | { |
804 | { |
937 | i = atoi (color); |
805 | int i = atoi (color); |
938 | |
806 | |
939 | if (i >= 8 && i <= 15) |
807 | if (i >= 8 && i <= 15) |
940 | { |
808 | { |
941 | /* bright colors */ |
809 | /* bright colors */ |
942 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; |
810 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; |
… | |
… | |
1046 | int old_width = szHint.width; |
914 | int old_width = szHint.width; |
1047 | int old_height = szHint.height; |
915 | int old_height = szHint.height; |
1048 | |
916 | |
1049 | window_calc (newwidth, newheight); |
917 | window_calc (newwidth, newheight); |
1050 | |
918 | |
1051 | if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) |
919 | bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)); |
|
|
920 | |
|
|
921 | // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow |
|
|
922 | if (set_hint) |
|
|
923 | { |
|
|
924 | szHint.flags &= ~(PBaseSize | PResizeInc); |
1052 | XSetWMNormalHints (dpy, parent[0], &szHint); |
925 | XSetWMNormalHints (dpy, parent[0], &szHint); |
|
|
926 | szHint.flags |= PBaseSize | PResizeInc; |
|
|
927 | } |
1053 | |
928 | |
1054 | if (!ignoreparent) |
929 | if (!ignoreparent) |
1055 | { |
930 | { |
1056 | #ifdef SMART_RESIZE |
931 | #ifdef SMART_RESIZE |
1057 | /* |
932 | /* |
… | |
… | |
1097 | #else |
972 | #else |
1098 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
973 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
1099 | #endif |
974 | #endif |
1100 | } |
975 | } |
1101 | |
976 | |
|
|
977 | if (set_hint) |
|
|
978 | XSetWMNormalHints (dpy, parent[0], &szHint); |
|
|
979 | |
1102 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
980 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1103 | |
981 | |
1104 | if (fix_screen || newwidth != old_width || newheight != old_height) |
982 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1105 | { |
983 | { |
1106 | if (scrollBar.state) |
984 | if (scrollBar.state) |
1107 | { |
985 | scrollBar.resize (); |
1108 | XMoveResizeWindow (dpy, scrollBar.win, |
|
|
1109 | window_sb_x, 0, |
|
|
1110 | scrollbar_TotalWidth (), szHint.height); |
|
|
1111 | resize_scrollbar (); |
|
|
1112 | } |
|
|
1113 | |
986 | |
1114 | XMoveResizeWindow (dpy, vt, |
987 | XMoveResizeWindow (dpy, vt, |
1115 | window_vt_x, window_vt_y, |
988 | window_vt_x, window_vt_y, |
1116 | width, height); |
989 | width, height); |
1117 | |
990 | |
1118 | #ifdef HAVE_BG_PIXMAP |
991 | #ifdef HAVE_BG_PIXMAP |
1119 | if (bgPixmap.window_size_sensitive ()) |
992 | if (bgPixmap.window_size_sensitive ()) |
1120 | update_background (); |
993 | update_background (); |
1121 | #endif |
994 | #endif |
1122 | |
|
|
1123 | scr_clear (); |
|
|
1124 | } |
995 | } |
1125 | |
996 | |
1126 | if (fix_screen || old_height == 0) |
997 | if (fix_screen || old_height == 0) |
1127 | scr_reset (); |
998 | scr_reset (); |
1128 | |
|
|
1129 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
|
|
1130 | //scr_touch (false); |
|
|
1131 | |
999 | |
1132 | #ifdef HAVE_BG_PIXMAP |
1000 | #ifdef HAVE_BG_PIXMAP |
1133 | // TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? |
1001 | // TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? |
1134 | // if (bgPixmap.pixmap) |
1002 | // if (bgPixmap.pixmap) |
1135 | // scr_touch (false); |
1003 | // scr_touch (false); |
… | |
… | |
1207 | |
1075 | |
1208 | /* Checking whether input method is running. */ |
1076 | /* Checking whether input method is running. */ |
1209 | bool |
1077 | bool |
1210 | rxvt_term::IMisRunning () |
1078 | rxvt_term::IMisRunning () |
1211 | { |
1079 | { |
1212 | char *p; |
|
|
1213 | Atom atom; |
1080 | Atom atom; |
1214 | Window win; |
1081 | Window win; |
1215 | char server[IMBUFSIZ]; |
1082 | char server[IMBUFSIZ]; |
1216 | |
1083 | |
1217 | /* get current locale modifier */ |
1084 | /* get current locale modifier */ |
1218 | if ((p = XSetLocaleModifiers (NULL)) != NULL) |
1085 | if (char *p = XSetLocaleModifiers (0)) |
1219 | { |
1086 | { |
1220 | strcpy (server, "@server="); |
1087 | strcpy (server, "@server="); |
1221 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1088 | strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */ |
1222 | |
1089 | |
1223 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1090 | if (p = strchr (server + 1, '@')) /* first one only */ |
1224 | *p = '\0'; |
1091 | *p = '\0'; |
1225 | |
1092 | |
1226 | atom = XInternAtom (dpy, server, False); |
1093 | atom = XInternAtom (dpy, server, False); |
1227 | win = XGetSelectionOwner (dpy, atom); |
1094 | win = XGetSelectionOwner (dpy, atom); |
1228 | |
1095 | |
… | |
… | |
1295 | |
1162 | |
1296 | term->make_current (); |
1163 | term->make_current (); |
1297 | |
1164 | |
1298 | if (text) |
1165 | if (text) |
1299 | { |
1166 | { |
1300 | void *str; |
1167 | wchar_t *str; |
1301 | |
1168 | |
1302 | if (!text->encoding_is_wchar && text->string.multi_byte) |
1169 | if (!text->encoding_is_wchar && text->string.multi_byte) |
1303 | { |
1170 | { |
1304 | // of course, X makes it ugly again |
1171 | // of course, X makes it ugly again |
1305 | if (term->rs[Rs_imLocale]) |
1172 | if (term->rs[Rs_imLocale]) |
1306 | SET_LOCALE (term->rs[Rs_imLocale]); |
1173 | SET_LOCALE (term->rs[Rs_imLocale]); |
1307 | |
1174 | |
1308 | str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); |
1175 | str = rxvt_temp_buf<wchar_t> (text->length + 1); |
1309 | mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); |
1176 | mbstowcs (str, text->string.multi_byte, text->length + 1); |
1310 | |
1177 | |
1311 | if (term->rs[Rs_imLocale]) |
1178 | if (term->rs[Rs_imLocale]) |
1312 | SET_LOCALE (term->locale); |
1179 | SET_LOCALE (term->locale); |
1313 | } |
1180 | } |
1314 | else |
1181 | else |
1315 | str = (void *)text->string.wide_char; |
1182 | str = text->string.wide_char; |
1316 | |
1183 | |
1317 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
1184 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
1318 | DT_INT, call_data->caret, |
1185 | DT_INT, call_data->caret, |
1319 | DT_INT, call_data->chg_first, |
1186 | DT_INT, call_data->chg_first, |
1320 | DT_INT, call_data->chg_length, |
1187 | DT_INT, call_data->chg_length, |