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.199 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.223 by root, Sat Feb 18 14:14:43 2006 UTC

… …
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;
… …
305rxvt_term::destroy () 312rxvt_term::destroy ()
306{ 313{
307 if (destroy_ev.active) 314 if (destroy_ev.active)
308 return; 315 return;
309 316
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 318
313#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
314 scr_overlay_off (); 320 scr_overlay_off ();
315#endif 321#endif
316 322
… …
371{ 377{
372 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++)
373 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
374} 380}
375 381
376#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
377static void 383static void
378print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
379{ 385{
380 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
430 else 436 else
431 { 437 {
432 // 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,
433 // so just output the error and continue 439 // so just output the error and continue
434#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
435 print_x_error (display, event); 443 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 444#endif
439 } 445 }
440 446
441 return 0; 447 return 0;
442} 448}
… …
478 484
479 pty = ptytty::create (); 485 pty = ptytty::create ();
480 486
481 create_windows (argc, argv); 487 create_windows (argc, argv);
482 488
483 dDisp;
484
485 init_xlocale (); 489 init_xlocale ();
486 490
487 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
488 492
489#if 0 493#if 0
490 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
491#endif 495#endif
492 496
493#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
496#endif 500#endif
497#ifdef TRANSPARENT 501#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
499 { 503 {
500 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents (); 505 check_our_parents ();
502 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
503 } 507 }
504#endif 508#endif
505 509
… …
514 518
515 check_ev.start (); 519 check_ev.start ();
516 520
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 521 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 522
523#if ENABLE_XEMBED
524 if (rs[Rs_embed])
525 {
526 long info[2] = { 0, XEMBED_MAPPED };
527
528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
529 32, PropModeReplace, (unsigned char *)&info, 2);
530 }
531#endif
532
519 XMapWindow (disp, vt); 533 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 534 XMapWindow (dpy, parent[0]);
521 535
522 return true; 536 return true;
523} 537}
524 538
525static struct sig_handlers 539static struct sig_handlers
… …
615{ 629{
616 short recalc_x, recalc_y; 630 short recalc_x, recalc_y;
617 int x, y, sb_w, flags; 631 int x, y, sb_w, flags;
618 unsigned int w, h; 632 unsigned int w, h;
619 unsigned int max_width, max_height; 633 unsigned int max_width, max_height;
620 dDisp;
621 634
622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
623 szHint.win_gravity = NorthWestGravity; 636 szHint.win_gravity = NorthWestGravity;
624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 637 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
625 638
… …
687 700
688 if (scrollBar.state) 701 if (scrollBar.state)
689 { 702 {
690 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
691 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
692 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
693 window_vt_x += sb_w; 707 window_vt_x += sb_w;
694 } 708 }
695 709
696 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
697 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
698 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
699 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
700 714
701 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
702 { 716 {
703 szHint.width = newwidth; 717 szHint.width = newwidth;
… …
722 736
723 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
724 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
725 739
726 if (recalc_x) 740 if (recalc_x)
727 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742
728 if (recalc_y) 743 if (recalc_y)
729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
730 745
731 ncol = width / fwidth; 746 ncol = width / fwidth;
732 nrow = height / fheight; 747 nrow = height / fheight;
733} 748}
734 749
… …
837 return true; 852 return true;
838} 853}
839 854
840void 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)
841{ 856{
842 XChangeProperty (display->display, parent[0], 857 XChangeProperty (dpy, parent[0],
843 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
844 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
845} 860}
846 861
847void 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)
848{ 863{
849 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
850 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
851 866
852 XChangeProperty (display->display, parent[0], 867 XChangeProperty (dpy, parent[0],
853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
854 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
855 870
856 free (s); 871 free (s);
857 free (ws); 872 free (ws);
… …
882void 897void
883rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
884{ 899{
885 rxvt_color xcol; 900 rxvt_color xcol;
886 int i; 901 int i;
887 902
888 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
889 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
890 909
891 /* handle color aliases */ 910 /* handle color aliases */
892 if (isdigit (*color)) 911 if (isdigit (*color))
893 { 912 {
894 i = atoi (color); 913 i = atoi (color);
895 914
896 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
897 { /* bright colors */ 916 { /* bright colors */
898 i -= 8; 917 i -= 8;
899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
900 SET_PIXCOLOR (idx);
901 goto done; 919 goto done;
902 } 920 }
903 921
904 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
905 { /* normal colors */ 923 { /* normal colors */
906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 925 goto done;
909 } 926 }
910 } 927 }
911 928
912 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
913 return;
914
915 /* XStoreColor (display->display, display->cmap, XColor*); */
916 930
917 /* 931 /*
918 * 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,
919 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
920 */ 934 */
921# if 0
922 for (i = Color_Black; i <= Color_White; i++)
923 if (pix_colors[idx] == pix_colors[i])
924 break;
925 if (i > Color_White)
926 {
927 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
928 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
929 DisplayPlanes (display->display, display->screen));
930 }
931# endif
932 935
933 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
934 SET_PIXCOLOR (idx);
935 937
936 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
937 /* Cursor cursor; */ 939 /* Cursor cursor; */
938done: 940done:
939 941
940#if OFF_FOCUS_FADING 942#if OFF_FOCUS_FADING
941 if (rs[Rs_fade]) 943 if (rs[Rs_fade])
942 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 }
943#endif 949#endif
944 950
945 /*TODO: handle Color_BD, scrollbar background, etc. */ 951 /*TODO: handle Color_BD, scrollbar background, etc. */
946 952
947 recolour_cursor (); 953 recolour_cursor ();
… …
953#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
954 960
955void 961void
956rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
957{ 963{
958 XColor xcol[2]; 964 XColor fg, bg;
959 965
960 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
961 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
962 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
963 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
964 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
965 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
966 973
967 XQueryColors (display->display, display->cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
968 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
969} 975}
970 976
971/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
972/* 978/*
973 * 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
… …
977{ 983{
978 unsigned int i; 984 unsigned int i;
979 const char *xpmb = "\0"; 985 const char *xpmb = "\0";
980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
981 987
982 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
983 strcpy (fstr, "default"); 988 strcpy (fstr, "default");
984 strcpy (bstr, "default"); 989 strcpy (bstr, "default");
985 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
986 if (pix_colors[Color_fg] == pix_colors[i]) 991 if (pix_colors[Color_fg] == pix_colors[i])
987 { 992 {
… …
1002 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1003} 1008}
1004 1009
1005/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1006 1011
1007int 1012bool
1008rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1009{ 1014{
1010 if (!screen_in_out->set (display, colour)) 1015 if (color.set (this, name))
1011 {
1012 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1013 return false;
1014 }
1015
1016 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]);
1017} 1026}
1018 1027
1019/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1020 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1021 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
… …
1023rxvt_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)
1024{ 1033{
1025 int fix_screen; 1034 int fix_screen;
1026 int old_width = szHint.width; 1035 int old_width = szHint.width;
1027 int old_height = szHint.height; 1036 int old_height = szHint.height;
1028 dDisp;
1029 1037
1030 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)))
1031 XSetWMNormalHints (disp, parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1032 1042
1033 if (!ignoreparent) 1043 if (!ignoreparent)
1034 { 1044 {
1035#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1036 /* 1046 /*
… …
1040 int x, y, x1, y1; 1050 int x, y, x1, y1;
1041 int dx, dy; 1051 int dx, dy;
1042 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1043 Window unused_cr; 1053 Window unused_cr;
1044 1054
1045 XTranslateCoordinates (disp, parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1046 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1047 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1048 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1049 /* 1059 /*
1050 * 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
1051 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1052 */ 1062 */
… …
1054 { 1064 {
1055 x -= x1; 1065 x -= x1;
1056 y -= y1; 1066 y -= y1;
1057 } 1067 }
1058 1068
1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1061 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1062 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1063 1073
1064 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1065 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
… …
1069 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1070 dy = 0; 1080 dy = 0;
1071 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1072 dy /= 2; 1082 dy /= 2;
1073 1083
1074 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1075 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1076#else 1086#else
1077 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1078#endif 1088#endif
1079 } 1089 }
1080 1090
1081 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1082 1092
1083 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1084 { 1094 {
1085 if (scrollBar.state) 1095 if (scrollBar.state)
1086 { 1096 {
1087 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1088 window_sb_x, 0, 1098 window_sb_x, 0,
1089 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1090 resize_scrollbar (); 1100 resize_scrollbar ();
1091 } 1101 }
1092 1102
1093 XMoveResizeWindow (disp, vt, 1103 XMoveResizeWindow (dpy, vt,
1094 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1095 width, height); 1105 width, height);
1096 1106
1097 scr_clear (); 1107 scr_clear ();
1098#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
… …
1101 } 1111 }
1102 1112
1103 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1104 scr_reset (); 1114 scr_reset ();
1105 1115
1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 //scr_touch (false);
1118
1106#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1107 if (pixmap) 1120 if (pixmap)
1108 scr_touch (false); 1121 scr_touch (false);
1109#endif 1122#endif
1110 1123
1111#ifdef USE_XIM 1124#ifdef USE_XIM
1112 IMSetStatusPosition (); 1125 IMSetPosition ();
1113#endif 1126#endif
1114} 1127}
1115 1128
1116/* 1129/*
1117 * 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.
… …
1122{ 1135{
1123 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1124 1137
1125 if (newwidth == 0 || newheight == 0) 1138 if (newwidth == 0 || newheight == 0)
1126 { 1139 {
1127 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1128 1141
1129 if (newwidth == 0) 1142 if (newwidth == 0)
1130 newwidth = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1131 if (newheight == 0) 1144 if (newheight == 0)
1132 newheight = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
… …
1146#ifdef USE_XIM 1159#ifdef USE_XIM
1147 1160
1148void 1161void
1149rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1150{ 1163{
1151 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1152 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1153} 1166}
1154 1167
1155void 1168void
1156rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1157{ 1170{
… …
1194 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1195 1208
1196 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1197 *p = '\0'; 1210 *p = '\0';
1198 1211
1199 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1200 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1201 1214
1202 if (win != None) 1215 if (win != None)
1203 return True; 1216 return True;
1204 } 1217 }
1205 1218
… …
1212 XPoint nspot; 1225 XPoint nspot;
1213 XVaNestedList preedit_attr; 1226 XVaNestedList preedit_attr;
1214 1227
1215 if (!Input_Context 1228 if (!Input_Context
1216 || !focus 1229 || !focus
1217 || !(input_style & XIMPreeditPosition)) 1230 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1218 return; 1231 return;
1219 1232
1220 im_set_position (nspot); 1233 im_set_position (nspot);
1221 1234
1222 if (nspot.x == spot.x && nspot.y == spot.y) 1235 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1241 input_method = 0; 1254 input_method = 0;
1242 } 1255 }
1243 1256
1244 Input_Context = 0; 1257 Input_Context = 0;
1245} 1258}
1259
1260#ifdef ENABLE_XIM_ONTHESPOT
1261
1262static void
1263xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1264{
1265 ((rxvt_term *)client_data)->make_current ();
1266 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1267}
1268
1269static void
1270xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1271{
1272 ((rxvt_term *)client_data)->make_current ();
1273 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1274}
1275
1276static void
1277xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1278{
1279 rxvt_term *term = (rxvt_term *)client_data;
1280 XIMText *text = call_data->text;
1281
1282 term->make_current ();
1283
1284 if (text)
1285 {
1286 void *str;
1287
1288 if (!text->encoding_is_wchar && text->string.multi_byte)
1289 {
1290 // of course, X makes it ugly again
1291 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->rs[Rs_imLocale]);
1293
1294 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1295 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1296
1297 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->locale);
1299 }
1300 else
1301 str = (void *)text->string.wide_char;
1302
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length,
1307 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1308 DT_WCS_LEN, str, str ? (int)text->length : 0,
1309 DT_END));
1310 }
1311 else
1312 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1313 DT_INT, call_data->caret,
1314 DT_INT, call_data->chg_first,
1315 DT_INT, call_data->chg_length,
1316 DT_END));
1317}
1318
1319#if 0
1320static void
1321xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1322{
1323 ((rxvt_term *)client_data)->make_current ();
1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1325 DT_INT, call_data->position,
1326 DT_INT, call_data->direction,
1327 DT_INT, call_data->style,
1328 DT_END));
1329}
1330#endif
1331
1332#endif
1246 1333
1247/* 1334/*
1248 * Try to open a XIM with the current modifiers, then see if we can 1335 * Try to open a XIM with the current modifiers, then see if we can
1249 * open a suitable preedit type 1336 * open a suitable preedit type
1250 */ 1337 */
… …
1257 XRectangle rect, status_rect, needed_rect; 1344 XRectangle rect, status_rect, needed_rect;
1258 unsigned long fg, bg; 1345 unsigned long fg, bg;
1259 const char *p; 1346 const char *p;
1260 char **s; 1347 char **s;
1261 XIMStyles *xim_styles; 1348 XIMStyles *xim_styles;
1349#ifdef ENABLE_XIM_ONTHESPOT
1350 XIMCallback xcb[4];
1351#endif
1262 1352
1263 set_environ (envv); 1353 set_environ (envv);
1264 1354
1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1355 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1266 return false; 1356 return false;
… …
1292 s = rxvt_splitcommastring (p); 1382 s = rxvt_splitcommastring (p);
1293 1383
1294 for (i = found = 0; !found && s[i]; i++) 1384 for (i = found = 0; !found && s[i]; i++)
1295 { 1385 {
1296 if (!strcmp (s[i], "OverTheSpot")) 1386 if (!strcmp (s[i], "OverTheSpot"))
1297 input_style = (XIMPreeditPosition | XIMStatusNothing); 1387 input_style = XIMPreeditPosition | XIMStatusNothing;
1298 else if (!strcmp (s[i], "OffTheSpot")) 1388 else if (!strcmp (s[i], "OffTheSpot"))
1299 input_style = (XIMPreeditArea | XIMStatusArea); 1389 input_style = XIMPreeditArea | XIMStatusArea;
1300 else if (!strcmp (s[i], "Root")) 1390 else if (!strcmp (s[i], "Root"))
1301 input_style = (XIMPreeditNothing | XIMStatusNothing); 1391 input_style = XIMPreeditNothing | XIMStatusNothing;
1302 else if (!strcmp (s[i], "None")) 1392 else if (!strcmp (s[i], "None"))
1303 input_style = (XIMPreeditNone | XIMStatusNone); 1393 input_style = XIMPreeditNone | XIMStatusNone;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1396 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1397#endif
1398 else
1399 input_style = XIMPreeditNothing | XIMStatusNothing;
1304 1400
1305 for (j = 0; j < xim_styles->count_styles; j++) 1401 for (j = 0; j < xim_styles->count_styles; j++)
1306 if (input_style == xim_styles->supported_styles[j]) 1402 if (input_style == xim_styles->supported_styles[j])
1307 { 1403 {
1308 rxvt_freecommastring (s); 1404 rxvt_freecommastring (s);
… …
1346 "*", 1442 "*",
1347 fheight, 1443 fheight,
1348 fheight + 1, fheight - 1, 1444 fheight + 1, fheight - 1,
1349 fheight - 2, fheight + 2); 1445 fheight - 2, fheight + 2);
1350 1446
1351 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1352 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1353 1449
1354 if (missing_charset_list) 1450 if (missing_charset_list)
1355 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1356 1452
… …
1397 XNBackground, bg, 1493 XNBackground, bg,
1398 XNArea, &status_rect, 1494 XNArea, &status_rect,
1399 XNFontSet, fs, 1495 XNFontSet, fs,
1400 NULL); 1496 NULL);
1401 } 1497 }
1498#if ENABLE_XIM_ONTHESPOT
1499 else if (input_style & XIMPreeditCallbacks)
1500 {
1501 im_set_position (spot);
1502
1503 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1504 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1505 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1506# if 0
1507 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1508# endif
1509
1510 preedit_attr = XVaCreateNestedList (0,
1511 XNSpotLocation, &spot,
1512 XNPreeditStartCallback, &xcb[0],
1513 XNPreeditDoneCallback , &xcb[1],
1514 XNPreeditDrawCallback , &xcb[2],
1515# if 0
1516 XNPreeditCaretCallback, &xcb[3],
1517# endif
1518 NULL);
1519 }
1520#endif
1402 1521
1403 Input_Context = XCreateIC (xim, 1522 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1523 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1524 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1525 XNFocusWindow, parent[0],
… …
1408 preedit_attr, 1527 preedit_attr,
1409 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1410 status_attr, NULL); 1529 status_attr, NULL);
1411 1530
1412 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1413 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1414 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1415 1534
1416 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1417 { 1536 {
1418 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1419 im_destroy (); 1538 im_destroy ();
1420 return false; 1539 return false;
1421 } 1540 }
1422 1541
1542#if 0
1543 // unfortunately, only the focus window is used by XIM, hard to fix
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input (); 1545 vt_select_input ();
1546#endif
1425 1547
1426 if (input_style & XIMPreeditArea)
1427 IMSetStatusPosition (); 1548 IMSetPosition ();
1428 1549
1429 return true; 1550 return true;
1430} 1551}
1431 1552
1432void 1553void
… …
1490 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1491#endif 1612#endif
1492} 1613}
1493 1614
1494void 1615void
1495rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1496{ 1617{
1497 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1498 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1499 1620
1500 if (!Input_Context 1621 if (!Input_Context
1501 || !focus 1622 || !focus
1502 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1503 || !IMisRunning ()) 1624 || !IMisRunning ())
1504 return; 1625 return;
1505 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 {
1506 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1507 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1508 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1509 XFree (status_attr); 1640 XFree (status_attr);
1510 1641
1511 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1512 XFree (needed_rect); 1643 XFree (needed_rect);
1513 1644
1514 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1515 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1516 1647
1517 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1518 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1519 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1520 1652
1653 XFree (status_attr);
1654 }
1655
1521 XFree (preedit_attr); 1656 XFree (preedit_attr);
1522 XFree (status_attr);
1523} 1657}
1524#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1525 1659
1526/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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