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.195 by root, Sun Jan 22 00:48:13 2006 UTC vs.
Revision 1.217 by root, Thu Feb 2 18:00:23 2006 UTC

… …
216#endif 216#endif
217 delete fontset[0]; 217 delete fontset[0];
218 218
219 if (display) 219 if (display)
220 { 220 {
221 dDisp;
222
223 selection_clear (); 221 selection_clear ();
224 222
225#ifdef USE_XIM 223#ifdef USE_XIM
226 im_destroy (); 224 im_destroy ();
227#endif 225#endif
228#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
231#endif 229#endif
232#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
234#endif 232#endif
235#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
246#endif 244#endif
247#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
251#endif 249#endif
252 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
253 251
254 delete drawable; 252 delete drawable;
255 // destroy all windows 253 // destroy all windows
256 if (parent[0]) 254 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
258 }
259 256
260 // TODO: free pixcolours, colours should become part of rxvt_display 257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
265
266 clear ();
267 }
268
261 delete pix_colors_focused; 269 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
264#endif 272#endif
265 273
… …
271 for (int i = 0; i < allocated.size (); i++) 279 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 280 free (allocated [i]);
273 281
274 free (selection.text); 282 free (selection.text);
275 // TODO: manage env vars in child only(!) 283 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 284 free (env_display);
278 free (env_term); 285 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 286 free (locale);
281 free (v_buffer); 287 free (v_buffer);
282 free (incr_buf); 288 free (incr_buf);
283 289
284 delete envv; 290 delete envv;
… …
305rxvt_term::destroy () 311rxvt_term::destroy ()
306{ 312{
307 if (destroy_ev.active) 313 if (destroy_ev.active)
308 return; 314 return;
309 315
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 317
313#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
314 scr_overlay_off (); 319 scr_overlay_off ();
315#endif 320#endif
316 321
… …
371{ 376{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
374} 379}
375 380
376#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
377static void 382static void
378print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
379{ 384{
380 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
430 else 435 else
431 { 436 {
432 // GET_R is most likely not the terminal which caused the error, 437 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 438 // so just output the error and continue
434#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
435 print_x_error (display, event); 442 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 443#endif
439 } 444 }
440 445
441 return 0; 446 return 0;
442} 447}
… …
474#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 482#endif
478 483
479 pty = ptytty_new (); 484 pty = ptytty::create ();
480 485
481 create_windows (argc, argv); 486 create_windows (argc, argv);
482 487
483 dDisp;
484
485 init_xlocale (); 488 init_xlocale ();
486 489
487 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
488 491
489#if 0 492#if 0
490 XSynchronize (disp, True); 493 XSynchronize (xdisp, True);
491#endif 494#endif
492 495
493#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
496#endif 499#endif
497#ifdef TRANSPARENT 500#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
499 { 502 {
500 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (xdisp, display->root, PropertyChangeMask);
501 check_our_parents (); 504 check_our_parents ();
502 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
503 } 506 }
504#endif 507#endif
505 508
… …
514 517
515 check_ev.start (); 518 check_ev.start ();
516 519
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
519 XMapWindow (disp, vt); 532 XMapWindow (xdisp, vt);
520 XMapWindow (disp, parent[0]); 533 XMapWindow (xdisp, parent[0]);
521 534
522 return true; 535 return true;
523} 536}
524 537
525static struct sig_handlers 538static struct sig_handlers
… …
530 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
531 */ 544 */
532 void 545 void
533 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
534 { 547 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
541 } 551 }
542 552
… …
550char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
551 561
552void 562void
553rxvt_init () 563rxvt_init ()
554{ 564{
555 uid_t uid = getuid (); 565 ptytty::init ();
556 gid_t gid = getgid ();
557
558 // before doing anything else, check for setuid/setgid operation,
559 // start the helper process and drop privileges
560 if (uid != geteuid ()
561 || gid != getegid ())
562 {
563#if PTYTTY_HELPER
564 ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568
569 // drop privileges
570#if HAVE_SETRESUID
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580
581 if (uid != geteuid ()
582 || gid != getegid ())
583 rxvt_fatal ("unable to drop privileges, aborting.\n");
584 }
585 566
586 rxvt_environ = environ; 567 rxvt_environ = environ;
587 568
588 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
589 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
… …
647{ 628{
648 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 630 int x, y, sb_w, flags;
650 unsigned int w, h; 631 unsigned int w, h;
651 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
652 dDisp;
653
654 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
655 ncol, nrow, szHint.width, szHint.height));
656 633
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
660 637
… …
722 699
723 if (scrollBar.state) 700 if (scrollBar.state)
724 { 701 {
725 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
726 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
727 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
728 window_vt_x += sb_w; 706 window_vt_x += sb_w;
729 } 707 }
730 708
731 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
… …
757 735
758 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
760 738
761 if (recalc_x) 739 if (recalc_x)
762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
741
763 if (recalc_y) 742 if (recalc_y)
764 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
765 744
766 ncol = width / fwidth; 745 ncol = width / fwidth;
767 nrow = height / fheight; 746 nrow = height / fheight;
768 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
769 ncol, nrow, szHint.width,
770 szHint.height));
771 return;
772} 747}
773 748
774/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
775/* 750/*
776 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
… …
876 return true; 851 return true;
877} 852}
878 853
879void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
880{ 855{
881 XChangeProperty (display->display, parent[0], 856 XChangeProperty (xdisp, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 859}
885 860
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 862{
888 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
890 865
891 XChangeProperty (display->display, parent[0], 866 XChangeProperty (xdisp, parent[0],
892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
893 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
894 869
895 free (s); 870 free (s);
896 free (ws); 871 free (ws);
… …
921void 896void
922rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
923{ 898{
924 rxvt_color xcol; 899 rxvt_color xcol;
925 int i; 900 int i;
926 901
927 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
928 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
929 908
930 /* handle color aliases */ 909 /* handle color aliases */
931 if (isdigit (*color)) 910 if (isdigit (*color))
932 { 911 {
933 i = atoi (color); 912 i = atoi (color);
934 913
935 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
936 { /* bright colors */ 915 { /* bright colors */
937 i -= 8; 916 i -= 8;
938 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
939 SET_PIXCOLOR (idx);
940 goto done; 918 goto done;
941 } 919 }
942 920
943 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
944 { /* normal colors */ 922 { /* normal colors */
945 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
946 SET_PIXCOLOR (idx);
947 goto done; 924 goto done;
948 } 925 }
949 } 926 }
950 927
951 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
952 return;
953
954 /* XStoreColor (display->display, display->cmap, XColor*); */
955 929
956 /* 930 /*
957 * FIXME: should free colors here, but no idea how to do it so instead, 931 * FIXME: should free colors here, but no idea how to do it so instead,
958 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
959 */ 933 */
960# if 0
961 for (i = Color_Black; i <= Color_White; i++)
962 if (pix_colors[idx] == pix_colors[i])
963 break;
964 if (i > Color_White)
965 {
966 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
967 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
968 DisplayPlanes (display->display, display->screen));
969 }
970# endif
971 934
972 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
973 SET_PIXCOLOR (idx);
974 936
975 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
976 /* Cursor cursor; */ 938 /* Cursor cursor; */
977done: 939done:
978 940
979#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
980 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
981 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
982#endif 948#endif
983 949
984 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
985 951
986 recolour_cursor (); 952 recolour_cursor ();
… …
992#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
993 959
994void 960void
995rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
996{ 962{
997 XColor xcol[2]; 963 XColor fg, bg;
998 964
999 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1000 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1001 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1003 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1004 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1005 972
1006 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
1007 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1008} 974}
1009 975
1010/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1011/* 977/*
1012 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1016{ 982{
1017 unsigned int i; 983 unsigned int i;
1018 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1019 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1020 986
1021 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1022 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1023 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1024 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1025 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1026 { 991 {
… …
1041 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1042} 1007}
1043 1008
1044/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1045 1010
1046int 1011bool
1047rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1048{ 1013{
1049 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1050 {
1051 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1052 return false;
1053 }
1054
1055 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1056} 1025}
1057 1026
1058/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1059 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1060 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1061void 1030void
1062rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1063{ 1032{
1064 int fix_screen; 1033 int fix_screen;
1065 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1066 dDisp; 1035 int old_height = szHint.height;
1067 1036
1068 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1069 XSetWMNormalHints (disp, parent[0], &szHint); 1038 XSetWMNormalHints (xdisp, parent[0], &szHint);
1070 1039
1071 if (!ignoreparent) 1040 if (!ignoreparent)
1072 { 1041 {
1073#ifdef SMART_RESIZE 1042#ifdef SMART_RESIZE
1074 /* 1043 /*
… …
1078 int x, y, x1, y1; 1047 int x, y, x1, y1;
1079 int dx, dy; 1048 int dx, dy;
1080 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1081 Window unused_cr; 1050 Window unused_cr;
1082 1051
1083 XTranslateCoordinates (disp, parent[0], display->root, 1052 XTranslateCoordinates (xdisp, parent[0], display->root,
1084 0, 0, &x, &y, &unused_cr); 1053 0, 0, &x, &y, &unused_cr);
1085 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1086 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1087 /* 1056 /*
1088 * if display->root isn't the parent window, a WM will probably have offset 1057 * if display->root isn't the parent window, a WM will probably have offset
1089 * our position for handles and decorations. Counter it 1058 * our position for handles and decorations. Counter it
1090 */ 1059 */
… …
1092 { 1061 {
1093 x -= x1; 1062 x -= x1;
1094 y -= y1; 1063 y -= y1;
1095 } 1064 }
1096 1065
1097 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1098 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1099 dx = old_width - szHint.width; 1068 dx = old_width - szHint.width;
1100 dy = old_height - szHint.height; 1069 dy = old_height - szHint.height;
1101 1070
1102 /* Check position of the center of the window */ 1071 /* Check position of the center of the window */
1103 if (x < x1) /* left half */ 1072 if (x < x1) /* left half */
1104 dx = 0; 1073 dx = 0;
… …
1107 if (y < y1) /* top half */ 1076 if (y < y1) /* top half */
1108 dy = 0; 1077 dy = 0;
1109 else if (y == y1) /* exact center */ 1078 else if (y == y1) /* exact center */
1110 dy /= 2; 1079 dy /= 2;
1111 1080
1112 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1113 szHint.width, szHint.height); 1082 szHint.width, szHint.height);
1114#else 1083#else
1115 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1116#endif 1085#endif
1117 } 1086 }
1118 1087
1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1120 1089
1121 if (fix_screen || newwidth != old_width || newheight != old_height) 1090 if (fix_screen || newwidth != old_width || newheight != old_height)
1122 { 1091 {
1123 if (scrollBar.state) 1092 if (scrollBar.state)
1124 { 1093 {
1125 XMoveResizeWindow (disp, scrollBar.win, 1094 XMoveResizeWindow (xdisp, scrollBar.win,
1126 window_sb_x, 0, 1095 window_sb_x, 0,
1127 scrollbar_TotalWidth (), szHint.height); 1096 scrollbar_TotalWidth (), szHint.height);
1128 resize_scrollbar (); 1097 resize_scrollbar ();
1129 } 1098 }
1130 1099
1131 XMoveResizeWindow (disp, vt, 1100 XMoveResizeWindow (xdisp, vt,
1132 window_vt_x, window_vt_y, 1101 window_vt_x, window_vt_y,
1133 width, height); 1102 width, height);
1134 1103
1135 scr_clear (); 1104 scr_clear ();
1136#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1137 resize_pixmap (); 1106 resize_pixmap ();
1138#endif 1107#endif
1139 } 1108 }
1140 1109
1141 if (fix_screen || old_height == 0) 1110 if (fix_screen || old_height == 0)
1142 {
1143 int curr_screen = -1;
1144 int old_ncol = prev_ncol;
1145
1146 /* scr_reset only works on the primary screen */
1147 if (old_height) /* this is not the first time through */
1148 {
1149 unsigned int ocol = ncol;
1150 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1151 curr_screen = scr_change_screen (PRIMARY);
1152 ncol = ocol;
1153 }
1154
1155 scr_reset (); 1111 scr_reset ();
1156 1112
1157 if (curr_screen >= 0) /* this is not the first time through */ 1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1158 { 1114 //scr_touch (false);
1159 scr_change_screen (curr_screen);
1160 selection_check (old_ncol != ncol ? 4 : 0);
1161 }
1162 }
1163
1164 old_width = szHint.width;
1165 old_height = szHint.height;
1166 1115
1167#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1168 if (pixmap) 1117 if (pixmap)
1169 scr_touch (false); 1118 scr_touch (false);
1170#endif 1119#endif
… …
1183{ 1132{
1184 XWindowAttributes wattr; 1133 XWindowAttributes wattr;
1185 1134
1186 if (newwidth == 0 || newheight == 0) 1135 if (newwidth == 0 || newheight == 0)
1187 { 1136 {
1188 XGetWindowAttributes (display->display, display->root, &wattr); 1137 XGetWindowAttributes (xdisp, display->root, &wattr);
1189 1138
1190 if (newwidth == 0) 1139 if (newwidth == 0)
1191 newwidth = wattr.width - szHint.base_width; 1140 newwidth = wattr.width - szHint.base_width;
1192 if (newheight == 0) 1141 if (newheight == 0)
1193 newheight = wattr.height - szHint.base_height; 1142 newheight = wattr.height - szHint.base_height;
… …
1207#ifdef USE_XIM 1156#ifdef USE_XIM
1208 1157
1209void 1158void
1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1211{ 1160{
1212 fg = pix_colors[Color_fg]; 1161 fg = pix_colors [Color_fg];
1213 bg = pix_colors[Color_bg]; 1162 bg = pix_colors [Color_bg];
1214} 1163}
1215 1164
1216void 1165void
1217rxvt_term::im_set_size (XRectangle &size) 1166rxvt_term::im_set_size (XRectangle &size)
1218{ 1167{
… …
1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1256 1205
1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1258 *p = '\0'; 1207 *p = '\0';
1259 1208
1260 atom = XInternAtom (display->display, server, False); 1209 atom = XInternAtom (xdisp, server, False);
1261 win = XGetSelectionOwner (display->display, atom); 1210 win = XGetSelectionOwner (xdisp, atom);
1262 1211
1263 if (win != None) 1212 if (win != None)
1264 return True; 1213 return True;
1265 } 1214 }
1266 1215
… …
1273 XPoint nspot; 1222 XPoint nspot;
1274 XVaNestedList preedit_attr; 1223 XVaNestedList preedit_attr;
1275 1224
1276 if (!Input_Context 1225 if (!Input_Context
1277 || !focus 1226 || !focus
1278 || !(input_style & XIMPreeditPosition)) 1227 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1279 return; 1228 return;
1280 1229
1281 im_set_position (nspot); 1230 im_set_position (nspot);
1282 1231
1283 if (nspot.x == spot.x && nspot.y == spot.y) 1232 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1302 input_method = 0; 1251 input_method = 0;
1303 } 1252 }
1304 1253
1305 Input_Context = 0; 1254 Input_Context = 0;
1306} 1255}
1256
1257#ifdef ENABLE_XIM_ONTHESPOT
1258
1259static void
1260xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1261{
1262 ((rxvt_term *)client_data)->make_current ();
1263 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1264}
1265
1266static void
1267xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1268{
1269 ((rxvt_term *)client_data)->make_current ();
1270 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1271}
1272
1273static void
1274xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1275{
1276 rxvt_term *term = (rxvt_term *)client_data;
1277 XIMText *text = call_data->text;
1278
1279 term->make_current ();
1280
1281 if (text)
1282 {
1283 void *str;
1284
1285 if (!text->encoding_is_wchar && text->string.multi_byte)
1286 {
1287 // of course, X makes it ugly again
1288 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->rs[Rs_imLocale]);
1290
1291 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1292 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1293
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->locale);
1296 }
1297 else
1298 str = (void *)text->string.wide_char;
1299
1300 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1301 DT_INT, call_data->caret,
1302 DT_INT, call_data->chg_first,
1303 DT_INT, call_data->chg_length,
1304 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1305 DT_WCS_LEN, str, str ? (int)text->length : 0,
1306 DT_END));
1307 }
1308 else
1309 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310 DT_INT, call_data->caret,
1311 DT_INT, call_data->chg_first,
1312 DT_INT, call_data->chg_length,
1313 DT_END));
1314}
1315
1316#if 0
1317static void
1318xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1319{
1320 ((rxvt_term *)client_data)->make_current ();
1321 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1322 DT_INT, call_data->position,
1323 DT_INT, call_data->direction,
1324 DT_INT, call_data->style,
1325 DT_END));
1326}
1327#endif
1328
1329#endif
1307 1330
1308/* 1331/*
1309 * Try to open a XIM with the current modifiers, then see if we can 1332 * Try to open a XIM with the current modifiers, then see if we can
1310 * open a suitable preedit type 1333 * open a suitable preedit type
1311 */ 1334 */
… …
1318 XRectangle rect, status_rect, needed_rect; 1341 XRectangle rect, status_rect, needed_rect;
1319 unsigned long fg, bg; 1342 unsigned long fg, bg;
1320 const char *p; 1343 const char *p;
1321 char **s; 1344 char **s;
1322 XIMStyles *xim_styles; 1345 XIMStyles *xim_styles;
1346#ifdef ENABLE_XIM_ONTHESPOT
1347 XIMCallback xcb[4];
1348#endif
1323 1349
1324 set_environ (envv); 1350 set_environ (envv);
1325 1351
1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1352 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1327 return false; 1353 return false;
1328 1354
1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1330 input_method = display->get_xim (locale, modifiers); 1355 input_method = display->get_xim (locale, modifiers);
1331 if (input_method == NULL) 1356 if (input_method == NULL)
1332 return false; 1357 return false;
1333 1358
1334 xim = input_method->xim; 1359 xim = input_method->xim;
… …
1354 s = rxvt_splitcommastring (p); 1379 s = rxvt_splitcommastring (p);
1355 1380
1356 for (i = found = 0; !found && s[i]; i++) 1381 for (i = found = 0; !found && s[i]; i++)
1357 { 1382 {
1358 if (!strcmp (s[i], "OverTheSpot")) 1383 if (!strcmp (s[i], "OverTheSpot"))
1359 input_style = (XIMPreeditPosition | XIMStatusNothing); 1384 input_style = XIMPreeditPosition | XIMStatusNothing;
1360 else if (!strcmp (s[i], "OffTheSpot")) 1385 else if (!strcmp (s[i], "OffTheSpot"))
1361 input_style = (XIMPreeditArea | XIMStatusArea); 1386 input_style = XIMPreeditArea | XIMStatusArea;
1362 else if (!strcmp (s[i], "Root")) 1387 else if (!strcmp (s[i], "Root"))
1363 input_style = (XIMPreeditNothing | XIMStatusNothing); 1388 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 else if (!strcmp (s[i], "None")) 1389 else if (!strcmp (s[i], "None"))
1365 input_style = (XIMPreeditNone | XIMStatusNone); 1390 input_style = XIMPreeditNone | XIMStatusNone;
1391#ifdef ENABLE_XIM_ONTHESPOT
1392 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1393 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1394#endif
1395 else
1396 input_style = XIMPreeditNothing | XIMStatusNothing;
1366 1397
1367 for (j = 0; j < xim_styles->count_styles; j++) 1398 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1399 if (input_style == xim_styles->supported_styles[j])
1369 { 1400 {
1370 rxvt_freecommastring (s); 1401 rxvt_freecommastring (s);
… …
1408 "*", 1439 "*",
1409 fheight, 1440 fheight,
1410 fheight + 1, fheight - 1, 1441 fheight + 1, fheight - 1,
1411 fheight - 2, fheight + 2); 1442 fheight - 2, fheight + 2);
1412 1443
1413 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1444 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1414 &missing_charset_list, &missing_charset_count, &def_string); 1445 &missing_charset_list, &missing_charset_count, &def_string);
1415 1446
1416 if (missing_charset_list) 1447 if (missing_charset_list)
1417 XFreeStringList (missing_charset_list); 1448 XFreeStringList (missing_charset_list);
1418 1449
… …
1459 XNBackground, bg, 1490 XNBackground, bg,
1460 XNArea, &status_rect, 1491 XNArea, &status_rect,
1461 XNFontSet, fs, 1492 XNFontSet, fs,
1462 NULL); 1493 NULL);
1463 } 1494 }
1495#if ENABLE_XIM_ONTHESPOT
1496 else if (input_style & XIMPreeditCallbacks)
1497 {
1498 im_set_position (spot);
1499
1500 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1501 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1502 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1503# if 0
1504 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1505# endif
1506
1507 preedit_attr = XVaCreateNestedList (0,
1508 XNSpotLocation, &spot,
1509 XNPreeditStartCallback, &xcb[0],
1510 XNPreeditDoneCallback , &xcb[1],
1511 XNPreeditDrawCallback , &xcb[2],
1512# if 0
1513 XNPreeditCaretCallback, &xcb[3],
1514# endif
1515 NULL);
1516 }
1517#endif
1464 1518
1465 Input_Context = XCreateIC (xim, 1519 Input_Context = XCreateIC (xim,
1466 XNInputStyle, input_style, 1520 XNInputStyle, input_style,
1467 XNClientWindow, vt, 1521 XNClientWindow, vt,
1468 XNFocusWindow, parent[0], 1522 XNFocusWindow, parent[0],
… …
1471 status_attr ? XNStatusAttributes : NULL, 1525 status_attr ? XNStatusAttributes : NULL,
1472 status_attr, NULL); 1526 status_attr, NULL);
1473 1527
1474 if (preedit_attr) XFree (preedit_attr); 1528 if (preedit_attr) XFree (preedit_attr);
1475 if (status_attr) XFree (status_attr); 1529 if (status_attr) XFree (status_attr);
1476 if (fs) XFreeFontSet (display->display, fs); 1530 if (fs) XFreeFontSet (xdisp, fs);
1477 1531
1478 if (Input_Context == NULL) 1532 if (Input_Context == NULL)
1479 { 1533 {
1480 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1534 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1481 im_destroy (); 1535 im_destroy ();
1482 return false; 1536 return false;
1483 } 1537 }
1484 1538
1539#if 0
1540 // unfortunately, only the focus window is used by XIM, hard to fix
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input ();
1543#endif
1544
1485 if (input_style & XIMPreeditArea) 1545 if (input_style & XIMPreeditArea)
1486 IMSetStatusPosition (); 1546 IMSetStatusPosition ();
1487 1547
1488 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1489 return true; 1548 return true;
1490} 1549}
1491 1550
1492void 1551void
1493rxvt_term::im_cb () 1552rxvt_term::im_cb ()
… …
1499 1558
1500 make_current (); 1559 make_current ();
1501 1560
1502 im_destroy (); 1561 im_destroy ();
1503 1562
1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1505 if (Input_Context) 1563 if (Input_Context)
1506 return; 1564 return;
1507 1565
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1566#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1567 if (rs[Rs_imLocale])

Diff Legend

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