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.218 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.220 by root, Sat Feb 11 10:53:37 2006 UTC

… …
704 704
705 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
706 window_vt_x += sb_w; 706 window_vt_x += sb_w;
707 } 707 }
708 708
709 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
711 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
712 szHint.min_height = szHint.base_height + szHint.height_inc; 712 szHint.min_height = szHint.base_height + szHint.height_inc;
713 713
714 if (newwidth && newwidth - szHint.base_width < max_width) 714 if (newwidth && newwidth - szHint.base_width < max_width)
715 { 715 {
716 szHint.width = newwidth; 716 szHint.width = newwidth;
… …
1033 int fix_screen; 1033 int fix_screen;
1034 int old_width = szHint.width; 1034 int old_width = szHint.width;
1035 int old_height = szHint.height; 1035 int old_height = szHint.height;
1036 1036
1037 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1038
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1038 XSetWMNormalHints (dpy, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1039 1041
1040 if (!ignoreparent) 1042 if (!ignoreparent)
1041 { 1043 {
1042#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1043 /* 1045 /*
… …
1117 if (pixmap) 1119 if (pixmap)
1118 scr_touch (false); 1120 scr_touch (false);
1119#endif 1121#endif
1120 1122
1121#ifdef USE_XIM 1123#ifdef USE_XIM
1122 IMSetStatusPosition (); 1124 IMSetPosition ();
1123#endif 1125#endif
1124} 1126}
1125 1127
1126/* 1128/*
1127 * Set the width/height of the vt window in characters. Units are pixels. 1129 * Set the width/height of the vt window in characters. Units are pixels.
… …
1524 preedit_attr, 1526 preedit_attr,
1525 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1526 status_attr, NULL); 1528 status_attr, NULL);
1527 1529
1528 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1529 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1530 if (fs) XFreeFontSet (dpy, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1531 1533
1532 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1533 { 1535 {
1534 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1535 im_destroy (); 1537 im_destroy ();
… …
1540 // unfortunately, only the focus window is used by XIM, hard to fix 1542 // unfortunately, only the focus window is used by XIM, hard to fix
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input (); 1544 vt_select_input ();
1543#endif 1545#endif
1544 1546
1545 if (input_style & XIMPreeditArea)
1546 IMSetStatusPosition (); 1547 IMSetPosition ();
1547 1548
1548 return true; 1549 return true;
1549} 1550}
1550 1551
1551void 1552void
… …
1609 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1610#endif 1611#endif
1611} 1612}
1612 1613
1613void 1614void
1614rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1615{ 1616{
1616 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1617 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1618 1619
1619 if (!Input_Context 1620 if (!Input_Context
1620 || !focus 1621 || !focus
1621 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1622 || !IMisRunning ()) 1623 || !IMisRunning ())
1623 return; 1624 return;
1624 1625
1625 /* Getting the necessary width of preedit area */ 1626 /* Getting the necessary width of preedit area */
1626 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1627 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
… …
1629 1630
1630 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1631 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1631 XFree (needed_rect); 1632 XFree (needed_rect);
1632 1633
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1635 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1635 1636
1636 XSetICValues (Input_Context, 1637 XSetICValues (Input_Context,
1637 XNPreeditAttributes, preedit_attr, 1638 XNPreeditAttributes, preedit_attr,
1638 XNStatusAttributes, status_attr, NULL); 1639 XNStatusAttributes, status_attr,
1640 NULL);
1639 1641
1640 XFree (preedit_attr); 1642 XFree (preedit_attr);
1641 XFree (status_attr); 1643 XFree (status_attr);
1642} 1644}
1643#endif /* USE_XIM */ 1645#endif /* USE_XIM */

Diff Legend

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