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.203 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.224 by root, Mon Feb 20 22:42:00 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>
… …
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
… …
271 for (int i = 0; i < allocated.size (); i++) 280 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 281 free (allocated [i]);
273 282
274 free (selection.text); 283 free (selection.text);
275 // TODO: manage env vars in child only(!) 284 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 285 free (env_display);
278 free (env_term); 286 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 287 free (locale);
281 free (v_buffer); 288 free (v_buffer);
282 free (incr_buf); 289 free (incr_buf);
283 290
284 delete envv; 291 delete envv;
… …
370{ 377{
371 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++)
372 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
373} 380}
374 381
375#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
376static void 383static void
377print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
378{ 385{
379 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
428 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
429 else 436 else
430 { 437 {
431 // 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,
432 // so just output the error and continue 439 // so just output the error and continue
433#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
434 print_x_error (display, event); 443 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 444#endif
438 } 445 }
439 446
440 return 0; 447 return 0;
441} 448}
… …
477 484
478 pty = ptytty::create (); 485 pty = ptytty::create ();
479 486
480 create_windows (argc, argv); 487 create_windows (argc, argv);
481 488
482 dDisp;
483
484 init_xlocale (); 489 init_xlocale ();
485 490
486 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
487 492
488#if 0 493#if 0
489 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
490#endif 495#endif
491 496
492#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
495#endif 500#endif
496#ifdef TRANSPARENT 501#ifdef TRANSPARENT
497 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
498 { 503 {
499 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
500 check_our_parents (); 505 check_our_parents ();
501 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
502 } 507 }
503#endif 508#endif
504 509
… …
518#if ENABLE_XEMBED 523#if ENABLE_XEMBED
519 if (rs[Rs_embed]) 524 if (rs[Rs_embed])
520 { 525 {
521 long info[2] = { 0, XEMBED_MAPPED }; 526 long info[2] = { 0, XEMBED_MAPPED };
522 527
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2); 529 32, PropModeReplace, (unsigned char *)&info, 2);
525 } 530 }
526#endif 531#endif
527 532
528 XMapWindow (disp, vt); 533 XMapWindow (dpy, vt);
529 XMapWindow (disp, parent[0]); 534 XMapWindow (dpy, parent[0]);
530 535
531 return true; 536 return true;
532} 537}
533 538
534static struct sig_handlers 539static struct sig_handlers
… …
624{ 629{
625 short recalc_x, recalc_y; 630 short recalc_x, recalc_y;
626 int x, y, sb_w, flags; 631 int x, y, sb_w, flags;
627 unsigned int w, h; 632 unsigned int w, h;
628 unsigned int max_width, max_height; 633 unsigned int max_width, max_height;
629 dDisp;
630 634
631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
632 szHint.win_gravity = NorthWestGravity; 636 szHint.win_gravity = NorthWestGravity;
633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 637 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
634 638
… …
696 700
697 if (scrollBar.state) 701 if (scrollBar.state)
698 { 702 {
699 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
700 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
701 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
702 window_vt_x += sb_w; 707 window_vt_x += sb_w;
703 } 708 }
704 709
705 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
706 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
709 714
710 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 716 {
712 szHint.width = newwidth; 717 szHint.width = newwidth;
… …
731 736
732 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
734 739
735 if (recalc_x) 740 if (recalc_x)
736 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742
737 if (recalc_y) 743 if (recalc_y)
738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
739 745
740 ncol = width / fwidth; 746 ncol = width / fwidth;
741 nrow = height / fheight; 747 nrow = height / fheight;
742} 748}
743 749
… …
846 return true; 852 return true;
847} 853}
848 854
849void rxvt_term::set_string_property (Atom prop, const char *str, int len) 855void rxvt_term::set_string_property (Atom prop, const char *str, int len)
850{ 856{
851 XChangeProperty (display->display, parent[0], 857 XChangeProperty (dpy, parent[0],
852 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
853 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
854} 860}
855 861
856void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
857{ 863{
858 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
859 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
860 866
861 XChangeProperty (display->display, parent[0], 867 XChangeProperty (dpy, parent[0],
862 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
863 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
864 870
865 free (s); 871 free (s);
866 free (ws); 872 free (ws);
… …
891void 897void
892rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
893{ 899{
894 rxvt_color xcol; 900 rxvt_color xcol;
895 int i; 901 int i;
896 902
897 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
898 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
899 909
900 /* handle color aliases */ 910 /* handle color aliases */
901 if (isdigit (*color)) 911 if (isdigit (*color))
902 { 912 {
903 i = atoi (color); 913 i = atoi (color);
904 914
905 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
906 { /* bright colors */ 916 { /* bright colors */
907 i -= 8; 917 i -= 8;
908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
909 SET_PIXCOLOR (idx);
910 goto done; 919 goto done;
911 } 920 }
912 921
913 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
914 { /* normal colors */ 923 { /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 SET_PIXCOLOR (idx);
917 goto done; 925 goto done;
918 } 926 }
919 } 927 }
920 928
921 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
922 return;
923
924 /* XStoreColor (display->display, display->cmap, XColor*); */
925 930
926 /* 931 /*
927 * FIXME: should free colors here, but no idea how to do it so instead, 932 * FIXME: should free colors here, but no idea how to do it so instead,
928 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
929 */ 934 */
930# if 0
931 for (i = Color_Black; i <= Color_White; i++)
932 if (pix_colors[idx] == pix_colors[i])
933 break;
934 if (i > Color_White)
935 {
936 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
937 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
938 DisplayPlanes (display->display, display->screen));
939 }
940# endif
941 935
942 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
943 SET_PIXCOLOR (idx);
944 937
945 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
946 /* Cursor cursor; */ 939 /* Cursor cursor; */
947done: 940done:
948 941
949#if OFF_FOCUS_FADING 942#if OFF_FOCUS_FADING
950 if (rs[Rs_fade]) 943 if (rs[Rs_fade])
951 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
952#endif 949#endif
953 950
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 951 /*TODO: handle Color_BD, scrollbar background, etc. */
955 952
956 recolour_cursor (); 953 recolour_cursor ();
… …
962#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
963 960
964void 961void
965rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
966{ 963{
967 XColor xcol[2]; 964 XColor fg, bg;
968 965
969 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
970 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
971 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
975 973
976 XQueryColors (display->display, display->cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
977 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
978} 975}
979 976
980/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
981/* 978/*
982 * find if fg/bg matches any of the normal (low-intensity) colors 979 * find if fg/bg matches any of the normal (low-intensity) colors
… …
986{ 983{
987 unsigned int i; 984 unsigned int i;
988 const char *xpmb = "\0"; 985 const char *xpmb = "\0";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990 987
991 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 988 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 989 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 991 if (pix_colors[Color_fg] == pix_colors[i])
996 { 992 {
… …
1011 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1012} 1008}
1013 1009
1014/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1015 1011
1016int 1012bool
1017rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1018{ 1014{
1019 if (!screen_in_out->set (display, colour)) 1015 if (color.set (this, name))
1020 {
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1022 return false;
1023 }
1024
1025 return true; 1016 return true;
1017
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1019 return false;
1020}
1021
1022void
1023rxvt_term::alias_color (int dst, int src)
1024{
1025 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1026} 1026}
1027 1027
1028/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1029 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1030 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
… …
1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1033{ 1033{
1034 int fix_screen; 1034 int fix_screen;
1035 int old_width = szHint.width; 1035 int old_width = szHint.width;
1036 int old_height = szHint.height; 1036 int old_height = szHint.height;
1037 dDisp;
1038 1037
1039 window_calc (newwidth, newheight); 1038 window_calc (newwidth, newheight);
1039
1040 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1040 XSetWMNormalHints (disp, parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1041 1042
1042 if (!ignoreparent) 1043 if (!ignoreparent)
1043 { 1044 {
1044#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1045 /* 1046 /*
… …
1049 int x, y, x1, y1; 1050 int x, y, x1, y1;
1050 int dx, dy; 1051 int dx, dy;
1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1052 Window unused_cr; 1053 Window unused_cr;
1053 1054
1054 XTranslateCoordinates (disp, parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1055 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1058 /* 1059 /*
1059 * if display->root isn't the parent window, a WM will probably have offset 1060 * if display->root isn't the parent window, a WM will probably have offset
1060 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1061 */ 1062 */
… …
1063 { 1064 {
1064 x -= x1; 1065 x -= x1;
1065 y -= y1; 1066 y -= y1;
1066 } 1067 }
1067 1068
1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1070 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1071 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1072 1073
1073 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1074 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
… …
1078 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1079 dy = 0; 1080 dy = 0;
1080 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1081 dy /= 2; 1082 dy /= 2;
1082 1083
1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1084 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1085#else 1086#else
1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1087#endif 1088#endif
1088 } 1089 }
1089 1090
1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1091 1092
1092 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1093 { 1094 {
1094 if (scrollBar.state) 1095 if (scrollBar.state)
1095 { 1096 {
1096 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1097 window_sb_x, 0, 1098 window_sb_x, 0,
1098 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1099 resize_scrollbar (); 1100 resize_scrollbar ();
1100 } 1101 }
1101 1102
1102 XMoveResizeWindow (disp, vt, 1103 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1104 width, height); 1105 width, height);
1105 1106
1106 scr_clear (); 1107 scr_clear ();
1107#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
… …
1110 } 1111 }
1111 1112
1112 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1113 scr_reset (); 1114 scr_reset ();
1114 1115
1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 //scr_touch (false);
1118
1115#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1116 if (pixmap) 1120 if (pixmap)
1117 scr_touch (false); 1121 scr_touch (false);
1118#endif 1122#endif
1119 1123
1120#ifdef USE_XIM 1124#ifdef USE_XIM
1121 IMSetStatusPosition (); 1125 IMSetPosition ();
1122#endif 1126#endif
1123} 1127}
1124 1128
1125/* 1129/*
1126 * Set the width/height of the vt window in characters. Units are pixels. 1130 * Set the width/height of the vt window in characters. Units are pixels.
… …
1131{ 1135{
1132 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1133 1137
1134 if (newwidth == 0 || newheight == 0) 1138 if (newwidth == 0 || newheight == 0)
1135 { 1139 {
1136 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1137 1141
1138 if (newwidth == 0) 1142 if (newwidth == 0)
1139 newwidth = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1140 if (newheight == 0) 1144 if (newheight == 0)
1141 newheight = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
… …
1155#ifdef USE_XIM 1159#ifdef USE_XIM
1156 1160
1157void 1161void
1158rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1159{ 1163{
1160 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1161 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1162} 1166}
1163 1167
1164void 1168void
1165rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1166{ 1170{
… …
1203 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1204 1208
1205 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1206 *p = '\0'; 1210 *p = '\0';
1207 1211
1208 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1209 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1210 1214
1211 if (win != None) 1215 if (win != None)
1212 return True; 1216 return True;
1213 } 1217 }
1214 1218
… …
1438 "*", 1442 "*",
1439 fheight, 1443 fheight,
1440 fheight + 1, fheight - 1, 1444 fheight + 1, fheight - 1,
1441 fheight - 2, fheight + 2); 1445 fheight - 2, fheight + 2);
1442 1446
1443 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1444 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1445 1449
1446 if (missing_charset_list) 1450 if (missing_charset_list)
1447 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1448 1452
… …
1489 XNBackground, bg, 1493 XNBackground, bg,
1490 XNArea, &status_rect, 1494 XNArea, &status_rect,
1491 XNFontSet, fs, 1495 XNFontSet, fs,
1492 NULL); 1496 NULL);
1493 } 1497 }
1498#if ENABLE_XIM_ONTHESPOT
1494 else if (input_style & XIMPreeditCallbacks) 1499 else if (input_style & XIMPreeditCallbacks)
1495 { 1500 {
1496 im_set_position (spot); 1501 im_set_position (spot);
1497 1502
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1503 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1504 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1505 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0 1506# if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1507 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif 1508# endif
1504 1509
1505 preedit_attr = XVaCreateNestedList (0, 1510 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot, 1511 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0], 1512 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1], 1513 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2], 1514 XNPreeditDrawCallback , &xcb[2],
1510#if 0 1515# if 0
1511 XNPreeditCaretCallback, &xcb[3], 1516 XNPreeditCaretCallback, &xcb[3],
1512#endif 1517# endif
1513 NULL); 1518 NULL);
1514 } 1519 }
1520#endif
1515 1521
1516 Input_Context = XCreateIC (xim, 1522 Input_Context = XCreateIC (xim,
1517 XNInputStyle, input_style, 1523 XNInputStyle, input_style,
1518 XNClientWindow, vt, 1524 XNClientWindow, vt,
1519 XNFocusWindow, parent[0], 1525 XNFocusWindow, parent[0],
… …
1521 preedit_attr, 1527 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1529 status_attr, NULL);
1524 1530
1525 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1528 1534
1529 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1530 { 1536 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1538 im_destroy ();
… …
1537 // unfortunately, only the focus window is used by XIM, hard to fix 1543 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input (); 1545 vt_select_input ();
1540#endif 1546#endif
1541 1547
1542 if (input_style & XIMPreeditArea)
1543 IMSetStatusPosition (); 1548 IMSetPosition ();
1544 1549
1545 return true; 1550 return true;
1546} 1551}
1547 1552
1548void 1553void
… …
1606 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1607#endif 1612#endif
1608} 1613}
1609 1614
1610void 1615void
1611rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1612{ 1617{
1613 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1614 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1615 1620
1616 if (!Input_Context 1621 if (!Input_Context
1617 || !focus 1622 || !focus
1618 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1619 || !IMisRunning ()) 1624 || !IMisRunning ())
1620 return; 1625 return;
1621 1626
1627 if (input_style & XIMPreeditPosition)
1628 {
1629 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631
1632 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL);
1634 }
1635 else
1636 {
1622 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1623 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1624 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1625 XFree (status_attr); 1640 XFree (status_attr);
1626 1641
1627 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1628 XFree (needed_rect); 1643 XFree (needed_rect);
1629 1644
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1632 1647
1633 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1634 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1635 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1636 1652
1653 XFree (status_attr);
1654 }
1655
1637 XFree (preedit_attr); 1656 XFree (preedit_attr);
1638 XFree (status_attr);
1639} 1657}
1640#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1641 1659
1642/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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