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.209 by root, Mon Jan 30 20:12:37 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]);
256
257 clear ();
258 } 258 }
259 259
260 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
261 delete pix_colors_focused; 261 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
… …
271 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 272 free (allocated [i]);
273 273
274 free (selection.text); 274 free (selection.text);
275 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 276 free (env_display);
278 free (env_term); 277 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 278 free (locale);
281 free (v_buffer); 279 free (v_buffer);
282 free (incr_buf); 280 free (incr_buf);
283 281
284 delete envv; 282 delete envv;
… …
305rxvt_term::destroy () 303rxvt_term::destroy ()
306{ 304{
307 if (destroy_ev.active) 305 if (destroy_ev.active)
308 return; 306 return;
309 307
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 309
313#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
314 scr_overlay_off (); 311 scr_overlay_off ();
315#endif 312#endif
316 313
… …
371{ 368{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 370 (*t)->emergency_cleanup ();
374} 371}
375 372
376#if ENABLE_FRILLS 373#if !ENABLE_MINIMAL
377static void 374static void
378print_x_error (Display *dpy, XErrorEvent *event) 375print_x_error (Display *dpy, XErrorEvent *event)
379{ 376{
380 char buffer[BUFSIZ]; 377 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 378 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 426 GET_R->allowedxerror = event->error_code;
430 else 427 else
431 { 428 {
432 // GET_R is most likely not the terminal which caused the error, 429 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 430 // so just output the error and continue
434#if ENABLE_FRILLS 431#if ENABLE_MINIMAL
432 old_xerror_handler (display, event);
433#else
435 print_x_error (display, event); 434 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 435#endif
439 } 436 }
440 437
441 return 0; 438 return 0;
442} 439}
… …
474#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 474#endif
478 475
479 pty = ptytty_new (); 476 pty = ptytty::create ();
480 477
481 create_windows (argc, argv); 478 create_windows (argc, argv);
482 479
483 dDisp;
484
485 init_xlocale (); 480 init_xlocale ();
486 481
487 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
488 483
489#if 0 484#if 0
490 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
491#endif 486#endif
492 487
493#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
496#endif 491#endif
497#ifdef TRANSPARENT 492#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
499 { 494 {
500 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
501 check_our_parents (); 496 check_our_parents ();
502 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
503 } 498 }
504#endif 499#endif
505 500
… …
514 509
515 check_ev.start (); 510 check_ev.start ();
516 511
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
519 XMapWindow (disp, vt); 524 XMapWindow (xdisp, vt);
520 XMapWindow (disp, parent[0]); 525 XMapWindow (xdisp, parent[0]);
521 526
522 return true; 527 return true;
523} 528}
524 529
525static struct sig_handlers 530static struct sig_handlers
… …
530 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
531 */ 536 */
532 void 537 void
533 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
534 { 539 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
541 } 543 }
542 544
… …
550char **rxvt_environ; // startup environment 552char **rxvt_environ; // startup environment
551 553
552void 554void
553rxvt_init () 555rxvt_init ()
554{ 556{
555 uid_t uid = getuid (); 557 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 558
586 rxvt_environ = environ; 559 rxvt_environ = environ;
587 560
588 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
589 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
… …
647{ 620{
648 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
650 unsigned int w, h; 623 unsigned int w, h;
651 unsigned int max_width, max_height; 624 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 625
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
660 629
… …
757 726
758 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
760 729
761 if (recalc_x) 730 if (recalc_x)
762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
763 if (recalc_y) 733 if (recalc_y)
764 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
765 735
766 ncol = width / fwidth; 736 ncol = width / fwidth;
767 nrow = height / fheight; 737 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} 738}
773 739
774/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
775/* 741/*
776 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
… …
876 return true; 842 return true;
877} 843}
878 844
879void rxvt_term::set_string_property (Atom prop, const char *str, int len) 845void rxvt_term::set_string_property (Atom prop, const char *str, int len)
880{ 846{
881 XChangeProperty (display->display, parent[0], 847 XChangeProperty (xdisp, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 848 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 849 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 850}
885 851
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 853{
888 wchar_t *ws = rxvt_mbstowcs (str, len); 854 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws); 855 char *s = rxvt_wcstoutf8 (ws);
890 856
891 XChangeProperty (display->display, parent[0], 857 XChangeProperty (xdisp, parent[0],
892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
893 (const unsigned char *)s, strlen (s)); 859 (const unsigned char *)s, strlen (s));
894 860
895 free (s); 861 free (s);
896 free (ws); 862 free (ws);
… …
946 SET_PIXCOLOR (idx); 912 SET_PIXCOLOR (idx);
947 goto done; 913 goto done;
948 } 914 }
949 } 915 }
950 916
951 if (!rXParseAllocColor (&xcol, color)) 917 if (!set_color (xcol, color))
952 return; 918 return;
953 919
954 /* XStoreColor (display->display, display->cmap, XColor*); */ 920 /* XStoreColor (xdisp, display->cmap, XColor*); */
955 921
956 /* 922 /*
957 * FIXME: should free colors here, but no idea how to do it so instead, 923 * FIXME: should free colors here, but no idea how to do it so instead,
958 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
959 */ 925 */
… …
962 if (pix_colors[idx] == pix_colors[i]) 928 if (pix_colors[idx] == pix_colors[i])
963 break; 929 break;
964 if (i > Color_White) 930 if (i > Color_White)
965 { 931 {
966 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ 932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
967 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, 933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
968 DisplayPlanes (display->display, display->screen)); 934 DisplayPlanes (xdisp, display->screen));
969 } 935 }
970# endif 936# endif
971 937
972 pix_colors_focused[idx] = xcol; 938 pix_colors_focused[idx] = xcol;
973 SET_PIXCOLOR (idx); 939 SET_PIXCOLOR (idx);
… …
976 /* Cursor cursor; */ 942 /* Cursor cursor; */
977done: 943done:
978 944
979#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
980 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
981 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 947 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
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 ();
… …
1001 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1003 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
1004 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
1005 971
1006 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (xdisp, cmap, xcol, 2);
1007 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (xdisp, 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;
1056} 1019}
1057 1020
1058/* -------------------------------------------------------------------- * 1021/* -------------------------------------------------------------------- *
1059 * - WINDOW RESIZING - * 1022 * - WINDOW RESIZING - *
1060 * -------------------------------------------------------------------- */ 1023 * -------------------------------------------------------------------- */
1061void 1024void
1062rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1025rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1063{ 1026{
1064 int fix_screen; 1027 int fix_screen;
1065 int old_width = szHint.width, old_height = szHint.height; 1028 int old_width = szHint.width;
1066 dDisp; 1029 int old_height = szHint.height;
1067 1030
1068 window_calc (newwidth, newheight); 1031 window_calc (newwidth, newheight);
1069 XSetWMNormalHints (disp, parent[0], &szHint); 1032 XSetWMNormalHints (xdisp, parent[0], &szHint);
1070 1033
1071 if (!ignoreparent) 1034 if (!ignoreparent)
1072 { 1035 {
1073#ifdef SMART_RESIZE 1036#ifdef SMART_RESIZE
1074 /* 1037 /*
… …
1078 int x, y, x1, y1; 1041 int x, y, x1, y1;
1079 int dx, dy; 1042 int dx, dy;
1080 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1081 Window unused_cr; 1044 Window unused_cr;
1082 1045
1083 XTranslateCoordinates (disp, parent[0], display->root, 1046 XTranslateCoordinates (xdisp, parent[0], display->root,
1084 0, 0, &x, &y, &unused_cr); 1047 0, 0, &x, &y, &unused_cr);
1085 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1048 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1086 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1087 /* 1050 /*
1088 * if display->root isn't the parent window, a WM will probably have offset 1051 * if display->root isn't the parent window, a WM will probably have offset
1089 * our position for handles and decorations. Counter it 1052 * our position for handles and decorations. Counter it
1090 */ 1053 */
… …
1092 { 1055 {
1093 x -= x1; 1056 x -= x1;
1094 y -= y1; 1057 y -= y1;
1095 } 1058 }
1096 1059
1097 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1060 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1098 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1061 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1099 dx = old_width - szHint.width; 1062 dx = old_width - szHint.width;
1100 dy = old_height - szHint.height; 1063 dy = old_height - szHint.height;
1101 1064
1102 /* Check position of the center of the window */ 1065 /* Check position of the center of the window */
1103 if (x < x1) /* left half */ 1066 if (x < x1) /* left half */
1104 dx = 0; 1067 dx = 0;
… …
1107 if (y < y1) /* top half */ 1070 if (y < y1) /* top half */
1108 dy = 0; 1071 dy = 0;
1109 else if (y == y1) /* exact center */ 1072 else if (y == y1) /* exact center */
1110 dy /= 2; 1073 dy /= 2;
1111 1074
1112 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1075 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1113 szHint.width, szHint.height); 1076 szHint.width, szHint.height);
1114#else 1077#else
1115 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1078 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1116#endif 1079#endif
1117 } 1080 }
1118 1081
1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1120 1083
1121 if (fix_screen || newwidth != old_width || newheight != old_height) 1084 if (fix_screen || newwidth != old_width || newheight != old_height)
1122 { 1085 {
1123 if (scrollBar.state) 1086 if (scrollBar.state)
1124 { 1087 {
1125 XMoveResizeWindow (disp, scrollBar.win, 1088 XMoveResizeWindow (xdisp, scrollBar.win,
1126 window_sb_x, 0, 1089 window_sb_x, 0,
1127 scrollbar_TotalWidth (), szHint.height); 1090 scrollbar_TotalWidth (), szHint.height);
1128 resize_scrollbar (); 1091 resize_scrollbar ();
1129 } 1092 }
1130 1093
1131 XMoveResizeWindow (disp, vt, 1094 XMoveResizeWindow (xdisp, vt,
1132 window_vt_x, window_vt_y, 1095 window_vt_x, window_vt_y,
1133 width, height); 1096 width, height);
1134 1097
1135 scr_clear (); 1098 scr_clear ();
1136#ifdef XPM_BACKGROUND 1099#ifdef XPM_BACKGROUND
1137 resize_pixmap (); 1100 resize_pixmap ();
1138#endif 1101#endif
1139 } 1102 }
1140 1103
1141 if (fix_screen || old_height == 0) 1104 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 (); 1105 scr_reset ();
1156
1157 if (curr_screen >= 0) /* this is not the first time through */
1158 {
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 1106
1167#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1168 if (pixmap) 1108 if (pixmap)
1169 scr_touch (false); 1109 scr_touch (false);
1170#endif 1110#endif
… …
1183{ 1123{
1184 XWindowAttributes wattr; 1124 XWindowAttributes wattr;
1185 1125
1186 if (newwidth == 0 || newheight == 0) 1126 if (newwidth == 0 || newheight == 0)
1187 { 1127 {
1188 XGetWindowAttributes (display->display, display->root, &wattr); 1128 XGetWindowAttributes (xdisp, display->root, &wattr);
1189 1129
1190 if (newwidth == 0) 1130 if (newwidth == 0)
1191 newwidth = wattr.width - szHint.base_width; 1131 newwidth = wattr.width - szHint.base_width;
1192 if (newheight == 0) 1132 if (newheight == 0)
1193 newheight = wattr.height - szHint.base_height; 1133 newheight = wattr.height - szHint.base_height;
… …
1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1195 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1256 1196
1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1197 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1258 *p = '\0'; 1198 *p = '\0';
1259 1199
1260 atom = XInternAtom (display->display, server, False); 1200 atom = XInternAtom (xdisp, server, False);
1261 win = XGetSelectionOwner (display->display, atom); 1201 win = XGetSelectionOwner (xdisp, atom);
1262 1202
1263 if (win != None) 1203 if (win != None)
1264 return True; 1204 return True;
1265 } 1205 }
1266 1206
… …
1273 XPoint nspot; 1213 XPoint nspot;
1274 XVaNestedList preedit_attr; 1214 XVaNestedList preedit_attr;
1275 1215
1276 if (!Input_Context 1216 if (!Input_Context
1277 || !focus 1217 || !focus
1278 || !(input_style & XIMPreeditPosition)) 1218 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1279 return; 1219 return;
1280 1220
1281 im_set_position (nspot); 1221 im_set_position (nspot);
1282 1222
1283 if (nspot.x == spot.x && nspot.y == spot.y) 1223 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1302 input_method = 0; 1242 input_method = 0;
1303 } 1243 }
1304 1244
1305 Input_Context = 0; 1245 Input_Context = 0;
1306} 1246}
1247
1248#ifdef ENABLE_XIM_ONTHESPOT
1249
1250static void
1251xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1252{
1253 ((rxvt_term *)client_data)->make_current ();
1254 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1255}
1256
1257static void
1258xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1259{
1260 ((rxvt_term *)client_data)->make_current ();
1261 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1262}
1263
1264static void
1265xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1266{
1267 rxvt_term *term = (rxvt_term *)client_data;
1268 XIMText *text = call_data->text;
1269
1270 term->make_current ();
1271
1272 if (text)
1273 {
1274 void *str;
1275
1276 if (!text->encoding_is_wchar && text->string.multi_byte)
1277 {
1278 // of course, X makes it ugly again
1279 if (term->rs[Rs_imLocale])
1280 SET_LOCALE (term->rs[Rs_imLocale]);
1281
1282 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1283 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1284
1285 if (term->rs[Rs_imLocale])
1286 SET_LOCALE (term->locale);
1287 }
1288 else
1289 str = (void *)text->string.wide_char;
1290
1291 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1292 DT_INT, call_data->caret,
1293 DT_INT, call_data->chg_first,
1294 DT_INT, call_data->chg_length,
1295 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1296 DT_WCS_LEN, str, str ? (int)text->length : 0,
1297 DT_END));
1298 }
1299 else
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_END));
1305}
1306
1307#if 0
1308static void
1309xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1310{
1311 ((rxvt_term *)client_data)->make_current ();
1312 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1313 DT_INT, call_data->position,
1314 DT_INT, call_data->direction,
1315 DT_INT, call_data->style,
1316 DT_END));
1317}
1318#endif
1319
1320#endif
1307 1321
1308/* 1322/*
1309 * Try to open a XIM with the current modifiers, then see if we can 1323 * Try to open a XIM with the current modifiers, then see if we can
1310 * open a suitable preedit type 1324 * open a suitable preedit type
1311 */ 1325 */
… …
1318 XRectangle rect, status_rect, needed_rect; 1332 XRectangle rect, status_rect, needed_rect;
1319 unsigned long fg, bg; 1333 unsigned long fg, bg;
1320 const char *p; 1334 const char *p;
1321 char **s; 1335 char **s;
1322 XIMStyles *xim_styles; 1336 XIMStyles *xim_styles;
1337#ifdef ENABLE_XIM_ONTHESPOT
1338 XIMCallback xcb[4];
1339#endif
1323 1340
1324 set_environ (envv); 1341 set_environ (envv);
1325 1342
1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1343 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1327 return false; 1344 return false;
1328 1345
1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1330 input_method = display->get_xim (locale, modifiers); 1346 input_method = display->get_xim (locale, modifiers);
1331 if (input_method == NULL) 1347 if (input_method == NULL)
1332 return false; 1348 return false;
1333 1349
1334 xim = input_method->xim; 1350 xim = input_method->xim;
… …
1354 s = rxvt_splitcommastring (p); 1370 s = rxvt_splitcommastring (p);
1355 1371
1356 for (i = found = 0; !found && s[i]; i++) 1372 for (i = found = 0; !found && s[i]; i++)
1357 { 1373 {
1358 if (!strcmp (s[i], "OverTheSpot")) 1374 if (!strcmp (s[i], "OverTheSpot"))
1359 input_style = (XIMPreeditPosition | XIMStatusNothing); 1375 input_style = XIMPreeditPosition | XIMStatusNothing;
1360 else if (!strcmp (s[i], "OffTheSpot")) 1376 else if (!strcmp (s[i], "OffTheSpot"))
1361 input_style = (XIMPreeditArea | XIMStatusArea); 1377 input_style = XIMPreeditArea | XIMStatusArea;
1362 else if (!strcmp (s[i], "Root")) 1378 else if (!strcmp (s[i], "Root"))
1363 input_style = (XIMPreeditNothing | XIMStatusNothing); 1379 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 else if (!strcmp (s[i], "None")) 1380 else if (!strcmp (s[i], "None"))
1365 input_style = (XIMPreeditNone | XIMStatusNone); 1381 input_style = XIMPreeditNone | XIMStatusNone;
1382#ifdef ENABLE_XIM_ONTHESPOT
1383 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1384 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1385#endif
1386 else
1387 input_style = XIMPreeditNothing | XIMStatusNothing;
1366 1388
1367 for (j = 0; j < xim_styles->count_styles; j++) 1389 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1390 if (input_style == xim_styles->supported_styles[j])
1369 { 1391 {
1370 rxvt_freecommastring (s); 1392 rxvt_freecommastring (s);
… …
1408 "*", 1430 "*",
1409 fheight, 1431 fheight,
1410 fheight + 1, fheight - 1, 1432 fheight + 1, fheight - 1,
1411 fheight - 2, fheight + 2); 1433 fheight - 2, fheight + 2);
1412 1434
1413 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1435 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1414 &missing_charset_list, &missing_charset_count, &def_string); 1436 &missing_charset_list, &missing_charset_count, &def_string);
1415 1437
1416 if (missing_charset_list) 1438 if (missing_charset_list)
1417 XFreeStringList (missing_charset_list); 1439 XFreeStringList (missing_charset_list);
1418 1440
… …
1459 XNBackground, bg, 1481 XNBackground, bg,
1460 XNArea, &status_rect, 1482 XNArea, &status_rect,
1461 XNFontSet, fs, 1483 XNFontSet, fs,
1462 NULL); 1484 NULL);
1463 } 1485 }
1486#if ENABLE_XIM_ONTHESPOT
1487 else if (input_style & XIMPreeditCallbacks)
1488 {
1489 im_set_position (spot);
1490
1491 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1492 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1493 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1494# if 0
1495 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1496# endif
1497
1498 preedit_attr = XVaCreateNestedList (0,
1499 XNSpotLocation, &spot,
1500 XNPreeditStartCallback, &xcb[0],
1501 XNPreeditDoneCallback , &xcb[1],
1502 XNPreeditDrawCallback , &xcb[2],
1503# if 0
1504 XNPreeditCaretCallback, &xcb[3],
1505# endif
1506 NULL);
1507 }
1508#endif
1464 1509
1465 Input_Context = XCreateIC (xim, 1510 Input_Context = XCreateIC (xim,
1466 XNInputStyle, input_style, 1511 XNInputStyle, input_style,
1467 XNClientWindow, vt, 1512 XNClientWindow, vt,
1468 XNFocusWindow, parent[0], 1513 XNFocusWindow, parent[0],
… …
1471 status_attr ? XNStatusAttributes : NULL, 1516 status_attr ? XNStatusAttributes : NULL,
1472 status_attr, NULL); 1517 status_attr, NULL);
1473 1518
1474 if (preedit_attr) XFree (preedit_attr); 1519 if (preedit_attr) XFree (preedit_attr);
1475 if (status_attr) XFree (status_attr); 1520 if (status_attr) XFree (status_attr);
1476 if (fs) XFreeFontSet (display->display, fs); 1521 if (fs) XFreeFontSet (xdisp, fs);
1477 1522
1478 if (Input_Context == NULL) 1523 if (Input_Context == NULL)
1479 { 1524 {
1480 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1525 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1481 im_destroy (); 1526 im_destroy ();
1482 return false; 1527 return false;
1483 } 1528 }
1484 1529
1530#if 0
1531 // unfortunately, only the focus window is used by XIM, hard to fix
1532 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1533 vt_select_input ();
1534#endif
1535
1485 if (input_style & XIMPreeditArea) 1536 if (input_style & XIMPreeditArea)
1486 IMSetStatusPosition (); 1537 IMSetStatusPosition ();
1487 1538
1488 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1489 return true; 1539 return true;
1490} 1540}
1491 1541
1492void 1542void
1493rxvt_term::im_cb () 1543rxvt_term::im_cb ()
… …
1499 1549
1500 make_current (); 1550 make_current ();
1501 1551
1502 im_destroy (); 1552 im_destroy ();
1503 1553
1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1505 if (Input_Context) 1554 if (Input_Context)
1506 return; 1555 return;
1507 1556
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1557#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1558 if (rs[Rs_imLocale])

Diff Legend

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