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.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.16 by pcg, Thu Dec 18 07:31:19 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.4 2003/11/25 15:25:17 pcg Exp $ 4 * $Id: main.C,v 1.16 2003/12/18 07:31:19 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
… …
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
63: pty_ev(this, &rxvt_term::pty_cb), 77: pty_ev (this, &rxvt_term::pty_cb),
78#ifdef CURSOR_BLINK
79 blink_ev (this, &rxvt_term::blink_cb),
80#endif
81#ifdef POINTER_BLANK
82 pointer_ev (this, &rxvt_term::pointer_cb),
83#endif
64 x_ev (this, &rxvt_term::x_cb) 84 x_ev (this, &rxvt_term::x_cb),
85 destroy_ev (this, &rxvt_term::destroy_cb),
86 check_ev (this, &rxvt_term::check_cb),
87 incr_ev (this, &rxvt_term::incr_cb)
65{ 88{
66 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 89 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
67} 90}
68 91
69rxvt_term::~rxvt_term () 92rxvt_term::~rxvt_term ()
70{ 93{
94 scr_release ();
95
96 free (locale);
97 free (codeset);
98
99#ifndef NO_SETOWNER_TTYDEV
100 rxvt_privileged_ttydev (this, RESTORE);
101#endif
102#ifdef UTMP_SUPPORT
103 rxvt_privileged_utmp (this, RESTORE);
104#endif
105#ifdef USE_XIM
106 if (Input_Context != NULL)
107 {
108 XDestroyIC (Input_Context);
109 Input_Context = NULL;
110 }
111#endif
112
113 if (cmd_fd >= 0)
114 close (cmd_fd);
115
116 if (Xfd >= 0)
117 XCloseDisplay (Xdisplay);
118
71 delete PixColors; 119 delete PixColors;
120}
121
122void
123rxvt_term::destroy ()
124{
125 check_ev.stop ();
126 pty_ev.stop ();
127 x_ev.stop ();
128#ifdef CURSOR_BLINK
129 blink_ev.stop ();
130#endif
131#ifdef POINTER_BLANK
132 pointer_ev.stop ();
133#endif
134
135 destroy_ev.start (0);
136}
137
138void
139rxvt_term::destroy_cb (time_watcher &w)
140{
141 SET_R (this);
142
143 delete this;
72} 144}
73 145
74/*----------------------------------------------------------------------*/ 146/*----------------------------------------------------------------------*/
75/* rxvt_init() */ 147/* rxvt_init() */
76/* LIBPROTO */ 148/* LIBPROTO */
77rxvt_t 149rxvt_t
78rxvt_init(int argc, const char *const *argv) 150rxvt_init (int argc, const char *const *argv)
79{ 151{
80 SET_R(new rxvt_term); 152 SET_R (new rxvt_term);
81 dR; 153 dR;
82 154
83 if (!R->init_vars () || !R->init (argc, argv)) 155 if (!R->init_vars () || !R->init (argc, argv))
84 { 156 {
85 delete R; 157 delete R;
… …
87 } 159 }
88 160
89 return R; 161 return R;
90} 162}
91 163
164/* EXTPROTO */
165void
166rxvt_init_signals ()
167{
168/* install exit handler for cleanup */
169#if 0
170#ifdef HAVE_ATEXIT
171 atexit(rxvt_clean_exit);
172#else
173#endif
174#endif
175
176 struct sigaction sa;
177
178 sigfillset (&sa.sa_mask);
179 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
180 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
181 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
182 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
183 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
184 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
185 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
186
187/* need to trap SIGURG for SVR4 (Unixware) rlogin */
188/* signal (SIGURG, SIG_DFL); */
189
190 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
191 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
192}
193
92bool 194bool
93rxvt_term::init (int argc, const char *const *argv) 195rxvt_term::init (int argc, const char *const *argv)
94{ 196{
95 dR;//TODO (scrollbar, setidle)
96
97 /* 197 /*
98 * Save and then give up any super-user privileges 198 * Save and then give up any super-user privileges
99 * If we need privileges in any area then we must specifically request it. 199 * If we need privileges in any area then we must specifically request it.
100 * We should only need to be root in these cases: 200 * We should only need to be root in these cases:
101 * 1. write utmp entries on some systems 201 * 1. write utmp entries on some systems
102 * 2. chown tty on some systems 202 * 2. chown tty on some systems
103 */ 203 */
104 rxvt_privileges (this, SAVE); 204 rxvt_privileges (this, SAVE);
105 rxvt_privileges (this, IGNORE); 205 rxvt_privileges (this, IGNORE);
106 206
107 rxvt_init_secondary (this); 207 init_secondary ();
108 208
109 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 209 const char **cmd_argv = init_resources (argc, argv);
210
211 set_locale ("");
110 212
111#if (MENUBAR_MAX) 213#if (MENUBAR_MAX)
112 rxvt_menubar_read (this, rs[Rs_menu]); 214 rxvt_menubar_read (this, rs[Rs_menu]);
113#endif 215#endif
114#ifdef HAVE_SCROLLBARS 216#ifdef HAVE_SCROLLBARS
115 if (Options & Opt_scrollBar) 217 if (Options & Opt_scrollBar)
116 scrollbar_setIdle (); /* set existence for size calculations */ 218 scrollBar.setIdle (); /* set existence for size calculations */
117#endif 219#endif
118 220
119 rxvt_Create_Windows (this, argc, argv); 221 rxvt_Create_Windows (this, argc, argv);
120 222
121 rxvt_init_xlocale (this); 223 init_xlocale ();
122 224
123 rxvt_scr_reset (this); /* initialize screen */ 225 scr_reset (); /* initialize screen */
124#ifdef RXVT_GRAPHICS 226#ifdef RXVT_GRAPHICS
125 rxvt_Gr_reset (this); /* reset graphics */ 227 rxvt_Gr_reset (this); /* reset graphics */
126#endif 228#endif
127 229
128#if 0 230#if 0
129#ifdef DEBUG_X 231#ifdef DEBUG_X
130 XSynchronize(Xdisplay, True); 232 XSynchronize(Xdisplay, True);
131 XSetErrorHandler((XErrorHandler) abort);
132#else
133 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
134#endif 233#endif
135#endif 234#endif
136 235
137#ifdef HAVE_SCROLLBARS 236#ifdef HAVE_SCROLLBARS
138 if (Options & Opt_scrollBar) 237 if (Options & Opt_scrollBar)
… …
150 } 249 }
151#endif 250#endif
152 XMapWindow (Xdisplay, TermWin.vt); 251 XMapWindow (Xdisplay, TermWin.vt);
153 XMapWindow (Xdisplay, TermWin.parent[0]); 252 XMapWindow (Xdisplay, TermWin.parent[0]);
154 253
155 rxvt_init_env (this); 254 init_env ();
156 rxvt_init_command (this, cmd_argv); 255 init_command (cmd_argv);
157 256
158 x_ev.start (Xfd, EVENT_READ); 257 x_ev.start (Xfd, EVENT_READ);
159 pty_ev.start (cmd_fd, EVENT_READ); 258 pty_ev.start (cmd_fd, EVENT_READ);
259
260 check_ev.start ();
261
262 process_x_events ();
160 263
161 return true; 264 return true;
162} 265}
163 266
164/* ------------------------------------------------------------------------- * 267/* ------------------------------------------------------------------------- *
… …
170/* ARGSUSED */ 273/* ARGSUSED */
171/* EXTPROTO */ 274/* EXTPROTO */
172RETSIGTYPE 275RETSIGTYPE
173rxvt_Child_signal(int sig __attribute__ ((unused))) 276rxvt_Child_signal(int sig __attribute__ ((unused)))
174{ 277{
175 dR;
176 int pid, save_errno = errno; 278 int pid, save_errno = errno;
177
178 do {
179 errno = 0;
180 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 279 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
280 ;
281 errno = save_errno;
181 282
283#if 0
182 if (pid == R->cmd_pid) 284 if (pid == R->cmd_pid)
183 exit(EXIT_SUCCESS); 285 exit (EXIT_SUCCESS);
184 286#endif
185 errno = save_errno;
186 signal(SIGCHLD, rxvt_Child_signal);
187} 287}
188 288
189/* 289/*
190 * Catch a fatal signal and tidy up before quitting 290 * Catch a fatal signal and tidy up before quitting
191 */ 291 */
… …
205/* INTPROTO */ 305/* INTPROTO */
206int 306int
207rxvt_xerror_handler(const Display * display 307rxvt_xerror_handler(const Display * display
208 __attribute__ ((unused)), const XErrorEvent * event) 308 __attribute__ ((unused)), const XErrorEvent * event)
209{ 309{
210 dR; 310 dR;
211 311
212 if (R->allowedxerror == -1) { 312 if (R->allowedxerror == -1)
213 R->allowedxerror = event->error_code; 313 R->allowedxerror = event->error_code;
214 return 0; /* ignored anyway */ 314 else
215 } 315 {
216 rxvt_print_error("XError: Request: %d . %d, Error: %d", 316 rxvt_print_error("XError: Request: %d . %d, Error: %d",
217 event->request_code, event->minor_code, 317 event->request_code, event->minor_code,
218 event->error_code); 318 event->error_code);
219/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 319
220 exit(EXIT_FAILURE); 320 R->destroy ();
221/* NOTREACHED */ 321 }
322
323 return 0;
222} 324}
223 325
224/*----------------------------------------------------------------------*/ 326/*----------------------------------------------------------------------*/
225/* 327/*
226 * Exit gracefully, clearing the utmp entry and restoring tty attributes 328 * Exit gracefully, clearing the utmp entry and restoring tty attributes
227 * TODO: if debugging, this should free up any known resources if we can 329 * TODO: if debugging, this should free up any known resources if we can
228 */ 330 */
229/* EXTPROTO */ 331/* EXTPROTO */
230void 332void
231rxvt_clean_exit(void) 333rxvt_clean_exit ()
232{ 334{
233 dR; 335 dR;
234 336
235#ifdef DEBUG_SCREEN 337 R->destroy ();
236 rxvt_scr_release(aR);
237#endif
238#ifndef NO_SETOWNER_TTYDEV
239 rxvt_privileged_ttydev(aR_ RESTORE);
240#endif
241#ifdef UTMP_SUPPORT
242 rxvt_privileged_utmp(aR_ RESTORE);
243#endif
244#ifdef USE_XIM
245 if (R->Input_Context != NULL) {
246 XDestroyIC(R->Input_Context);
247 R->Input_Context = NULL;
248 }
249#endif
250} 338}
251 339
252/* ------------------------------------------------------------------------- * 340/* ------------------------------------------------------------------------- *
253 * MEMORY ALLOCATION WRAPPERS * 341 * MEMORY ALLOCATION WRAPPERS *
254 * ------------------------------------------------------------------------- */ 342 * ------------------------------------------------------------------------- */
… …
546/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
547/* 635/*
548 * Tell the teletype handler what size the window is. 636 * Tell the teletype handler what size the window is.
549 * Called after a window size change. 637 * Called after a window size change.
550 */ 638 */
551/* EXTPROTO */
552void 639void
553rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 640rxvt_term::tt_winch ()
554{ 641{
555 struct winsize ws; 642 struct winsize ws;
556 643
557 if (fd < 0) 644 if (cmd_fd < 0)
558 return; 645 return;
646
559 ws.ws_col = col; 647 ws.ws_col = TermWin.ncol;
560 ws.ws_row = row; 648 ws.ws_row = TermWin.nrow;
561 ws.ws_xpixel = ws.ws_ypixel = 0; 649 ws.ws_xpixel = ws.ws_ypixel = 0;
562#ifndef DEBUG_SIZE 650#ifndef DEBUG_SIZE
563 (void)ioctl(fd, TIOCSWINSZ, &ws); 651 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
564#else 652#else
565 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 653 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
566 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 654 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
567 }
568# ifdef SIGWINCH 655# ifdef SIGWINCH
569 else if (pid) /* force through to the command */ 656 else if (cmd_pid) /* force through to the command */
570 kill(pid, SIGWINCH); 657 kill (cmd_pid, SIGWINCH);
571# endif 658# endif
572#endif 659#endif
573} 660}
574 661
575/*----------------------------------------------------------------------*/ 662/*----------------------------------------------------------------------*/
… …
688 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 775 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
689 R->PixColors[Color_bg]); 776 R->PixColors[Color_bg]);
690 777
691/* handle Color_BD, scrollbar background, etc. */ 778/* handle Color_BD, scrollbar background, etc. */
692 779
693 rxvt_set_colorfgbg(aR); 780 rxvt_set_colorfgbg (aR);
694 rxvt_recolour_cursor(aR); 781 R->recolour_cursor ();
695/* the only reasonable way to enforce a clean update */ 782/* the only reasonable way to enforce a clean update */
696 rxvt_scr_poweron(aR); 783 rxvt_scr_poweron (aR);
697} 784}
698 785
699#else 786#else
700# define rxvt_set_window_color(aR_ idx,color) ((void)0) 787# define rxvt_set_window_color(aR_ idx,color) ((void)0)
701#endif /* XTERM_COLOR_CHANGE */ 788#endif /* XTERM_COLOR_CHANGE */
702 789
703/* EXTPROTO */
704void 790void
705rxvt_recolour_cursor(pR) 791rxvt_term::recolour_cursor ()
706{ 792{
707 rxvt_color xcol[2];
708
709#if TODO 793#if TODO
794 rxvt_color xcol[2];
795
710 xcol[0] = R->PixColors[Color_pointer]; 796 xcol[0] = PixColors[Color_pointer];
711 xcol[1] = R->PixColors[Color_bg]; 797 xcol[1] = PixColors[Color_bg];
712 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 798 XQueryColors (Xdisplay, XCMAP, xcol, 2);
713 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 799 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
714#endif 800#endif
715} 801}
716 802
717/*----------------------------------------------------------------------*/ 803/*----------------------------------------------------------------------*/
718/* 804/*
… …
870 uint16_t old_ncol = R->prev_ncol; 956 uint16_t old_ncol = R->prev_ncol;
871 957
872 /* scr_reset only works on the primary screen */ 958 /* scr_reset only works on the primary screen */
873 if (R->old_height) /* this is not the first time through */ 959 if (R->old_height) /* this is not the first time through */
874 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 960 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
961
875 rxvt_scr_reset(aR); 962 R->scr_reset();
963
876 if (curr_screen >= 0) { /* this is not the first time through */ 964 if (curr_screen >= 0) { /* this is not the first time through */
877 rxvt_scr_change_screen(aR_ curr_screen); 965 rxvt_scr_change_screen(aR_ curr_screen);
878 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 966 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
879 } 967 }
880 } 968 }
… …
980 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1068 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
981 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1069 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL);
982 XFree(preedit_attr); 1070 XFree(preedit_attr);
983} 1071}
984 1072
985/* EXTPROTO */
986void
987rxvt_setTermFontSet(pR_ int idx)
988{
989 char *string;
990 long length;
991 int success = 0;
992
993 if (idx < 0 || idx >= MAX_NFONTS)
994 return;
995}
996
997/* INTPROTO */ 1073/* INTPROTO */
998void 1074void
999rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1075rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect,
1000 XRectangle * needed_rect) 1076 XRectangle * needed_rect)
1001{ 1077{
1002 int mbh, vtx = 0; 1078 int mbh, vtx = 0;
1003 1079
1004 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1080 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
1005 vtx = scrollbar_TotalWidth(); 1081 vtx = scrollbar_TotalWidth();
… …
1036 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1112 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1037 rxvt_IMInstantiateCallback, NULL); 1113 rxvt_IMInstantiateCallback, NULL);
1038} 1114}
1039 1115
1040/* 1116/*
1041 * X manual pages and include files don't match on some systems:
1042 * some think this is an XIDProc and others an XIMProc so we can't
1043 * use the first argument - need to update this to be nice for
1044 * both types via some sort of configure detection
1045 */
1046/* ARGSUSED */
1047/* EXTPROTO */
1048void
1049rxvt_IMInstantiateCallback(Display * unused
1050 __attribute__ ((unused)), XPointer client_data
1051 __attribute__ ((unused)), XPointer call_data
1052 __attribute__ ((unused)))
1053{
1054 dR;
1055 int i, found, had_im;
1056 const char *p;
1057 char **s;
1058 char buf[IMBUFSIZ];
1059
1060 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1061 if (R->Input_Context)
1062 return;
1063
1064 found = had_im = 0;
1065 p = R->rs[Rs_inputMethod];
1066 if (p && *p) {
1067 had_im = 1;
1068 s = rxvt_splitcommastring(p);
1069 for (i = 0; s[i]; i++) {
1070 if (*s[i]) {
1071 STRCPY(buf, "@im=");
1072 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1073 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1074 && (rxvt_IM_get_IC(aR) == True)) {
1075 found = 1;
1076 break;
1077 }
1078 }
1079 }
1080 for (i = 0; s[i]; i++)
1081 free(s[i]);
1082 free(s);
1083 }
1084 if (found)
1085 return;
1086
1087/* try with XMODIFIERS env. var. */
1088 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1089 rxvt_IM_get_IC(aR);
1090 return;
1091 }
1092
1093/* try with no modifiers base IF the user didn't specify an IM */
1094 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1095 && rxvt_IM_get_IC(aR) == True)
1096 return;
1097}
1098
1099/*
1100 * Try to open a XIM with the current modifiers, then see if we can 1117 * Try to open a XIM with the current modifiers, then see if we can
1101 * open a suitable preedit type 1118 * open a suitable preedit type
1102 */ 1119 */
1103/* INTPROTO */ 1120static Bool
1104Bool
1105rxvt_IM_get_IC(pR) 1121rxvt_IM_get_IC (pR)
1106{ 1122{
1107 int i, j, found; 1123 int i, j, found;
1108 XIM xim; 1124 XIM xim;
1109 XPoint spot; 1125 XPoint spot;
1110 XRectangle rect, status_rect, needed_rect; 1126 XRectangle rect, status_rect, needed_rect;
… …
1114 XIMStyles *xim_styles; 1130 XIMStyles *xim_styles;
1115 XVaNestedList preedit_attr, status_attr; 1131 XVaNestedList preedit_attr, status_attr;
1116 XIMCallback ximcallback; 1132 XIMCallback ximcallback;
1117 1133
1118 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1134 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1119 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1135 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL);
1120 if (xim == NULL) 1136 if (xim == NULL)
1121 return False; 1137 return False;
1122 1138
1123 xim_styles = NULL; 1139 xim_styles = NULL;
1124 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1140 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1125 || !xim_styles || !xim_styles->count_styles) { 1141 || !xim_styles || !xim_styles->count_styles) {
1126 XCloseIM(xim); 1142 XCloseIM(xim);
1127 return False; 1143 return False;
1128 } 1144 }
1129 1145
… …
1154 return False; 1170 return False;
1155 } 1171 }
1156 1172
1157 ximcallback.callback = rxvt_IMDestroyCallback; 1173 ximcallback.callback = rxvt_IMDestroyCallback;
1158 1174
1159/* XXX: not sure why we need this (as well as IC one below) */ 1175 /* XXX: not sure why we need this (as well as IC one below) */
1160 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1176 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1161 1177
1162 preedit_attr = status_attr = NULL; 1178 preedit_attr = status_attr = NULL;
1163 1179
1164 if (R->input_style & XIMPreeditPosition) { 1180 if (R->input_style & XIMPreeditPosition) {
… …
1212 rxvt_IMSetStatusPosition(aR); 1228 rxvt_IMSetStatusPosition(aR);
1213 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1229 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1214 return True; 1230 return True;
1215} 1231}
1216 1232
1233/*
1234 * X manual pages and include files don't match on some systems:
1235 * some think this is an XIDProc and others an XIMProc so we can't
1236 * use the first argument - need to update this to be nice for
1237 * both types via some sort of configure detection
1238 */
1239/* ARGSUSED */
1240/* EXTPROTO */
1241void
1242rxvt_IMInstantiateCallback(Display * unused
1243 __attribute__ ((unused)), XPointer client_data
1244 __attribute__ ((unused)), XPointer call_data
1245 __attribute__ ((unused)))
1246{
1247 dR;
1248 int i, found, had_im;
1249 const char *p;
1250 char **s;
1251 char buf[IMBUFSIZ];
1252
1253 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1254 if (R->Input_Context)
1255 return;
1256
1257#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1258 if (R->rs[Rs_imLocale])
1259 setlocale (LC_CTYPE, R->rs[Rs_imLocale]);
1260#endif
1261
1262 p = R->rs[Rs_inputMethod];
1263 if (p && *p)
1264 {
1265 bool found = false;
1266
1267 s = rxvt_splitcommastring (p);
1268 for (i = 0; s[i]; i++)
1269 {
1270 if (*s[i])
1271 {
1272 STRCPY (buf, "@im=");
1273 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1274 if ((p = XSetLocaleModifiers (buf)) && *p
1275 && rxvt_IM_get_IC (aR))
1276 {
1277 found = true;
1278 break;
1279 }
1280 }
1281 }
1282 for (i = 0; s[i]; i++)
1283 free(s[i]);
1284 free(s);
1285
1286 if (found)
1287 goto done;
1288 }
1289
1290/* try with XMODIFIERS env. var. */
1291 if ((p = XSetLocaleModifiers ("")) && *p
1292 && rxvt_IM_get_IC (aR))
1293 goto done;
1294
1295/* try with no modifiers base IF the user didn't specify an IM */
1296 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1297 && rxvt_IM_get_IC (aR) == True)
1298 goto done;
1299
1300done:
1301#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1302 if (R->rs[Rs_imLocale])
1303 setlocale (LC_CTYPE, R->locale);
1304#endif
1305}
1306
1217/* EXTPROTO */ 1307/* EXTPROTO */
1218void 1308void
1219rxvt_IMSetStatusPosition(pR) 1309rxvt_IMSetStatusPosition(pR)
1220{ 1310{
1221 XRectangle preedit_rect, status_rect, *needed_rect; 1311 XRectangle preedit_rect, status_rect, *needed_rect;

Diff Legend

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