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.3 by pcg, Tue Nov 25 11:52:42 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.3 2003/11/25 11:52:42 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
47rxvt_term::rxvt_term() 47#include <cstring>
48: pty_ev(this, &rxvt_term::pty_cb), 48
49 x_ev (this, &rxvt_term::x_cb) 49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
50{ 53{
51 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
52} 59}
53 60
54void * 61void *
55rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
56{ 63{
… …
62 69
63void 70void
64rxvt_term::operator delete (void *p, size_t s) 71rxvt_term::operator delete (void *p, size_t s)
65{ 72{
66 free (p); 73 free (p);
74}
75
76rxvt_term::rxvt_term ()
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
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)
88{
89 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
90}
91
92rxvt_term::~rxvt_term ()
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
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;
67} 144}
68 145
69/*----------------------------------------------------------------------*/ 146/*----------------------------------------------------------------------*/
70/* rxvt_init() */ 147/* rxvt_init() */
71/* LIBPROTO */ 148/* LIBPROTO */
72rxvt_t 149rxvt_t
73rxvt_init(int argc, const char *const *argv) 150rxvt_init (int argc, const char *const *argv)
74{ 151{
75 const char **cmd_argv;
76
77 SET_R(new rxvt_term); 152 SET_R (new rxvt_term);
78 dR; 153 dR;
79 154
80 if (rxvt_init_vars(aR) < 0) 155 if (!R->init_vars () || !R->init (argc, argv))
81 { 156 {
82 free(R); 157 delete R;
83 return NULL; 158 return NULL;
84 } 159 }
85 160
86/* 161 return R;
162}
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
194bool
195rxvt_term::init (int argc, const char *const *argv)
196{
197 /*
87 * Save and then give up any super-user privileges 198 * Save and then give up any super-user privileges
88 * 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.
89 * We should only need to be root in these cases: 200 * We should only need to be root in these cases:
90 * 1. write utmp entries on some systems 201 * 1. write utmp entries on some systems
91 * 2. chown tty on some systems 202 * 2. chown tty on some systems
92 */ 203 */
93 rxvt_privileges(aR_ SAVE); 204 rxvt_privileges (this, SAVE);
94 rxvt_privileges(aR_ IGNORE); 205 rxvt_privileges (this, IGNORE);
95 206
96 rxvt_init_secondary(aR); 207 init_secondary ();
97 208
98 cmd_argv = rxvt_init_resources(aR_ argc, argv); 209 const char **cmd_argv = init_resources (argc, argv);
99 210
100 R->x_ev.start (ConnectionNumber (R->Xdisplay), EVENT_READ); 211 set_locale ("");
101 212
102#if (MENUBAR_MAX) 213#if (MENUBAR_MAX)
103 rxvt_menubar_read(aR_ R->rs[Rs_menu]); 214 rxvt_menubar_read (this, rs[Rs_menu]);
104#endif 215#endif
105#ifdef HAVE_SCROLLBARS 216#ifdef HAVE_SCROLLBARS
106 if (R->Options & Opt_scrollBar) 217 if (Options & Opt_scrollBar)
107 scrollbar_setIdle(); /* set existence for size calculations */ 218 scrollBar.setIdle (); /* set existence for size calculations */
108#endif 219#endif
109 220
110 rxvt_Create_Windows(aR_ argc, argv); 221 rxvt_Create_Windows (this, argc, argv);
111 222
112 rxvt_init_xlocale(aR); 223 init_xlocale ();
113 224
114 rxvt_scr_reset(aR); /* initialize screen */ 225 scr_reset (); /* initialize screen */
115#ifdef RXVT_GRAPHICS 226#ifdef RXVT_GRAPHICS
116 rxvt_Gr_reset(aR); /* reset graphics */ 227 rxvt_Gr_reset (this); /* reset graphics */
117#endif 228#endif
118 229
119#if 0 230#if 0
120#ifdef DEBUG_X 231#ifdef DEBUG_X
121 XSynchronize(R->Xdisplay, True); 232 XSynchronize(Xdisplay, True);
122 XSetErrorHandler((XErrorHandler) abort);
123#else
124 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
125#endif 233#endif
126#endif 234#endif
127 235
128#ifdef HAVE_SCROLLBARS 236#ifdef HAVE_SCROLLBARS
129 if (R->Options & Opt_scrollBar) 237 if (Options & Opt_scrollBar)
130 rxvt_Resize_scrollBar(aR); /* create and map scrollbar */ 238 rxvt_Resize_scrollBar (this); /* create and map scrollbar */
131#endif 239#endif
132#if (MENUBAR_MAX) 240#if (MENUBAR_MAX)
133 if (menubar_visible(r)) 241 if (menubar_visible(r))
134 XMapWindow(R->Xdisplay, R->menuBar.win); 242 XMapWindow (Xdisplay, menuBar.win);
135#endif 243#endif
136#ifdef TRANSPARENT 244#ifdef TRANSPARENT
137 if (R->Options & Opt_transparent) 245 if (Options & Opt_transparent)
138 { 246 {
139 XSelectInput(R->Xdisplay, Xroot, PropertyChangeMask); 247 XSelectInput (Xdisplay, Xroot, PropertyChangeMask);
140 rxvt_check_our_parents(aR); 248 rxvt_check_our_parents (this);
141 } 249 }
142#endif 250#endif
143 XMapWindow(R->Xdisplay, R->TermWin.vt); 251 XMapWindow (Xdisplay, TermWin.vt);
144 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 252 XMapWindow (Xdisplay, TermWin.parent[0]);
145 253
146 rxvt_init_env(aR); 254 init_env ();
147 rxvt_init_command(aR_ cmd_argv); 255 init_command (cmd_argv);
148 256
257 x_ev.start (Xfd, EVENT_READ);
149 R->pty_ev.start (R->cmd_fd, EVENT_READ); 258 pty_ev.start (cmd_fd, EVENT_READ);
150 259
151 return R; 260 check_ev.start ();
261
262 process_x_events ();
263
264 return true;
152} 265}
153 266
154/* ------------------------------------------------------------------------- * 267/* ------------------------------------------------------------------------- *
155 * SIGNAL HANDLING & EXIT HANDLER * 268 * SIGNAL HANDLING & EXIT HANDLER *
156 * ------------------------------------------------------------------------- */ 269 * ------------------------------------------------------------------------- */
… …
160/* ARGSUSED */ 273/* ARGSUSED */
161/* EXTPROTO */ 274/* EXTPROTO */
162RETSIGTYPE 275RETSIGTYPE
163rxvt_Child_signal(int sig __attribute__ ((unused))) 276rxvt_Child_signal(int sig __attribute__ ((unused)))
164{ 277{
165 dR;
166 int pid, save_errno = errno; 278 int pid, save_errno = errno;
167
168 do {
169 errno = 0;
170 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 279 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
280 ;
281 errno = save_errno;
171 282
283#if 0
172 if (pid == R->cmd_pid) 284 if (pid == R->cmd_pid)
173 exit(EXIT_SUCCESS); 285 exit (EXIT_SUCCESS);
174 286#endif
175 errno = save_errno;
176 signal(SIGCHLD, rxvt_Child_signal);
177} 287}
178 288
179/* 289/*
180 * Catch a fatal signal and tidy up before quitting 290 * Catch a fatal signal and tidy up before quitting
181 */ 291 */
… …
195/* INTPROTO */ 305/* INTPROTO */
196int 306int
197rxvt_xerror_handler(const Display * display 307rxvt_xerror_handler(const Display * display
198 __attribute__ ((unused)), const XErrorEvent * event) 308 __attribute__ ((unused)), const XErrorEvent * event)
199{ 309{
200 dR; 310 dR;
201 311
202 if (R->allowedxerror == -1) { 312 if (R->allowedxerror == -1)
203 R->allowedxerror = event->error_code; 313 R->allowedxerror = event->error_code;
204 return 0; /* ignored anyway */ 314 else
205 } 315 {
206 rxvt_print_error("XError: Request: %d . %d, Error: %d", 316 rxvt_print_error("XError: Request: %d . %d, Error: %d",
207 event->request_code, event->minor_code, 317 event->request_code, event->minor_code,
208 event->error_code); 318 event->error_code);
209/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 319
210 exit(EXIT_FAILURE); 320 R->destroy ();
211/* NOTREACHED */ 321 }
322
323 return 0;
212} 324}
213 325
214/*----------------------------------------------------------------------*/ 326/*----------------------------------------------------------------------*/
215/* 327/*
216 * Exit gracefully, clearing the utmp entry and restoring tty attributes 328 * Exit gracefully, clearing the utmp entry and restoring tty attributes
217 * 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
218 */ 330 */
219/* EXTPROTO */ 331/* EXTPROTO */
220void 332void
221rxvt_clean_exit(void) 333rxvt_clean_exit ()
222{ 334{
223 dR; 335 dR;
224 336
225#ifdef DEBUG_SCREEN 337 R->destroy ();
226 rxvt_scr_release(aR);
227#endif
228#ifndef NO_SETOWNER_TTYDEV
229 rxvt_privileged_ttydev(aR_ RESTORE);
230#endif
231#ifdef UTMP_SUPPORT
232 rxvt_privileged_utmp(aR_ RESTORE);
233#endif
234#ifdef USE_XIM
235 if (R->Input_Context != NULL) {
236 XDestroyIC(R->Input_Context);
237 R->Input_Context = NULL;
238 }
239#endif
240} 338}
241 339
242/* ------------------------------------------------------------------------- * 340/* ------------------------------------------------------------------------- *
243 * MEMORY ALLOCATION WRAPPERS * 341 * MEMORY ALLOCATION WRAPPERS *
244 * ------------------------------------------------------------------------- */ 342 * ------------------------------------------------------------------------- */
… …
536/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
537/* 635/*
538 * Tell the teletype handler what size the window is. 636 * Tell the teletype handler what size the window is.
539 * Called after a window size change. 637 * Called after a window size change.
540 */ 638 */
541/* EXTPROTO */
542void 639void
543rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 640rxvt_term::tt_winch ()
544{ 641{
545 struct winsize ws; 642 struct winsize ws;
546 643
547 if (fd < 0) 644 if (cmd_fd < 0)
548 return; 645 return;
646
549 ws.ws_col = col; 647 ws.ws_col = TermWin.ncol;
550 ws.ws_row = row; 648 ws.ws_row = TermWin.nrow;
551 ws.ws_xpixel = ws.ws_ypixel = 0; 649 ws.ws_xpixel = ws.ws_ypixel = 0;
552#ifndef DEBUG_SIZE 650#ifndef DEBUG_SIZE
553 (void)ioctl(fd, TIOCSWINSZ, &ws); 651 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
554#else 652#else
555 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 653 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
556 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 654 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
557 }
558# ifdef SIGWINCH 655# ifdef SIGWINCH
559 else if (pid) /* force through to the command */ 656 else if (cmd_pid) /* force through to the command */
560 kill(pid, SIGWINCH); 657 kill (cmd_pid, SIGWINCH);
561# endif 658# endif
562#endif 659#endif
563} 660}
564 661
565/*----------------------------------------------------------------------*/ 662/*----------------------------------------------------------------------*/
… …
678 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 775 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
679 R->PixColors[Color_bg]); 776 R->PixColors[Color_bg]);
680 777
681/* handle Color_BD, scrollbar background, etc. */ 778/* handle Color_BD, scrollbar background, etc. */
682 779
683 rxvt_set_colorfgbg(aR); 780 rxvt_set_colorfgbg (aR);
684 rxvt_recolour_cursor(aR); 781 R->recolour_cursor ();
685/* the only reasonable way to enforce a clean update */ 782/* the only reasonable way to enforce a clean update */
686 rxvt_scr_poweron(aR); 783 rxvt_scr_poweron (aR);
687} 784}
688 785
689#else 786#else
690# define rxvt_set_window_color(aR_ idx,color) ((void)0) 787# define rxvt_set_window_color(aR_ idx,color) ((void)0)
691#endif /* XTERM_COLOR_CHANGE */ 788#endif /* XTERM_COLOR_CHANGE */
692 789
693/* EXTPROTO */
694void 790void
695rxvt_recolour_cursor(pR) 791rxvt_term::recolour_cursor ()
696{ 792{
697 rxvt_color xcol[2];
698
699#if TODO 793#if TODO
794 rxvt_color xcol[2];
795
700 xcol[0] = R->PixColors[Color_pointer]; 796 xcol[0] = PixColors[Color_pointer];
701 xcol[1] = R->PixColors[Color_bg]; 797 xcol[1] = PixColors[Color_bg];
702 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 798 XQueryColors (Xdisplay, XCMAP, xcol, 2);
703 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 799 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
704#endif 800#endif
705} 801}
706 802
707/*----------------------------------------------------------------------*/ 803/*----------------------------------------------------------------------*/
708/* 804/*
… …
860 uint16_t old_ncol = R->prev_ncol; 956 uint16_t old_ncol = R->prev_ncol;
861 957
862 /* scr_reset only works on the primary screen */ 958 /* scr_reset only works on the primary screen */
863 if (R->old_height) /* this is not the first time through */ 959 if (R->old_height) /* this is not the first time through */
864 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 960 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
961
865 rxvt_scr_reset(aR); 962 R->scr_reset();
963
866 if (curr_screen >= 0) { /* this is not the first time through */ 964 if (curr_screen >= 0) { /* this is not the first time through */
867 rxvt_scr_change_screen(aR_ curr_screen); 965 rxvt_scr_change_screen(aR_ curr_screen);
868 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 966 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
869 } 967 }
870 } 968 }
… …
970 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1068 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
971 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1069 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL);
972 XFree(preedit_attr); 1070 XFree(preedit_attr);
973} 1071}
974 1072
975/* EXTPROTO */
976void
977rxvt_setTermFontSet(pR_ int idx)
978{
979 char *string;
980 long length;
981 int success = 0;
982
983 if (idx < 0 || idx >= MAX_NFONTS)
984 return;
985}
986
987/* INTPROTO */ 1073/* INTPROTO */
988void 1074void
989rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1075rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect,
990 XRectangle * needed_rect) 1076 XRectangle * needed_rect)
991{ 1077{
992 int mbh, vtx = 0; 1078 int mbh, vtx = 0;
993 1079
994 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1080 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
995 vtx = scrollbar_TotalWidth(); 1081 vtx = scrollbar_TotalWidth();
… …
1026 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1112 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1027 rxvt_IMInstantiateCallback, NULL); 1113 rxvt_IMInstantiateCallback, NULL);
1028} 1114}
1029 1115
1030/* 1116/*
1031 * X manual pages and include files don't match on some systems:
1032 * some think this is an XIDProc and others an XIMProc so we can't
1033 * use the first argument - need to update this to be nice for
1034 * both types via some sort of configure detection
1035 */
1036/* ARGSUSED */
1037/* EXTPROTO */
1038void
1039rxvt_IMInstantiateCallback(Display * unused
1040 __attribute__ ((unused)), XPointer client_data
1041 __attribute__ ((unused)), XPointer call_data
1042 __attribute__ ((unused)))
1043{
1044 dR;
1045 int i, found, had_im;
1046 const char *p;
1047 char **s;
1048 char buf[IMBUFSIZ];
1049
1050 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1051 if (R->Input_Context)
1052 return;
1053
1054 found = had_im = 0;
1055 p = R->rs[Rs_inputMethod];
1056 if (p && *p) {
1057 had_im = 1;
1058 s = rxvt_splitcommastring(p);
1059 for (i = 0; s[i]; i++) {
1060 if (*s[i]) {
1061 STRCPY(buf, "@im=");
1062 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1063 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1064 && (rxvt_IM_get_IC(aR) == True)) {
1065 found = 1;
1066 break;
1067 }
1068 }
1069 }
1070 for (i = 0; s[i]; i++)
1071 free(s[i]);
1072 free(s);
1073 }
1074 if (found)
1075 return;
1076
1077/* try with XMODIFIERS env. var. */
1078 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1079 rxvt_IM_get_IC(aR);
1080 return;
1081 }
1082
1083/* try with no modifiers base IF the user didn't specify an IM */
1084 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1085 && rxvt_IM_get_IC(aR) == True)
1086 return;
1087}
1088
1089/*
1090 * 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
1091 * open a suitable preedit type 1118 * open a suitable preedit type
1092 */ 1119 */
1093/* INTPROTO */ 1120static Bool
1094Bool
1095rxvt_IM_get_IC(pR) 1121rxvt_IM_get_IC (pR)
1096{ 1122{
1097 int i, j, found; 1123 int i, j, found;
1098 XIM xim; 1124 XIM xim;
1099 XPoint spot; 1125 XPoint spot;
1100 XRectangle rect, status_rect, needed_rect; 1126 XRectangle rect, status_rect, needed_rect;
… …
1104 XIMStyles *xim_styles; 1130 XIMStyles *xim_styles;
1105 XVaNestedList preedit_attr, status_attr; 1131 XVaNestedList preedit_attr, status_attr;
1106 XIMCallback ximcallback; 1132 XIMCallback ximcallback;
1107 1133
1108 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1134 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1109 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1135 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL);
1110 if (xim == NULL) 1136 if (xim == NULL)
1111 return False; 1137 return False;
1112 1138
1113 xim_styles = NULL; 1139 xim_styles = NULL;
1114 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1140 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1115 || !xim_styles || !xim_styles->count_styles) { 1141 || !xim_styles || !xim_styles->count_styles) {
1116 XCloseIM(xim); 1142 XCloseIM(xim);
1117 return False; 1143 return False;
1118 } 1144 }
1119 1145
… …
1144 return False; 1170 return False;
1145 } 1171 }
1146 1172
1147 ximcallback.callback = rxvt_IMDestroyCallback; 1173 ximcallback.callback = rxvt_IMDestroyCallback;
1148 1174
1149/* 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) */
1150 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1176 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1151 1177
1152 preedit_attr = status_attr = NULL; 1178 preedit_attr = status_attr = NULL;
1153 1179
1154 if (R->input_style & XIMPreeditPosition) { 1180 if (R->input_style & XIMPreeditPosition) {
… …
1202 rxvt_IMSetStatusPosition(aR); 1228 rxvt_IMSetStatusPosition(aR);
1203 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1229 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1204 return True; 1230 return True;
1205} 1231}
1206 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
1207/* EXTPROTO */ 1307/* EXTPROTO */
1208void 1308void
1209rxvt_IMSetStatusPosition(pR) 1309rxvt_IMSetStatusPosition(pR)
1210{ 1310{
1211 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