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.205 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.226 by root, Thu Jul 6 23:48:11 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
143} 143}
144#endif 144#endif
145 145
146rxvt_term::rxvt_term () 146rxvt_term::rxvt_term ()
147 : 147 :
148#if TRANSPARENT 148#if TRANSPARENT || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
150#endif 150#endif
151#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 153#endif
… …
198void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
199{ 199{
200 if (cmd_pid) 200 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
202 202
203 pty_ev.stop ();
203 delete pty; pty = 0; 204 delete pty; pty = 0;
204} 205}
205 206
206rxvt_term::~rxvt_term () 207rxvt_term::~rxvt_term ()
207{ 208{
… …
216#endif 217#endif
217 delete fontset[0]; 218 delete fontset[0];
218 219
219 if (display) 220 if (display)
220 { 221 {
221 dDisp;
222
223 selection_clear (); 222 selection_clear ();
224 223
225#ifdef USE_XIM 224#ifdef USE_XIM
226 im_destroy (); 225 im_destroy ();
227#endif 226#endif
228#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 230#endif
232#ifdef PLAIN_SCROLLBAR 231#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 232 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 233#endif
235#ifdef NEXT_SCROLLBAR 234#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 235 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 236 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 237 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 238 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 239 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 240 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 245#endif
247#ifdef RXVT_SCROLLBAR 246#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 250#endif
252 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (dpy, gc);
253 252
254 delete drawable; 253 delete drawable;
255 // destroy all windows 254 // destroy all windows
256 if (parent[0]) 255 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
258 }
259 257
260 // TODO: free pixcolours, colours should become part of rxvt_display 258 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i))
260 {
261 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING
263 pix_colors_unfocused [i].free (this);
264#endif
265 }
266
267 clear ();
268 }
269
261 delete pix_colors_focused; 270 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 271#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 272 delete pix_colors_unfocused;
264#endif 273#endif
265 274
… …
317 im_ev.stop (display); 326 im_ev.stop (display);
318#endif 327#endif
319#if HAVE_SCROLLBARS 328#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 329 scrollbar_ev.stop (display);
321#endif 330#endif
322#if TRANSPARENT 331#if TRANSPARENT || ENABLE_PERL
323 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
324#endif 333#endif
325 incr_ev.stop (); 334 incr_ev.stop ();
326 termwin_ev.stop (display); 335 termwin_ev.stop (display);
327 vt_ev.stop (display); 336 vt_ev.stop (display);
… …
368{ 377{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 378 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
371} 380}
372 381
373#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
374static void 383static void
375print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
376{ 385{
377 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
426 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
427 else 436 else
428 { 437 {
429 // GET_R is most likely not the terminal which caused the error, 438 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 439 // so just output the error and continue
431#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
432 print_x_error (display, event); 443 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 444#endif
436 } 445 }
437 446
438 return 0; 447 return 0;
439} 448}
… …
475 484
476 pty = ptytty::create (); 485 pty = ptytty::create ();
477 486
478 create_windows (argc, argv); 487 create_windows (argc, argv);
479 488
480 dDisp;
481
482 init_xlocale (); 489 init_xlocale ();
483 490
484 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
485 492
486#if 0 493#if 0
487 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
488#endif 495#endif
489 496
490#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
493#endif 500#endif
494#ifdef TRANSPARENT 501#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
496 { 503 {
497 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
498 check_our_parents (); 505 check_our_parents ();
499 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
500 } 507 }
501#endif 508#endif
509#if ENABLE_PERL
510 rootwin_ev.start (display, display->root);
511#endif
502 512
503 set_colorfgbg (); 513 set_colorfgbg ();
504 514
505 init_command (cmd_argv); 515 init_command (cmd_argv);
506 516
… …
516#if ENABLE_XEMBED 526#if ENABLE_XEMBED
517 if (rs[Rs_embed]) 527 if (rs[Rs_embed])
518 { 528 {
519 long info[2] = { 0, XEMBED_MAPPED }; 529 long info[2] = { 0, XEMBED_MAPPED };
520 530
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 531 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2); 532 32, PropModeReplace, (unsigned char *)&info, 2);
523 } 533 }
524#endif 534#endif
525 535
526 XMapWindow (disp, vt); 536 XMapWindow (dpy, vt);
527 XMapWindow (disp, parent[0]); 537 XMapWindow (dpy, parent[0]);
528 538
529 return true; 539 return true;
530} 540}
531 541
532static struct sig_handlers 542static struct sig_handlers
… …
622{ 632{
623 short recalc_x, recalc_y; 633 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 634 int x, y, sb_w, flags;
625 unsigned int w, h; 635 unsigned int w, h;
626 unsigned int max_width, max_height; 636 unsigned int max_width, max_height;
627 dDisp;
628 637
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 638 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 639 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 640 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 641
… …
694 703
695 if (scrollBar.state) 704 if (scrollBar.state)
696 { 705 {
697 sb_w = scrollbar_TotalWidth (); 706 sb_w = scrollbar_TotalWidth ();
698 szHint.base_width += sb_w; 707 szHint.base_width += sb_w;
708
699 if (!OPTION (Opt_scrollBar_right)) 709 if (!OPTION (Opt_scrollBar_right))
700 window_vt_x += sb_w; 710 window_vt_x += sb_w;
701 } 711 }
702 712
703 szHint.width_inc = fwidth; 713 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 714 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 715 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 716 szHint.min_height = szHint.base_height + szHint.height_inc;
707 717
708 if (newwidth && newwidth - szHint.base_width < max_width) 718 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 719 {
710 szHint.width = newwidth; 720 szHint.width = newwidth;
… …
729 739
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 740 if (scrollBar.state && OPTION (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 741 window_sb_x = szHint.width - sb_w;
732 742
733 if (recalc_x) 743 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 744 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
745
735 if (recalc_y) 746 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 747 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 748
738 ncol = width / fwidth; 749 ncol = width / fwidth;
739 nrow = height / fheight; 750 nrow = height / fheight;
740} 751}
741 752
… …
844 return true; 855 return true;
845} 856}
846 857
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 858void rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 859{
849 XChangeProperty (display->display, parent[0], 860 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 861 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 862 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 863}
853 864
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 865void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 866{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 867 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 868 char *s = rxvt_wcstoutf8 (ws);
858 869
859 XChangeProperty (display->display, parent[0], 870 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 871 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 872 (const unsigned char *)s, strlen (s));
862 873
863 free (s); 874 free (s);
864 free (ws); 875 free (ws);
… …
889void 900void
890rxvt_term::set_window_color (int idx, const char *color) 901rxvt_term::set_window_color (int idx, const char *color)
891{ 902{
892 rxvt_color xcol; 903 rxvt_color xcol;
893 int i; 904 int i;
894 905
895 if (color == NULL || *color == '\0') 906 if (color == NULL || *color == '\0')
896 return; 907 return;
908
909 color = strdup (color);
910 allocated.push_back ((void *)color);
911 rs[Rs_color + idx] = color;
897 912
898 /* handle color aliases */ 913 /* handle color aliases */
899 if (isdigit (*color)) 914 if (isdigit (*color))
900 { 915 {
901 i = atoi (color); 916 i = atoi (color);
902 917
903 if (i >= 8 && i <= 15) 918 if (i >= 8 && i <= 15)
904 { /* bright colors */ 919 { /* bright colors */
905 i -= 8; 920 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 921 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 922 goto done;
909 } 923 }
910 924
911 if (i >= 0 && i <= 7) 925 if (i >= 0 && i <= 7)
912 { /* normal colors */ 926 { /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 927 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 928 goto done;
916 } 929 }
917 } 930 }
918 931
919 if (!rXParseAllocColor (&xcol, color)) 932 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 933
924 /* 934 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 935 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 936 * so just keep gobbling up the colormap
927 */ 937 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 938
940 pix_colors_focused[idx] = xcol; 939 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 940
943 /* XSetWindowAttributes attr; */ 941 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */ 942 /* Cursor cursor; */
945done: 943done:
946
947#if OFF_FOCUS_FADING
948 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif
951
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 944 /*TODO: handle Color_BD, scrollbar background, etc. */
953 945
946 update_fade_color (idx);
954 recolour_cursor (); 947 recolour_cursor ();
955 scr_recolour (); 948 scr_recolour ();
956} 949}
957 950
958#else 951#else
… …
960#endif /* XTERM_COLOR_CHANGE */ 953#endif /* XTERM_COLOR_CHANGE */
961 954
962void 955void
963rxvt_term::recolour_cursor () 956rxvt_term::recolour_cursor ()
964{ 957{
965 XColor xcol[2]; 958 XColor fg, bg;
966 959
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 960 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 961 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 962 : pix_colors_focused[Color_fg]).get (fg);
963
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 964 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 965 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 966 : pix_colors_focused[Color_bg]).get (bg);
973 967
974 XQueryColors (display->display, display->cmap, xcol, 2); 968 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 969}
977 970
978/*----------------------------------------------------------------------*/ 971/*----------------------------------------------------------------------*/
979/* 972/*
980 * find if fg/bg matches any of the normal (low-intensity) colors 973 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 1002}
1010 1003
1011/*----------------------------------------------------------------------*/ 1004/*----------------------------------------------------------------------*/
1012 1005
1013int 1006bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1007rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 1008{
1016 if (!screen_in_out->set (display, colour)) 1009 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 return true; 1010 return true;
1011
1012 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1013 return false;
1014}
1015
1016void
1017rxvt_term::alias_color (int dst, int src)
1018{
1019 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 1020}
1024 1021
1025/* -------------------------------------------------------------------- * 1022/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1023 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1024 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1026rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1027{
1031 int fix_screen; 1028 int fix_screen;
1032 int old_width = szHint.width; 1029 int old_width = szHint.width;
1033 int old_height = szHint.height; 1030 int old_height = szHint.height;
1034 dDisp;
1035 1031
1036 window_calc (newwidth, newheight); 1032 window_calc (newwidth, newheight);
1033
1034 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1035 XSetWMNormalHints (dpy, parent[0], &szHint);
1038 1036
1039 if (!ignoreparent) 1037 if (!ignoreparent)
1040 { 1038 {
1041#ifdef SMART_RESIZE 1039#ifdef SMART_RESIZE
1042 /* 1040 /*
… …
1046 int x, y, x1, y1; 1044 int x, y, x1, y1;
1047 int dx, dy; 1045 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1046 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1047 Window unused_cr;
1050 1048
1051 XTranslateCoordinates (disp, parent[0], display->root, 1049 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1050 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1051 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1052 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1053 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 1054 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 1055 * our position for handles and decorations. Counter it
1058 */ 1056 */
… …
1060 { 1058 {
1061 x -= x1; 1059 x -= x1;
1062 y -= y1; 1060 y -= y1;
1063 } 1061 }
1064 1062
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1063 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1064 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1065 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1066 dy = old_height - szHint.height;
1069 1067
1070 /* Check position of the center of the window */ 1068 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1069 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1073 if (y < y1) /* top half */
1076 dy = 0; 1074 dy = 0;
1077 else if (y == y1) /* exact center */ 1075 else if (y == y1) /* exact center */
1078 dy /= 2; 1076 dy /= 2;
1079 1077
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1078 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1079 szHint.width, szHint.height);
1082#else 1080#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1081 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 1082#endif
1085 } 1083 }
1086 1084
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1085 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1086
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1087 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1088 {
1091 if (scrollBar.state) 1089 if (scrollBar.state)
1092 { 1090 {
1093 XMoveResizeWindow (disp, scrollBar.win, 1091 XMoveResizeWindow (dpy, scrollBar.win,
1094 window_sb_x, 0, 1092 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 1093 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1094 resize_scrollbar ();
1097 } 1095 }
1098 1096
1099 XMoveResizeWindow (disp, vt, 1097 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1098 window_vt_x, window_vt_y,
1101 width, height); 1099 width, height);
1102 1100
1103 scr_clear (); 1101 scr_clear ();
1104#ifdef XPM_BACKGROUND 1102#ifdef XPM_BACKGROUND
… …
1107 } 1105 }
1108 1106
1109 if (fix_screen || old_height == 0) 1107 if (fix_screen || old_height == 0)
1110 scr_reset (); 1108 scr_reset ();
1111 1109
1110 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1111 //scr_touch (false);
1112
1112#ifdef XPM_BACKGROUND 1113#ifdef XPM_BACKGROUND
1113 if (pixmap) 1114 if (pixmap)
1114 scr_touch (false); 1115 scr_touch (false);
1115#endif 1116#endif
1116 1117
1117#ifdef USE_XIM 1118#ifdef USE_XIM
1118 IMSetStatusPosition (); 1119 IMSetPosition ();
1119#endif 1120#endif
1120} 1121}
1121 1122
1122/* 1123/*
1123 * Set the width/height of the vt window in characters. Units are pixels. 1124 * Set the width/height of the vt window in characters. Units are pixels.
… …
1128{ 1129{
1129 XWindowAttributes wattr; 1130 XWindowAttributes wattr;
1130 1131
1131 if (newwidth == 0 || newheight == 0) 1132 if (newwidth == 0 || newheight == 0)
1132 { 1133 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1134 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1135
1135 if (newwidth == 0) 1136 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1137 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1138 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1139 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1153#ifdef USE_XIM
1153 1154
1154void 1155void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1156rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1157{
1157 fg = pix_colors[Color_fg]; 1158 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1159 bg = pix_colors [Color_bg];
1159} 1160}
1160 1161
1161void 1162void
1162rxvt_term::im_set_size (XRectangle &size) 1163rxvt_term::im_set_size (XRectangle &size)
1163{ 1164{
… …
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1201 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201 1202
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1203 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1204 *p = '\0';
1204 1205
1205 atom = XInternAtom (display->display, server, False); 1206 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1207 win = XGetSelectionOwner (dpy, atom);
1207 1208
1208 if (win != None) 1209 if (win != None)
1209 return True; 1210 return True;
1210 } 1211 }
1211 1212
… …
1435 "*", 1436 "*",
1436 fheight, 1437 fheight,
1437 fheight + 1, fheight - 1, 1438 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1439 fheight - 2, fheight + 2);
1439 1440
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1441 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1442 &missing_charset_list, &missing_charset_count, &def_string);
1442 1443
1443 if (missing_charset_list) 1444 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1445 XFreeStringList (missing_charset_list);
1445 1446
… …
1520 preedit_attr, 1521 preedit_attr,
1521 status_attr ? XNStatusAttributes : NULL, 1522 status_attr ? XNStatusAttributes : NULL,
1522 status_attr, NULL); 1523 status_attr, NULL);
1523 1524
1524 if (preedit_attr) XFree (preedit_attr); 1525 if (preedit_attr) XFree (preedit_attr);
1525 if (status_attr) XFree (status_attr); 1526 if (status_attr) XFree (status_attr);
1526 if (fs) XFreeFontSet (display->display, fs); 1527 if (fs) XFreeFontSet (dpy, fs);
1527 1528
1528 if (Input_Context == NULL) 1529 if (Input_Context == NULL)
1529 { 1530 {
1530 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1531 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1531 im_destroy (); 1532 im_destroy ();
… …
1536 // unfortunately, only the focus window is used by XIM, hard to fix 1537 // unfortunately, only the focus window is used by XIM, hard to fix
1537 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1538 vt_select_input (); 1539 vt_select_input ();
1539#endif 1540#endif
1540 1541
1541 if (input_style & XIMPreeditArea)
1542 IMSetStatusPosition (); 1542 IMSetPosition ();
1543 1543
1544 return true; 1544 return true;
1545} 1545}
1546 1546
1547void 1547void
… …
1605 SET_LOCALE (locale); 1605 SET_LOCALE (locale);
1606#endif 1606#endif
1607} 1607}
1608 1608
1609void 1609void
1610rxvt_term::IMSetStatusPosition () 1610rxvt_term::IMSetPosition ()
1611{ 1611{
1612 XRectangle preedit_rect, status_rect, *needed_rect; 1612 XRectangle preedit_rect, status_rect, *needed_rect;
1613 XVaNestedList preedit_attr, status_attr; 1613 XVaNestedList preedit_attr, status_attr;
1614 1614
1615 if (!Input_Context 1615 if (!Input_Context
1616 || !focus 1616 || !focus
1617 || !(input_style & XIMPreeditArea) 1617 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1618 || !IMisRunning ()) 1618 || !IMisRunning ())
1619 return; 1619 return;
1620 1620
1621 if (input_style & XIMPreeditPosition)
1622 {
1623 im_set_size (preedit_rect);
1624 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1625
1626 XSetICValues (Input_Context,
1627 XNPreeditAttributes, preedit_attr, NULL);
1628 }
1629 else
1630 {
1621 /* Getting the necessary width of preedit area */ 1631 /* Getting the necessary width of preedit area */
1622 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1632 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1623 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1633 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1624 XFree (status_attr); 1634 XFree (status_attr);
1625 1635
1626 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1636 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1627 XFree (needed_rect); 1637 XFree (needed_rect);
1628 1638
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1639 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1640 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1631 1641
1632 XSetICValues (Input_Context, 1642 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, 1643 XNPreeditAttributes, preedit_attr,
1634 XNStatusAttributes, status_attr, NULL); 1644 XNStatusAttributes, status_attr,
1645 NULL);
1635 1646
1647 XFree (status_attr);
1648 }
1649
1636 XFree (preedit_attr); 1650 XFree (preedit_attr);
1637 XFree (status_attr);
1638} 1651}
1639#endif /* USE_XIM */ 1652#endif /* USE_XIM */
1640 1653
1641/*----------------------- end-of-file (C source) -----------------------*/ 1654/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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