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.193 by root, Sat Jan 21 14:25:05 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}
… …
450 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
451} 448}
452 449
453/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
454bool 451bool
455rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
456{ 453{
454 this->envv = envv;
455
457 SET_R (this); 456 SET_R (this);
458 set_locale (""); 457 set_locale ("");
459 set_environ (envv); // few things in X do not call setlocale :( 458 set_environ (envv); // few things in X do not call setlocale :(
460 459
461 if (!init_vars ()) 460 if (!init_vars ())
… …
472#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
473 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
474 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
475#endif 474#endif
476 475
477 pty = rxvt_new_ptytty (); 476 pty = ptytty::create ();
478 477
479 create_windows (argc, argv); 478 create_windows (argc, argv);
480 479
481 dDisp;
482
483 init_xlocale (); 480 init_xlocale ();
484 481
485 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
486 483
487#if 0 484#if 0
488 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
489#endif 486#endif
490 487
491#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
492 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
493 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
494#endif 491#endif
495#ifdef TRANSPARENT 492#ifdef TRANSPARENT
496 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
497 { 494 {
498 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
499 check_our_parents (); 496 check_our_parents ();
500 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
501 } 498 }
502#endif 499#endif
503 500
… …
512 509
513 check_ev.start (); 510 check_ev.start ();
514 511
515 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
516 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
517 XMapWindow (disp, vt); 524 XMapWindow (xdisp, vt);
518 XMapWindow (disp, parent[0]); 525 XMapWindow (xdisp, parent[0]);
519 526
520 return true; 527 return true;
521} 528}
522 529
523static struct sig_handlers 530static struct sig_handlers
… …
528 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
529 */ 536 */
530 void 537 void
531 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
532 { 539 {
533#ifdef DEBUG_CMD
534 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
535#endif
536 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
537 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
538 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
539 } 543 }
540 544
… …
548char **rxvt_environ; // startup environment 552char **rxvt_environ; // startup environment
549 553
550void 554void
551rxvt_init () 555rxvt_init ()
552{ 556{
553 uid_t uid = getuid (); 557 ptytty::init ();
554 gid_t gid = getgid ();
555
556 // before doing anything else, check for setuid/setgid operation,
557 // start the helper process and drop privileges
558 if (uid != geteuid ()
559 || gid != getegid ())
560 {
561#if PTYTTY_HELPER
562 rxvt_ptytty_server ();
563#else
564 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
565#endif
566
567 // drop privileges
568#if HAVE_SETRESUID
569 setresgid (gid, gid, gid);
570 setresuid (uid, uid, uid);
571#elif HAVE_SETREUID
572 setregid (gid, gid);
573 setreuid (uid, uid);
574#elif HAVE_SETUID
575 setgid (gid);
576 setuid (uid);
577#endif
578
579 if (uid != geteuid ()
580 || gid != getegid ())
581 rxvt_fatal ("unable to drop privileges, aborting.\n");
582 }
583 558
584 rxvt_environ = environ; 559 rxvt_environ = environ;
585 560
586 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
587 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
… …
645{ 620{
646 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
647 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
648 unsigned int w, h; 623 unsigned int w, h;
649 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
650 dDisp;
651
652 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
653 ncol, nrow, szHint.width, szHint.height));
654 625
655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
656 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
657 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
658 629
… …
755 726
756 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
757 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
758 729
759 if (recalc_x) 730 if (recalc_x)
760 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
761 if (recalc_y) 733 if (recalc_y)
762 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
763 735
764 ncol = width / fwidth; 736 ncol = width / fwidth;
765 nrow = height / fheight; 737 nrow = height / fheight;
766 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
767 ncol, nrow, szHint.width,
768 szHint.height));
769 return;
770} 738}
771 739
772/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
773/* 741/*
774 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
… …
874 return true; 842 return true;
875} 843}
876 844
877void 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)
878{ 846{
879 XChangeProperty (display->display, parent[0], 847 XChangeProperty (xdisp, parent[0],
880 prop, XA_STRING, 8, PropModeReplace, 848 prop, XA_STRING, 8, PropModeReplace,
881 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 849 (const unsigned char *)str, len >= 0 ? len : strlen (str));
882} 850}
883 851
884void 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)
885{ 853{
886 wchar_t *ws = rxvt_mbstowcs (str, len); 854 wchar_t *ws = rxvt_mbstowcs (str, len);
887 char *s = rxvt_wcstoutf8 (ws); 855 char *s = rxvt_wcstoutf8 (ws);
888 856
889 XChangeProperty (display->display, parent[0], 857 XChangeProperty (xdisp, parent[0],
890 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
891 (const unsigned char *)s, strlen (s)); 859 (const unsigned char *)s, strlen (s));
892 860
893 free (s); 861 free (s);
894 free (ws); 862 free (ws);
… …
944 SET_PIXCOLOR (idx); 912 SET_PIXCOLOR (idx);
945 goto done; 913 goto done;
946 } 914 }
947 } 915 }
948 916
949 if (!rXParseAllocColor (&xcol, color)) 917 if (!set_color (xcol, color))
950 return; 918 return;
951 919
952 /* XStoreColor (display->display, display->cmap, XColor*); */ 920 /* XStoreColor (xdisp, display->cmap, XColor*); */
953 921
954 /* 922 /*
955 * 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,
956 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
957 */ 925 */
… …
960 if (pix_colors[idx] == pix_colors[i]) 928 if (pix_colors[idx] == pix_colors[i])
961 break; 929 break;
962 if (i > Color_White) 930 if (i > Color_White)
963 { 931 {
964 /* 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]); */
965 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, 933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
966 DisplayPlanes (display->display, display->screen)); 934 DisplayPlanes (xdisp, display->screen));
967 } 935 }
968# endif 936# endif
969 937
970 pix_colors_focused[idx] = xcol; 938 pix_colors_focused[idx] = xcol;
971 SET_PIXCOLOR (idx); 939 SET_PIXCOLOR (idx);
… …
974 /* Cursor cursor; */ 942 /* Cursor cursor; */
975done: 943done:
976 944
977#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
978 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
979 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]);
980#endif 948#endif
981 949
982 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
983 951
984 recolour_cursor (); 952 recolour_cursor ();
… …
999 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
1000 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1001 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
1002 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
1003 971
1004 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (xdisp, cmap, xcol, 2);
1005 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
1006} 974}
1007 975
1008/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1009/* 977/*
1010 * 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
… …
1014{ 982{
1015 unsigned int i; 983 unsigned int i;
1016 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1017 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1018 986
1019 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1020 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1021 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1022 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1023 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1024 { 991 {
… …
1039 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1040} 1007}
1041 1008
1042/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1043 1010
1044int 1011bool
1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1046{ 1013{
1047 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1048 {
1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1050 return false;
1051 }
1052
1053 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1054} 1019}
1055 1020
1056/* -------------------------------------------------------------------- * 1021/* -------------------------------------------------------------------- *
1057 * - WINDOW RESIZING - * 1022 * - WINDOW RESIZING - *
1058 * -------------------------------------------------------------------- */ 1023 * -------------------------------------------------------------------- */
1059void 1024void
1060rxvt_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)
1061{ 1026{
1062 int fix_screen; 1027 int fix_screen;
1063 int old_width = szHint.width, old_height = szHint.height; 1028 int old_width = szHint.width;
1064 dDisp; 1029 int old_height = szHint.height;
1065 1030
1066 window_calc (newwidth, newheight); 1031 window_calc (newwidth, newheight);
1067 XSetWMNormalHints (disp, parent[0], &szHint); 1032 XSetWMNormalHints (xdisp, parent[0], &szHint);
1068 1033
1069 if (!ignoreparent) 1034 if (!ignoreparent)
1070 { 1035 {
1071#ifdef SMART_RESIZE 1036#ifdef SMART_RESIZE
1072 /* 1037 /*
… …
1076 int x, y, x1, y1; 1041 int x, y, x1, y1;
1077 int dx, dy; 1042 int dx, dy;
1078 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1079 Window unused_cr; 1044 Window unused_cr;
1080 1045
1081 XTranslateCoordinates (disp, parent[0], display->root, 1046 XTranslateCoordinates (xdisp, parent[0], display->root,
1082 0, 0, &x, &y, &unused_cr); 1047 0, 0, &x, &y, &unused_cr);
1083 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1048 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1084 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1085 /* 1050 /*
1086 * 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
1087 * our position for handles and decorations. Counter it 1052 * our position for handles and decorations. Counter it
1088 */ 1053 */
… …
1090 { 1055 {
1091 x -= x1; 1056 x -= x1;
1092 y -= y1; 1057 y -= y1;
1093 } 1058 }
1094 1059
1095 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1060 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1096 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1061 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1097 dx = old_width - szHint.width; 1062 dx = old_width - szHint.width;
1098 dy = old_height - szHint.height; 1063 dy = old_height - szHint.height;
1099 1064
1100 /* Check position of the center of the window */ 1065 /* Check position of the center of the window */
1101 if (x < x1) /* left half */ 1066 if (x < x1) /* left half */
1102 dx = 0; 1067 dx = 0;
… …
1105 if (y < y1) /* top half */ 1070 if (y < y1) /* top half */
1106 dy = 0; 1071 dy = 0;
1107 else if (y == y1) /* exact center */ 1072 else if (y == y1) /* exact center */
1108 dy /= 2; 1073 dy /= 2;
1109 1074
1110 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1075 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1111 szHint.width, szHint.height); 1076 szHint.width, szHint.height);
1112#else 1077#else
1113 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1078 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1114#endif 1079#endif
1115 } 1080 }
1116 1081
1117 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1118 1083
1119 if (fix_screen || newwidth != old_width || newheight != old_height) 1084 if (fix_screen || newwidth != old_width || newheight != old_height)
1120 { 1085 {
1121 if (scrollBar.state) 1086 if (scrollBar.state)
1122 { 1087 {
1123 XMoveResizeWindow (disp, scrollBar.win, 1088 XMoveResizeWindow (xdisp, scrollBar.win,
1124 window_sb_x, 0, 1089 window_sb_x, 0,
1125 scrollbar_TotalWidth (), szHint.height); 1090 scrollbar_TotalWidth (), szHint.height);
1126 resize_scrollbar (); 1091 resize_scrollbar ();
1127 } 1092 }
1128 1093
1129 XMoveResizeWindow (disp, vt, 1094 XMoveResizeWindow (xdisp, vt,
1130 window_vt_x, window_vt_y, 1095 window_vt_x, window_vt_y,
1131 width, height); 1096 width, height);
1132 1097
1133 scr_clear (); 1098 scr_clear ();
1134#ifdef XPM_BACKGROUND 1099#ifdef XPM_BACKGROUND
1135 resize_pixmap (); 1100 resize_pixmap ();
1136#endif 1101#endif
1137 } 1102 }
1138 1103
1139 if (fix_screen || old_height == 0) 1104 if (fix_screen || old_height == 0)
1140 {
1141 int curr_screen = -1;
1142 int old_ncol = prev_ncol;
1143
1144 /* scr_reset only works on the primary screen */
1145 if (old_height) /* this is not the first time through */
1146 {
1147 unsigned int ocol = ncol;
1148 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1149 curr_screen = scr_change_screen (PRIMARY);
1150 ncol = ocol;
1151 }
1152
1153 scr_reset (); 1105 scr_reset ();
1154
1155 if (curr_screen >= 0) /* this is not the first time through */
1156 {
1157 scr_change_screen (curr_screen);
1158 selection_check (old_ncol != ncol ? 4 : 0);
1159 }
1160 }
1161
1162 old_width = szHint.width;
1163 old_height = szHint.height;
1164 1106
1165#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1166 if (pixmap) 1108 if (pixmap)
1167 scr_touch (false); 1109 scr_touch (false);
1168#endif 1110#endif
… …
1181{ 1123{
1182 XWindowAttributes wattr; 1124 XWindowAttributes wattr;
1183 1125
1184 if (newwidth == 0 || newheight == 0) 1126 if (newwidth == 0 || newheight == 0)
1185 { 1127 {
1186 XGetWindowAttributes (display->display, display->root, &wattr); 1128 XGetWindowAttributes (xdisp, display->root, &wattr);
1187 1129
1188 if (newwidth == 0) 1130 if (newwidth == 0)
1189 newwidth = wattr.width - szHint.base_width; 1131 newwidth = wattr.width - szHint.base_width;
1190 if (newheight == 0) 1132 if (newheight == 0)
1191 newheight = wattr.height - szHint.base_height; 1133 newheight = wattr.height - szHint.base_height;
… …
1253 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1195 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1254 1196
1255 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1197 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1256 *p = '\0'; 1198 *p = '\0';
1257 1199
1258 atom = XInternAtom (display->display, server, False); 1200 atom = XInternAtom (xdisp, server, False);
1259 win = XGetSelectionOwner (display->display, atom); 1201 win = XGetSelectionOwner (xdisp, atom);
1260 1202
1261 if (win != None) 1203 if (win != None)
1262 return True; 1204 return True;
1263 } 1205 }
1264 1206
… …
1271 XPoint nspot; 1213 XPoint nspot;
1272 XVaNestedList preedit_attr; 1214 XVaNestedList preedit_attr;
1273 1215
1274 if (!Input_Context 1216 if (!Input_Context
1275 || !focus 1217 || !focus
1276 || !(input_style & XIMPreeditPosition)) 1218 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1277 return; 1219 return;
1278 1220
1279 im_set_position (nspot); 1221 im_set_position (nspot);
1280 1222
1281 if (nspot.x == spot.x && nspot.y == spot.y) 1223 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1300 input_method = 0; 1242 input_method = 0;
1301 } 1243 }
1302 1244
1303 Input_Context = 0; 1245 Input_Context = 0;
1304} 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
1305 1321
1306/* 1322/*
1307 * 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
1308 * open a suitable preedit type 1324 * open a suitable preedit type
1309 */ 1325 */
… …
1316 XRectangle rect, status_rect, needed_rect; 1332 XRectangle rect, status_rect, needed_rect;
1317 unsigned long fg, bg; 1333 unsigned long fg, bg;
1318 const char *p; 1334 const char *p;
1319 char **s; 1335 char **s;
1320 XIMStyles *xim_styles; 1336 XIMStyles *xim_styles;
1337#ifdef ENABLE_XIM_ONTHESPOT
1338 XIMCallback xcb[4];
1339#endif
1321 1340
1322 set_environ (envv); 1341 set_environ (envv);
1323 1342
1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1343 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1325 return false; 1344 return false;
1326 1345
1327 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1328 input_method = display->get_xim (locale, modifiers); 1346 input_method = display->get_xim (locale, modifiers);
1329 if (input_method == NULL) 1347 if (input_method == NULL)
1330 return false; 1348 return false;
1331 1349
1332 xim = input_method->xim; 1350 xim = input_method->xim;
… …
1352 s = rxvt_splitcommastring (p); 1370 s = rxvt_splitcommastring (p);
1353 1371
1354 for (i = found = 0; !found && s[i]; i++) 1372 for (i = found = 0; !found && s[i]; i++)
1355 { 1373 {
1356 if (!strcmp (s[i], "OverTheSpot")) 1374 if (!strcmp (s[i], "OverTheSpot"))
1357 input_style = (XIMPreeditPosition | XIMStatusNothing); 1375 input_style = XIMPreeditPosition | XIMStatusNothing;
1358 else if (!strcmp (s[i], "OffTheSpot")) 1376 else if (!strcmp (s[i], "OffTheSpot"))
1359 input_style = (XIMPreeditArea | XIMStatusArea); 1377 input_style = XIMPreeditArea | XIMStatusArea;
1360 else if (!strcmp (s[i], "Root")) 1378 else if (!strcmp (s[i], "Root"))
1361 input_style = (XIMPreeditNothing | XIMStatusNothing); 1379 input_style = XIMPreeditNothing | XIMStatusNothing;
1362 else if (!strcmp (s[i], "None")) 1380 else if (!strcmp (s[i], "None"))
1363 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;
1364 1388
1365 for (j = 0; j < xim_styles->count_styles; j++) 1389 for (j = 0; j < xim_styles->count_styles; j++)
1366 if (input_style == xim_styles->supported_styles[j]) 1390 if (input_style == xim_styles->supported_styles[j])
1367 { 1391 {
1368 rxvt_freecommastring (s); 1392 rxvt_freecommastring (s);
… …
1406 "*", 1430 "*",
1407 fheight, 1431 fheight,
1408 fheight + 1, fheight - 1, 1432 fheight + 1, fheight - 1,
1409 fheight - 2, fheight + 2); 1433 fheight - 2, fheight + 2);
1410 1434
1411 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1435 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1412 &missing_charset_list, &missing_charset_count, &def_string); 1436 &missing_charset_list, &missing_charset_count, &def_string);
1413 1437
1414 if (missing_charset_list) 1438 if (missing_charset_list)
1415 XFreeStringList (missing_charset_list); 1439 XFreeStringList (missing_charset_list);
1416 1440
… …
1457 XNBackground, bg, 1481 XNBackground, bg,
1458 XNArea, &status_rect, 1482 XNArea, &status_rect,
1459 XNFontSet, fs, 1483 XNFontSet, fs,
1460 NULL); 1484 NULL);
1461 } 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
1462 1509
1463 Input_Context = XCreateIC (xim, 1510 Input_Context = XCreateIC (xim,
1464 XNInputStyle, input_style, 1511 XNInputStyle, input_style,
1465 XNClientWindow, vt, 1512 XNClientWindow, vt,
1466 XNFocusWindow, parent[0], 1513 XNFocusWindow, parent[0],
… …
1469 status_attr ? XNStatusAttributes : NULL, 1516 status_attr ? XNStatusAttributes : NULL,
1470 status_attr, NULL); 1517 status_attr, NULL);
1471 1518
1472 if (preedit_attr) XFree (preedit_attr); 1519 if (preedit_attr) XFree (preedit_attr);
1473 if (status_attr) XFree (status_attr); 1520 if (status_attr) XFree (status_attr);
1474 if (fs) XFreeFontSet (display->display, fs); 1521 if (fs) XFreeFontSet (xdisp, fs);
1475 1522
1476 if (Input_Context == NULL) 1523 if (Input_Context == NULL)
1477 { 1524 {
1478 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1525 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1479 im_destroy (); 1526 im_destroy ();
1480 return false; 1527 return false;
1481 } 1528 }
1482 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
1483 if (input_style & XIMPreeditArea) 1536 if (input_style & XIMPreeditArea)
1484 IMSetStatusPosition (); 1537 IMSetStatusPosition ();
1485 1538
1486 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1487 return true; 1539 return true;
1488} 1540}
1489 1541
1490void 1542void
1491rxvt_term::im_cb () 1543rxvt_term::im_cb ()
… …
1497 1549
1498 make_current (); 1550 make_current ();
1499 1551
1500 im_destroy (); 1552 im_destroy ();
1501 1553
1502 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1503 if (Input_Context) 1554 if (Input_Context)
1504 return; 1555 return;
1505 1556
1506#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1557#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1507 if (rs[Rs_imLocale]) 1558 if (rs[Rs_imLocale])

Diff Legend

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