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.48 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.120 by root, Mon Dec 13 19:16:36 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring> 47#include <cstring>
48 48
49vector<rxvt_term *> rxvt_term::termlist;
50
49static char curlocale[128]; 51static char curlocale[128];
50 52
51void 53bool
52rxvt_set_locale (const char *locale) 54rxvt_set_locale (const char *locale)
53{ 55{
54 if (locale && STRNCMP (locale, curlocale, 128)) 56 if (!locale || !strncmp (locale, curlocale, 128))
55 { 57 return false;
58
56 STRNCPY (curlocale, locale, 128); 59 strncpy (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 60 setlocale (LC_CTYPE, curlocale);
61 return true;
62}
63
64#if ENABLE_COMBINING
65class rxvt_composite_vec rxvt_composite;
66
67text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
68{
69 compose_char *cc;
70
71 // break compose chains, as stupid readline really likes to duplicate
72 // composing characters for some reason near the end of a line.
73 cc = (*this)[c1];
74 while (cc)
58 } 75 {
59} 76 if (cc->c2 == c2) return c1;
77 cc = (*this)[cc->c1];
78 }
60 79
61void * 80 // check to see wether this combination already exists otherwise
62rxvt_term::operator new (size_t s) 81 for (cc = v.end (); cc-- > v.begin (); )
63{ 82 {
64 void *p = malloc (s); 83 if (cc->c1 == c1 && cc->c2 == c2)
84 return COMPOSE_LO + (cc - v.begin ());
85 }
65 86
66 MEMSET (p, 0, s); 87 // allocate a new combination
88 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
89 {
90 static int seen;
91
92 if (!seen++)
93 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
94
95 return REPLACEMENT_CHAR;
96 }
97
98 v.push_back (compose_char (c1, c2));
99
100 return v.size () - 1 + COMPOSE_LO;
101}
102
103int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
104{
105 compose_char *cc = (*this)[c];
106
107 if (!cc)
108 {
109 if (r) *r = c;
110 return 1;
111 }
112
113 int len = expand (cc->c1, r);
114
115 if (r) r += len;
116
117 if (cc->c2 != NOCHAR)
118 {
119 len++;
120 if (r) *r++ = cc->c2;
121 }
122
67 return p; 123 return len;
68}
69 124
70void
71rxvt_term::operator delete (void *p, size_t s)
72{
73 free (p);
74} 125}
126#endif
75 127
76rxvt_term::rxvt_term () 128rxvt_term::rxvt_term ()
77 : 129 :
130#if TRANSPARENT
78 rootwin_ev (this, &rxvt_term::rootwin_cb), 131 rootwin_ev (this, &rxvt_term::rootwin_cb),
132#endif
133#ifdef HAVE_SCROLLBARS
134 scrollbar_ev (this, &rxvt_term::x_cb),
135#endif
136#ifdef MENUBAR
137 menubar_ev (this, &rxvt_term::x_cb),
138#endif
139#ifdef CURSOR_BLINK
140 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
141#endif
142#ifdef TEXT_BLINK
143 text_blink_ev (this, &rxvt_term::text_blink_cb),
144#endif
145#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
146 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
147#endif
148#ifdef SELECTION_SCROLLING
149 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
150#endif
151#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
152 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
153#endif
154#ifdef POINTER_BLANK
155 pointer_ev (this, &rxvt_term::pointer_cb),
156#endif
157#ifdef USE_XIM
158 im_ev (this, &rxvt_term::im_cb),
159#endif
160 sw_term (this, &rxvt_term::sig_term),
161 sw_chld (this, &rxvt_term::sig_chld),
79 termwin_ev (this, &rxvt_term::x_cb), 162 termwin_ev (this, &rxvt_term::x_cb),
80 vt_ev (this, &rxvt_term::x_cb), 163 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
91 text_blink_ev (this, &rxvt_term::text_blink_cb),
92#endif
93#ifdef POINTER_BLANK
94 pointer_ev (this, &rxvt_term::pointer_cb),
95#endif
96#ifdef USE_XIM
97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb), 164 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb),
100 destroy_ev (this, &rxvt_term::destroy_cb), 166 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb), 167 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb) 168 incr_ev (this, &rxvt_term::incr_cb)
103{ 169{
104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 170 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
171
172 termlist.push_back (this);
105} 173}
106 174
107rxvt_term::~rxvt_term () 175rxvt_term::~rxvt_term ()
108{ 176{
177 termlist.erase (find (termlist.begin (), termlist.end(), this));
178
109 if (cmd_fd >= 0) 179 if (cmd_pid)
110 close (cmd_fd); 180 kill (-cmd_pid, SIGHUP);
111 181
112#ifndef NO_SETOWNER_TTYDEV 182 pty.put ();
113 privileged_ttydev (RESTORE); 183
114#endif
115#ifdef UTMP_SUPPORT 184#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE); 185 privileged_utmp (RESTORE);
117#endif 186#endif
118 187
188#if ENABLE_STYLES
189 for (int i = RS_styleCount; --i; )
190 if (TermWin.fontset[i] != TermWin.fontset[0])
191 delete TermWin.fontset[i];
192#endif
119 delete TermWin.fontset; 193 delete TermWin.fontset[0];
120 194
121 if (display) 195 if (display)
122 { 196 {
197 selection_clear ();
198
199#ifdef USE_XIM
200 im_destroy ();
201#endif
202#ifdef MENUBAR
203 if (menubarGC) XFreeGC (display->display, menubarGC);
204#endif
205#ifdef XTERM_SCROLLBAR
206 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
207 if (ShadowGC) XFreeGC (display->display, ShadowGC);
208#endif
209#ifdef PLAIN_SCROLLBAR
210 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
211#endif
212#ifdef NEXT_SCROLLBAR
213 if (blackGC) XFreeGC (display->display, blackGC);
214 if (whiteGC) XFreeGC (display->display, whiteGC);
215 if (grayGC) XFreeGC (display->display, grayGC);
216 if (darkGC) XFreeGC (display->display, darkGC);
217 if (stippleGC) XFreeGC (display->display, stippleGC);
218 if (dimple) XFreePixmap (display->display, dimple);
219 if (upArrow) XFreePixmap (display->display, upArrow);
220 if (downArrow) XFreePixmap (display->display, downArrow);
221 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
222 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
223#endif
224#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
225 if (topShadowGC) XFreeGC (display->display, topShadowGC);
226 if (botShadowGC) XFreeGC (display->display, botShadowGC);
227 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
228#endif
229 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
230
123#if defined(MENUBAR) && (MENUBAR_MAX > 1) 231#if defined(MENUBAR) && (MENUBAR_MAX > 1)
124 delete menuBar.drawable; 232 delete menuBar.drawable;
125 //if (menuBar.win) 233 //if (menuBar.win)
126 // XDestroyWindow (display->display, menuBar.win); 234 // XDestroyWindow (display->display, menuBar.win);
127#endif 235#endif
131 XDestroyWindow (display->display, TermWin.parent[0]); 239 XDestroyWindow (display->display, TermWin.parent[0]);
132 } 240 }
133 241
134 // TODO: free pixcolours, colours should become part of rxvt_display 242 // TODO: free pixcolours, colours should become part of rxvt_display
135 243
136 delete PixColors; 244 delete pix_colors_focused;
245#ifdef OFF_FOCUS_FADING
246 delete pix_colors_unfocused;
247#endif
137 248
138 displays.put (display); 249 displays.put (display);
139 250
140 scr_release (); 251 scr_release ();
141 252
253 /* clear all resources */
254 for (int i = 0; i < allocated.size (); i++)
255 free (allocated[i]);
256
257 free (selection.text);
258 // TODO: manage env vars in child only(!)
142 free (env_windowid); 259 free (env_windowid);
143 free (env_display); 260 free (env_display);
144 free (env_term); 261 free (env_term);
145 free (env_colorfgbg); 262 free (env_colorfgbg);
146 free (locale); 263 free (locale);
147 free (codeset); 264 free (v_buffer);
265 free (incr_buf);
148 266
149 delete envv; 267 delete envv;
150 delete argv; 268 delete argv;
151} 269}
152 270
153void 271void
154rxvt_term::destroy () 272rxvt_term::destroy ()
155{ 273{
274 if (destroy_ev.active)
275 return;
276
277#if ENABLE_OVERLAY
278 scr_overlay_off ();
279#endif
280
156 if (display) 281 if (display)
157 { 282 {
283#if USE_XIM
284 im_ev.stop (display);
285#endif
286#if HAVE_SCROLLBARS
287 scrollbar_ev.stop (display);
288#endif
289#if MENUBAR
290 menubar_ev.stop (display);
291#endif
292#if TRANSPARENT
158 rootwin_ev.stop (display); 293 rootwin_ev.stop (display);
294#endif
295 incr_ev.stop ();
159 termwin_ev.stop (display); 296 termwin_ev.stop (display);
160 vt_ev.stop (display); 297 vt_ev.stop (display);
161#ifdef USE_XIM
162 im_destroy ();
163 im_ev.stop (display);
164#endif
165#ifdef HAVE_SCROLLBARS
166 scrollbar_ev.stop (display);
167#endif
168#ifdef MENUBAR
169 menubar_ev.stop (display);
170#endif
171 } 298 }
172 299
173 check_ev.stop (); 300 check_ev.stop ();
174 pty_ev.stop (); 301 pty_ev.stop ();
175#ifdef CURSOR_BLINK 302#ifdef CURSOR_BLINK
176 cursor_blink_ev.stop (); 303 cursor_blink_ev.stop ();
177#endif 304#endif
178#ifdef TEXT_BLINK 305#ifdef TEXT_BLINK
179 text_blink_ev.stop (); 306 text_blink_ev.stop ();
180#endif 307#endif
308#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
309 cont_scroll_ev.stop ();
310#endif
311#ifdef SELECTION_SCROLLING
312 sel_scroll_ev.stop ();
313#endif
181#ifdef POINTER_BLANK 314#ifdef POINTER_BLANK
182 pointer_ev.stop (); 315 pointer_ev.stop ();
183#endif 316#endif
184 317
185 destroy_ev.start (0); 318 destroy_ev.start (0);
193 delete this; 326 delete this;
194} 327}
195 328
196/*----------------------------------------------------------------------*/ 329/*----------------------------------------------------------------------*/
197/* rxvt_init () */ 330/* rxvt_init () */
198/* LIBPROTO */
199rxvt_t
200rxvt_init (int argc, const char *const *argv)
201{
202 SET_R (new rxvt_term);
203
204 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
205 {
206 delete GET_R;
207 SET_R (0);
208 }
209
210 return GET_R;
211}
212
213static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
214
215void
216rxvt_init_signals ()
217{
218 /* install exit handler for cleanup */
219#if 0
220#ifdef HAVE_ATEXIT
221 atexit (rxvt_clean_exit);
222#else
223#endif
224#endif
225
226 struct sigaction sa;
227
228 sigfillset (&sa.sa_mask);
229 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
230 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
231 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
233 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
234 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
235 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
236
237 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
238 /* signal (SIGURG, SIG_DFL); */
239
240 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
241 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
242}
243
244bool 331bool
245rxvt_term::init (int argc, const char *const *argv) 332rxvt_term::init (int argc, const char *const *argv)
333{
334 SET_R (this);
335
336 if (!init_vars ())
337 return false;
338
339 init_secondary ();
340
341 const char **cmd_argv = init_resources (argc, argv);
342
343 set_locale ("");
344
345#if MENUBAR_MAX
346 menubar_read (rs[Rs_menu]);
347#endif
348#ifdef HAVE_SCROLLBARS
349 if (options & Opt_scrollBar)
350 scrollBar.setIdle (); /* set existence for size calculations */
351#endif
352
353 create_windows (argc, argv);
354
355 init_xlocale ();
356
357 scr_reset (); /* initialize screen */
358
359#if 0
360 XSynchronize (display->display, True);
361#endif
362
363#ifdef HAVE_SCROLLBARS
364 if (options & Opt_scrollBar)
365 resize_scrollbar (); /* create and map scrollbar */
366#endif
367#if (MENUBAR_MAX)
368 if (menubar_visible ())
369 XMapWindow (display->display, menuBar.win);
370#endif
371#ifdef TRANSPARENT
372 if (options & Opt_transparent)
373 {
374 XSelectInput (display->display, display->root, PropertyChangeMask);
375 check_our_parents ();
376 rootwin_ev.start (display, display->root);
377 }
378#endif
379
380 XMapWindow (display->display, TermWin.vt);
381 XMapWindow (display->display, TermWin.parent[0]);
382
383 set_colorfgbg ();
384
385 init_command (cmd_argv);
386
387 pty_ev.start (pty.pty, EVENT_READ);
388
389 check_ev.start ();
390
391 return true;
392}
393
394static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
395
396void
397rxvt_init ()
246{ 398{
247 /* 399 /*
248 * Save and then give up any super-user privileges 400 * Save and then give up any super-user privileges
249 * If we need privileges in any area then we must specifically request it. 401 * If we need privileges in any area then we must specifically request it.
250 * We should only need to be root in these cases: 402 * We should only need to be root in these cases:
251 * 1. write utmp entries on some systems 403 * 1. write utmp entries on some systems
252 * 2. chown tty on some systems 404 * 2. chown tty on some systems
253 */ 405 */
254 privileges (SAVE); 406 rxvt_privileges (SAVE);
255 privileges (IGNORE); 407 rxvt_privileges (IGNORE);
256 408
257 init_secondary (); 409 signal (SIGHUP, SIG_IGN);
410 signal (SIGPIPE, SIG_IGN);
258 411
259 const char **cmd_argv = init_resources (argc, argv); 412 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
413 /* signal (SIGURG, SIG_DFL); */
260 414
261 set_locale (""); 415 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
262 416 // TODO: handle this with exceptions and tolerate the memory loss
263#if MENUBAR_MAX 417 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
264 menubar_read (rs[Rs_menu]);
265#endif
266#ifdef HAVE_SCROLLBARS
267 if (Options & Opt_scrollBar)
268 scrollBar.setIdle (); /* set existence for size calculations */
269#endif
270
271 create_windows (argc, argv);
272
273 init_xlocale ();
274
275 scr_reset (); /* initialize screen */
276
277#if 0
278 XSynchronize (display->display, True);
279#endif
280
281#ifdef HAVE_SCROLLBARS
282 if (Options & Opt_scrollBar)
283 resize_scrollbar (); /* create and map scrollbar */
284#endif
285#if (MENUBAR_MAX)
286 if (menubar_visible ())
287 XMapWindow (display->display, menuBar.win);
288#endif
289#ifdef TRANSPARENT
290 if (Options & Opt_transparent)
291 {
292 XSelectInput (display->display, display->root, PropertyChangeMask);
293 check_our_parents ();
294 }
295#endif
296
297 rootwin_ev.start (display, display->root);
298
299 XMapWindow (display->display, TermWin.vt);
300 XMapWindow (display->display, TermWin.parent[0]);
301
302 init_command (cmd_argv);
303
304 pty_ev.start (cmd_fd, EVENT_READ);
305
306 check_ev.start ();
307
308 return true;
309} 418}
310 419
311/* ------------------------------------------------------------------------- * 420/* ------------------------------------------------------------------------- *
312 * SIGNAL HANDLING & EXIT HANDLER * 421 * SIGNAL HANDLING & EXIT HANDLER *
313 * ------------------------------------------------------------------------- */ 422 * ------------------------------------------------------------------------- */
314/* 423/*
315 * Catch a SIGCHLD signal and exit if the direct child has died 424 * Catch a SIGCHLD signal and exit if the direct child has died
316 */ 425 */
317/* ARGSUSED */ 426
318/* EXTPROTO */ 427void
319RETSIGTYPE 428rxvt_term::sig_chld (sig_watcher &w)
320rxvt_Child_signal (int sig __attribute__ ((unused)))
321{ 429{
322 int pid, save_errno = errno; 430 // we are being called for every SIGCHLD, not just ours
431 int pid;
432
323 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 433 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
324 ; 434 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
325 errno = save_errno;
326
327#if 0
328 if (pid == cmd_pid) 435 if (pid == (*t)->cmd_pid)
329 exit (EXIT_SUCCESS); 436 {
330#endif 437 (*t)->destroy ();
331} 438 break;
332 439 }
333/*
334 * Catch a fatal signal and tidy up before quitting
335 */
336/* EXTPROTO */
337RETSIGTYPE
338rxvt_Exit_signal (int sig)
339{
340 signal (sig, SIG_DFL);
341#ifdef DEBUG_CMD
342 rxvt_print_error ("signal %d", sig);
343#endif
344 rxvt_clean_exit ();
345 kill (getpid (), sig);
346}
347
348/* INTPROTO */
349int
350rxvt_xerror_handler (Display *display, XErrorEvent *event)
351{
352 if (GET_R->allowedxerror == -1)
353 GET_R->allowedxerror = event->error_code;
354 else
355 {
356 old_xerror_handler (display, event);
357 GET_R->destroy ();
358 }
359
360 return 0;
361} 440}
362 441
363/*----------------------------------------------------------------------*/ 442/*----------------------------------------------------------------------*/
364/* 443/*
365 * Exit gracefully, clearing the utmp entry and restoring tty attributes 444 * Exit gracefully, clearing the utmp entry and restoring tty attributes
366 * TODO: if debugging, this should free up any known resources if we can 445 * TODO: if debugging, this should free up any known resources if we can
367 */ 446 */
368/* EXTPROTO */
369void 447void
370rxvt_clean_exit () 448rxvt_destroy_all ()
371{ 449{
372 // TODO: rxvtd should clean up all ressources 450 // TODO: rxvtd should clean up all ressources
373 if (GET_R) 451 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
452 (*t)->destroy ();
453}
454
455/*
456 * Catch a fatal signal and tidy up before quitting
457 */
458void
459rxvt_term::sig_term (sig_watcher &w)
460{
461#ifdef DEBUG_CMD
462 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
463#endif
464 rxvt_destroy_all ();
465 signal (w.signum, SIG_DFL);
466 kill (getpid (), w.signum);
467}
468
469/* INTPROTO */
470int
471rxvt_xerror_handler (Display *display, XErrorEvent *event)
472{
473 if (GET_R->allowedxerror == -1)
474 GET_R->allowedxerror = event->error_code;
475 else
476 {
477 old_xerror_handler (display, event);
374 GET_R->destroy (); 478 GET_R->destroy ();
479 }
480
481 return 0;
375} 482}
376 483
377/* ------------------------------------------------------------------------- * 484/* ------------------------------------------------------------------------- *
378 * MEMORY ALLOCATION WRAPPERS * 485 * MEMORY ALLOCATION WRAPPERS *
379 * ------------------------------------------------------------------------- */ 486 * ------------------------------------------------------------------------- */
380/* EXTPROTO */ 487void *
381void *
382rxvt_malloc (size_t size) 488rxvt_malloc (size_t size)
383{ 489{
384 void *p;
385
386 p = malloc (size); 490 void *p = malloc (size);
491
387 if (p) 492 if (!p)
493 rxvt_fatal ("memory allocation failure. aborting.\n");
494
388 return p; 495 return p;
389
390 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
391 rxvt_clean_exit ();
392 exit (EXIT_FAILURE);
393 /* NOTREACHED */
394} 496}
395 497
396/* EXTPROTO */ 498/* INTPROTO */
397void * 499void *
398rxvt_calloc (size_t number, size_t size) 500rxvt_calloc (size_t number, size_t size)
399{ 501{
400 void *p;
401
402 p = calloc (number, size); 502 void *p = calloc (number, size);
503
403 if (p) 504 if (!p)
505 rxvt_fatal ("memory allocation failure. aborting.\n");
506
404 return p; 507 return p;
405
406 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
407 rxvt_clean_exit ();
408 exit (EXIT_FAILURE);
409 /* NOTREACHED */
410} 508}
411 509
412/* EXTPROTO */ 510/* INTPROTO */
413void * 511void *
414rxvt_realloc (void *ptr, size_t size) 512rxvt_realloc (void *ptr, size_t size)
415{ 513{
416 void *p;
417
418 if (ptr)
419 p = realloc (ptr, size); 514 void *p = realloc (ptr, size);
420 else 515
421 p = malloc (size);
422 if (p) 516 if (!p)
517 rxvt_fatal ("memory allocation failure. aborting.\n");
518
423 return p; 519 return p;
424
425 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
426 rxvt_clean_exit ();
427 exit (EXIT_FAILURE);
428 /* NOTREACHED */
429} 520}
430 521
431/* ------------------------------------------------------------------------- * 522/* ------------------------------------------------------------------------- *
432 * PRIVILEGED OPERATIONS * 523 * PRIVILEGED OPERATIONS *
433 * ------------------------------------------------------------------------- */ 524 * ------------------------------------------------------------------------- */
434/* take care of suid/sgid super-user (root) privileges */ 525/* take care of suid/sgid super-user (root) privileges */
435void 526void
436rxvt_term::privileges (int mode) 527rxvt_privileges (rxvt_privaction action)
437{ 528{
529#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
530 static uid_t euid;
531 static gid_t egid;
532#endif
533
438#if ! defined(__CYGWIN32__) 534#if ! defined(__CYGWIN32__)
439# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 535# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
440 /* setreuid () is the poor man's setuid (), seteuid () */ 536 /* setreuid () is the poor man's setuid (), seteuid () */
441# define seteuid(a) setreuid(-1, (a)) 537# define seteuid(a) setreuid(-1, (a))
442# define setegid(a) setregid(-1, (a)) 538# define setegid(a) setregid(-1, (a))
443# define HAVE_SETEUID 539# define HAVE_SETEUID
444# endif 540# endif
445# ifdef HAVE_SETEUID 541# ifdef HAVE_SETEUID
446 switch (mode) 542 switch (action)
447 { 543 {
448 case IGNORE: 544 case IGNORE:
449 /* 545 /*
450 * change effective uid/gid - not real uid/gid - so we can switch 546 * change effective uid/gid - not real uid/gid - so we can switch
451 * back to root later, as required 547 * back to root later, as required
461 seteuid (euid); 557 seteuid (euid);
462 setegid (egid); 558 setegid (egid);
463 break; 559 break;
464 } 560 }
465# else 561# else
466 switch (mode) 562 switch (action)
467 { 563 {
468 case IGNORE: 564 case IGNORE:
469 setuid (getuid ()); 565 setuid (getuid ());
470 setgid (getgid ()); 566 setgid (getgid ());
471 /* FALLTHROUGH */ 567 /* FALLTHROUGH */
478#endif 574#endif
479} 575}
480 576
481#ifdef UTMP_SUPPORT 577#ifdef UTMP_SUPPORT
482void 578void
483rxvt_term::privileged_utmp (char action) 579rxvt_term::privileged_utmp (rxvt_privaction action)
484{ 580{
485 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
486 action, next_utmp_action, getpid ()));
487 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
488 || (Options & Opt_utmpInhibit) 581 if ((options & Opt_utmpInhibit)
489 || ttydev == NULL || *ttydev == '\0') 582 || !pty.name || !*pty.name)
490 return; 583 return;
491 584
492 privileges (RESTORE); 585 rxvt_privileges (RESTORE);
586
493 if (action == SAVE) 587 if (action == SAVE)
494 {
495 next_utmp_action = RESTORE;
496 makeutent (ttydev, rs[Rs_display_name]); 588 makeutent (pty.name, rs[Rs_display_name]);
497 }
498 else 589 else
499 { /* action == RESTORE */
500 next_utmp_action = IGNORE;
501 cleanutent (); 590 cleanutent ();
502 } 591
503 privileges (IGNORE); 592 rxvt_privileges (IGNORE);
504}
505#endif
506
507#ifndef NO_SETOWNER_TTYDEV
508void
509rxvt_term::privileged_ttydev (char action)
510{
511 D_MAIN ((stderr,
512 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
513 action, next_tty_action, getpid ()));
514 if (next_tty_action != action || (action != SAVE && action != RESTORE)
515 || ttydev == NULL || *ttydev == '\0')
516 return;
517
518 privileges (RESTORE);
519
520 if (action == SAVE)
521 {
522 next_tty_action = RESTORE;
523# ifndef RESET_TTY_TO_COMMON_DEFAULTS
524 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
525 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
526 next_tty_action = IGNORE;
527 else
528# endif
529
530 {
531 chown (ttydev, getuid (), ttygid); /* fail silently */
532 chmod (ttydev, ttymode);
533# ifdef HAVE_REVOKE
534 revoke (ttydev);
535# endif
536
537 }
538 }
539 else
540 { /* action == RESTORE */
541 next_tty_action = IGNORE;
542# ifndef RESET_TTY_TO_COMMON_DEFAULTS
543 chmod (ttydev, ttyfd_stat.st_mode);
544 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
545# else
546 chmod (ttydev,
547 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
548 chown (ttydev, 0, 0);
549# endif
550
551 }
552
553 privileges (IGNORE);
554
555# ifndef RESET_TTY_TO_COMMON_DEFAULTS
556 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
557 action == RESTORE ? "Restoring" : (action ==
558 SAVE ? "Saving" :
559 "UNKNOWN ERROR for"), ttydev,
560 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
561 ttyfd_stat.st_gid));
562# endif
563} 593}
564#endif 594#endif
565 595
566/*----------------------------------------------------------------------*/ 596/*----------------------------------------------------------------------*/
567/* 597/*
622 else 652 else
623 szHint.win_gravity = SouthWestGravity; 653 szHint.win_gravity = SouthWestGravity;
624 } 654 }
625 } 655 }
626 } 656 }
657
627 /* TODO: BOUNDS */ 658 /* TODO: BOUNDS */
628 TermWin.width = TermWin.ncol * TermWin.fwidth; 659 TermWin.width = TermWin.ncol * TermWin.fwidth;
629 TermWin.height = TermWin.nrow * TermWin.fheight; 660 TermWin.height = TermWin.nrow * TermWin.fheight;
630 max_width = MAX_COLS * TermWin.fwidth; 661 max_width = MAX_COLS * TermWin.fwidth;
631 max_height = MAX_ROWS * TermWin.fheight; 662 max_height = MAX_ROWS * TermWin.fheight;
632 663
633 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 664 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
634 665
635 sb_w = mb_h = 0; 666 sb_w = mb_h = 0;
636 window_vt_x = window_vt_y = 0; 667 window_vt_x = window_vt_y = TermWin.int_bwidth;
668
637 if (scrollbar_visible ()) 669 if (scrollbar_visible ())
638 { 670 {
639 sb_w = scrollbar_TotalWidth (); 671 sb_w = scrollbar_TotalWidth ();
640 szHint.base_width += sb_w; 672 szHint.base_width += sb_w;
641 if (! (Options & Opt_scrollBar_right)) 673 if (!(options & Opt_scrollBar_right))
642 window_vt_x = sb_w; 674 window_vt_x += sb_w;
643 } 675 }
676
644 if (menubar_visible ()) 677 if (menubar_visible ())
645 { 678 {
646 mb_h = menuBar_TotalHeight (); 679 mb_h = menuBar_TotalHeight ();
647 szHint.base_height += mb_h; 680 szHint.base_height += mb_h;
648 window_vt_y = mb_h; 681 window_vt_y += mb_h;
649 } 682 }
683
650 szHint.width_inc = TermWin.fwidth; 684 szHint.width_inc = TermWin.fwidth;
651 szHint.height_inc = TermWin.fheight; 685 szHint.height_inc = TermWin.fheight;
652 szHint.min_width = szHint.base_width + szHint.width_inc; 686 szHint.min_width = szHint.base_width + szHint.width_inc;
653 szHint.min_height = szHint.base_height + szHint.height_inc; 687 szHint.min_height = szHint.base_height + szHint.height_inc;
654 688
660 else 694 else
661 { 695 {
662 MIN_IT (TermWin.width, max_width); 696 MIN_IT (TermWin.width, max_width);
663 szHint.width = szHint.base_width + TermWin.width; 697 szHint.width = szHint.base_width + TermWin.width;
664 } 698 }
699
665 if (height && height - szHint.base_height < max_height) 700 if (height && height - szHint.base_height < max_height)
666 { 701 {
667 szHint.height = height; 702 szHint.height = height;
668 TermWin.height = height - szHint.base_height; 703 TermWin.height = height - szHint.base_height;
669 } 704 }
670 else 705 else
671 { 706 {
672 MIN_IT (TermWin.height, max_height); 707 MIN_IT (TermWin.height, max_height);
673 szHint.height = szHint.base_height + TermWin.height; 708 szHint.height = szHint.base_height + TermWin.height;
674 } 709 }
710
675 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 711 if (scrollbar_visible () && (options & Opt_scrollBar_right))
676 window_sb_x = szHint.width - sb_w; 712 window_sb_x = szHint.width - sb_w;
677 713
678 if (recalc_x) 714 if (recalc_x)
679 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 715 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
680 - szHint.width - 2 * TermWin.ext_bwidth); 716 - szHint.width - 2 * TermWin.ext_bwidth);
696 * Called after a window size change. 732 * Called after a window size change.
697 */ 733 */
698void 734void
699rxvt_term::tt_winch () 735rxvt_term::tt_winch ()
700{ 736{
737 if (pty.pty < 0)
738 return;
739
701 struct winsize ws; 740 struct winsize ws;
702
703 if (cmd_fd < 0)
704 return;
705 741
706 ws.ws_col = TermWin.ncol; 742 ws.ws_col = TermWin.ncol;
707 ws.ws_row = TermWin.nrow; 743 ws.ws_row = TermWin.nrow;
708 ws.ws_xpixel = ws.ws_ypixel = 0; 744 ws.ws_xpixel = TermWin.width;
709#ifndef DEBUG_SIZE 745 ws.ws_ypixel = TermWin.height;
710 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 746 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
711#else 747
712 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 748#if 0
713 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 749 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
714# ifdef SIGWINCH
715 else if (cmd_pid) /* force through to the command */ 750 if (cmd_pid) /* force through to the command */
716 kill (cmd_pid, SIGWINCH); 751 kill (cmd_pid, SIGWINCH);
717# endif
718#endif 752#endif
719} 753}
720 754
721/*----------------------------------------------------------------------*/ 755/*----------------------------------------------------------------------*/
722/* rxvt_change_font () - Switch to a new font */ 756/* set_fonts () - load and set the various fonts
723/* 757/*
724 * init = 1 - initialize 758 * init = 1 - initialize
725 * 759 *
726 * fontname == FONT_UP - switch to bigger font 760 * fontname == FONT_UP - switch to bigger font
727 * fontname == FONT_DN - switch to smaller font 761 * fontname == FONT_DN - switch to smaller font
728 */ 762 */
729bool 763bool
730rxvt_term::change_font (const char *fontname) 764rxvt_term::set_fonts ()
731{ 765{
732 if (fontname == FONT_UP)
733 {
734 // TODO
735 }
736 else if (fontname == FONT_DN)
737 {
738 // TODO
739 }
740 else
741 {
742 rxvt_fontset *fs = new rxvt_fontset (this); 766 rxvt_fontset *fs = new rxvt_fontset (this);
767 rxvt_fontprop prop;
743 768
744 if (fs && fs->populate (fontname ? fontname : "fixed")) 769 if (!fs
770 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
771 || !fs->realize_font (1))
772 {
773 delete fs;
774 return false;
775 }
776
777#if ENABLE_STYLES
778 for (int i = RS_styleCount; --i; )
779 if (TermWin.fontset[i] != TermWin.fontset[0])
780 delete TermWin.fontset[i];
781#endif
782
783 delete TermWin.fontset[0];
784 TermWin.fontset[0] = fs;
785
786 prop = (*fs)[1]->properties ();
787 fs->set_prop (prop);
788
789 TermWin.fwidth = prop.width;
790 TermWin.fheight = prop.height;
791 TermWin.fweight = prop.weight;
792 TermWin.fslant = prop.slant;
793 TermWin.fbase = (*fs)[1]->ascent;
794
795 for (int style = 1; style < 4; style++)
796 {
797#if ENABLE_STYLES
798 const char *res = rs[Rs_font + style];
799
800 if (res && !*res)
801 TermWin.fontset[style] = TermWin.fontset[0];
802 else
745 { 803 {
746 delete TermWin.fontset; 804 TermWin.fontset[style] = fs = new rxvt_fontset (this);
747 TermWin.fontset = fs; 805 rxvt_fontprop prop2 = prop;
748 TermWin.fwidth = fs->base_font ()->width;
749 TermWin.fheight = fs->base_font ()->height;
750 TermWin.fbase = fs->base_font ()->ascent;
751 806
752 if (TermWin.parent[0]) 807 if (res)
808 prop2.weight = prop2.slant = rxvt_fontprop::unset;
809 else
753 { 810 {
754 resize_all_windows (0, 0, 0); 811 res = TermWin.fontset[0]->fontdesc;
755 scr_remap_chars (); 812
756 scr_touch (true); 813 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
814 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
757 } 815 }
758 816
759 return true; 817 fs->populate (res);
818 fs->set_prop (prop2);
760 } 819 }
820#else
821 TermWin.fontset[style] = TermWin.fontset[0];
822#endif
823 }
824
825 if (TermWin.parent[0])
761 } 826 {
827 resize_all_windows (0, 0, 0);
828 scr_remap_chars ();
829 scr_touch (true);
830 }
762 831
763 return false; 832 return true;
764} 833}
765 834
766bool 835void rxvt_term::set_string_property (Atom prop, const char *str, int len)
767rxvt_term::font_up_down (int n, int direction)
768{ 836{
769 return false; 837 // TODO: SMART_WINDOW_TITLE
838 XChangeProperty (display->display, TermWin.parent[0],
839 prop, XA_STRING, 8, PropModeReplace,
840 (const unsigned char *)str, len >= 0 ? len : strlen (str));
841}
842
843void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
844{
845 // TODO: SMART_WINDOW_TITLE
846 wchar_t *ws = rxvt_mbstowcs (str, len);
847 char *s = rxvt_wcstoutf8 (ws);
848
849 XChangeProperty (display->display, TermWin.parent[0],
850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
851 (const unsigned char *)s, strlen (s));
852
853 free (s);
854 free (ws);
770} 855}
771 856
772/*----------------------------------------------------------------------*/ 857/*----------------------------------------------------------------------*/
773/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
774/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
775void 860void
776rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
777{ 862{
778#ifndef SMART_WINDOW_TITLE 863 set_string_property (XA_WM_NAME, str);
779 XStoreName (display->display, TermWin.parent[0], str); 864#if ENABLE_FRILLS
780#else 865 set_utf8_property (display->atom ("_NET_WM_NAME"), str);
781 char *name;
782
783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
784 name = NULL;
785 if (name == NULL || STRCMP (name, str))
786 XStoreName (display->display, TermWin.parent[0], str);
787 if (name)
788 XFree (name);
789#endif 866#endif
790} 867}
791 868
792void 869void
793rxvt_term::set_iconName (const char *str) 870rxvt_term::set_icon_name (const char *str)
794{ 871{
795#ifndef SMART_WINDOW_TITLE 872 set_string_property (XA_WM_ICON_NAME, str);
796 XSetIconName (display->display, TermWin.parent[0], str); 873#if ENABLE_FRILLS
797#else 874 set_utf8_property (display->atom ("_NET_WM_ICON_NAME"), str);
798 char *name;
799
800 if (XGetIconName (display->display, TermWin.parent[0], &name))
801 name = NULL;
802 if (name == NULL || STRCMP (name, str))
803 XSetIconName (display->display, TermWin.parent[0], str);
804 if (name)
805 XFree (name);
806#endif 875#endif
807} 876}
808 877
809#ifdef XTERM_COLOR_CHANGE 878#ifdef XTERM_COLOR_CHANGE
810void 879void
822 i = atoi (color); 891 i = atoi (color);
823 if (i >= 8 && i <= 15) 892 if (i >= 8 && i <= 15)
824 { /* bright colors */ 893 { /* bright colors */
825 i -= 8; 894 i -= 8;
826# ifndef NO_BRIGHTCOLOR 895# ifndef NO_BRIGHTCOLOR
827 PixColors[idx] = PixColors[minBrightCOLOR + i]; 896 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
828 SET_PIXCOLOR (idx); 897 SET_PIXCOLOR (idx);
829 goto Done; 898 goto Done;
830# endif 899# endif
831 900
832 } 901 }
833 if (i >= 0 && i <= 7) 902 if (i >= 0 && i <= 7)
834 { /* normal colors */ 903 { /* normal colors */
835 PixColors[idx] = PixColors[minCOLOR + i]; 904 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
836 SET_PIXCOLOR (idx); 905 SET_PIXCOLOR (idx);
837 goto Done; 906 goto Done;
838 } 907 }
839 } 908 }
909
840 if (!rXParseAllocColor (& xcol, color)) 910 if (!rXParseAllocColor (& xcol, color))
841 return; 911 return;
912
842 /* XStoreColor (display->display, XCMAP, XColor*); */ 913 /* XStoreColor (display->display, display->cmap, XColor*); */
843 914
844 /* 915 /*
845 * FIXME: should free colors here, but no idea how to do it so instead, 916 * FIXME: should free colors here, but no idea how to do it so instead,
846 * so just keep gobbling up the colormap 917 * so just keep gobbling up the colormap
847 */ 918 */
848# if 0 919# if 0
849 for (i = Color_Black; i <= Color_White; i++) 920 for (i = Color_Black; i <= Color_White; i++)
850 if (PixColors[idx] == PixColors[i]) 921 if (pix_colors[idx] == pix_colors[i])
851 break; 922 break;
852 if (i > Color_White) 923 if (i > Color_White)
853 { 924 {
854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 925 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 926 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
856 DisplayPlanes (display->display, display->screen)); 927 DisplayPlanes (display->display, display->screen));
857 } 928 }
858# endif 929# endif
859 930
860 PixColors[idx] = xcol; 931 pix_colors_focused[idx] = xcol;
861 SET_PIXCOLOR (idx); 932 SET_PIXCOLOR (idx);
862 933
863 /* XSetWindowAttributes attr; */ 934 /* XSetWindowAttributes attr; */
864 /* Cursor cursor; */ 935 /* Cursor cursor; */
865Done: 936Done:
866 if (idx == Color_bg && ! (Options & Opt_transparent)) 937#ifdef OFF_FOCUS_FADING
867 XSetWindowBackground (display->display, TermWin.vt, 938 if (rs[Rs_fade])
868 PixColors[Color_bg]); 939 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
940#endif
869 941
870 /* handle Color_BD, scrollbar background, etc. */ 942 /*TODO: handle Color_BD, scrollbar background, etc. */
871 943
872 set_colorfgbg ();
873 recolour_cursor (); 944 recolour_cursor ();
874 /* the only reasonable way to enforce a clean update */ 945 scr_recolour ();
875 scr_poweron ();
876} 946}
877 947
878#else 948#else
879# define set_window_color (idx,color) ((void)0) 949# define set_window_color (idx,color) ((void)0)
880#endif /* XTERM_COLOR_CHANGE */ 950#endif /* XTERM_COLOR_CHANGE */
881 951
882void 952void
883rxvt_term::recolour_cursor () 953rxvt_term::recolour_cursor ()
884{ 954{
885#if TODO
886 rxvt_color xcol[2]; 955 XColor xcol[2];
887 956
888 xcol[0] = PixColors[Color_pointer]; 957 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
889 xcol[1] = PixColors[Color_bg]; 958 ? pix_colors_focused[Color_pointer_fg]
959 : pix_colors_focused[Color_fg];
960 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
961 ? pix_colors_focused[Color_pointer_bg]
962 : pix_colors_focused[Color_bg];
963
890 XQueryColors (display->display, XCMAP, xcol, 2); 964 XQueryColors (display->display, display->cmap, xcol, 2);
891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 965 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
892#endif
893} 966}
894 967
895/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
896/* 969/*
897 * find if fg/bg matches any of the normal (low-intensity) colors 970 * find if fg/bg matches any of the normal (low-intensity) colors
898 */ 971 */
899void 972void
900rxvt_term::set_colorfgbg () 973rxvt_term::set_colorfgbg ()
901{ 974{
902 unsigned int i; 975 unsigned int i;
903 const char *xpmb = "\0"; 976 const char *xpmb = "\0";
904 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
905 978
906 env_colorfgbg =
907 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 979 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
908 STRCPY (fstr, "default"); 980 strcpy (fstr, "default");
909 STRCPY (bstr, "default"); 981 strcpy (bstr, "default");
910 for (i = Color_Black; i <= Color_White; i++) 982 for (i = Color_Black; i <= Color_White; i++)
911 if (PixColors[Color_fg] == PixColors[i]) 983 if (pix_colors[Color_fg] == pix_colors[i])
912 { 984 {
913 sprintf (fstr, "%d", (i - Color_Black)); 985 sprintf (fstr, "%d", (i - Color_Black));
914 break; 986 break;
915 } 987 }
988
916 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
917 if (PixColors[Color_bg] == PixColors[i]) 990 if (pix_colors[Color_bg] == pix_colors[i])
918 { 991 {
919 sprintf (bstr, "%d", (i - Color_Black)); 992 sprintf (bstr, "%d", (i - Color_Black));
920#ifdef XPM_BACKGROUND 993#ifdef XPM_BACKGROUND
921 xpmb = "default;"; 994 xpmb = "default;";
922#endif 995#endif
923 break; 996 break;
924 } 997 }
925 998
926 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 999 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
927
928#ifndef NO_BRIGHTCOLOR
929 colorfgbg = DEFAULT_RSTYLE;
930 for (i = minCOLOR; i <= maxCOLOR; i++)
931 {
932 if (PixColors[Color_fg] == PixColors[i])
933 colorfgbg = SET_FGCOLOR (colorfgbg, i);
934 if (PixColors[Color_bg] == PixColors[i])
935 colorfgbg = SET_BGCOLOR (colorfgbg, i);
936 }
937#endif
938} 1000}
939 1001
940/*----------------------------------------------------------------------*/ 1002/*----------------------------------------------------------------------*/
941/* 1003/*
942 * Colour determination for low colour displays, routine from 1004 * Colour determination for low colour displays, routine from
946int 1008int
947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1009rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
948{ 1010{
949 if (!screen_in_out->set (display, colour)) 1011 if (!screen_in_out->set (display, colour))
950 { 1012 {
951 rxvt_print_error ("can't allocate colour: %s", colour); 1013 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
952 return false; 1014 return false;
953 } 1015 }
954 1016
955 return true; 1017 return true;
956} 1018}
967 int old_width = szHint.width, old_height = szHint.height; 1029 int old_width = szHint.width, old_height = szHint.height;
968#endif 1030#endif
969 1031
970 window_calc (width, height); 1032 window_calc (width, height);
971 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1033 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1034
972 if (!ignoreparent) 1035 if (!ignoreparent)
973 { 1036 {
974#ifdef SMART_RESIZE 1037#ifdef SMART_RESIZE
975 /* 1038 /*
976 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1039 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
1011 dy /= 2; 1074 dy /= 2;
1012 1075
1013 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1076 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
1014 szHint.width, szHint.height); 1077 szHint.width, szHint.height);
1015#else 1078#else
1016 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1079 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
1017 szHint.height);
1018#endif 1080#endif
1019
1020 } 1081 }
1021 1082
1022 fix_screen = (TermWin.ncol != prev_ncol 1083 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1023 || TermWin.nrow != prev_nrow);
1024 1084
1025 if (fix_screen || width != old_width || height != old_height) 1085 if (fix_screen || width != old_width || height != old_height)
1026 { 1086 {
1027 if (scrollbar_visible ()) 1087 if (scrollbar_visible ())
1028 { 1088 {
1029 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1089 XMoveResizeWindow (display->display, scrollBar.win,
1090 window_sb_x, 0,
1030 0, scrollbar_TotalWidth (), szHint.height); 1091 scrollbar_TotalWidth (), szHint.height);
1031 resize_scrollbar (); 1092 resize_scrollbar ();
1032 } 1093 }
1033 1094
1034 if (menubar_visible ()) 1095 if (menubar_visible ())
1035 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1096 XMoveResizeWindow (display->display, menuBar.win,
1097 window_vt_x, 0,
1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1098 TermWin_TotalWidth (), menuBar_TotalHeight ());
1037 1099
1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1100 XMoveResizeWindow (display->display, TermWin.vt,
1039 window_vt_y, TermWin_TotalWidth (), 1101 window_vt_x, window_vt_y,
1040 TermWin_TotalHeight ()); 1102 TermWin_TotalWidth (), TermWin_TotalHeight ());
1041 scr_clear (height != old_height); 1103 scr_clear ();
1042#ifdef XPM_BACKGROUND 1104#ifdef XPM_BACKGROUND
1043 resize_pixmap (); 1105 resize_pixmap ();
1044#endif 1106#endif
1045
1046 } 1107 }
1047 1108
1048 if (fix_screen || old_height == 0) 1109 if (fix_screen || old_height == 0)
1049 { 1110 {
1050 int curr_screen = -1; 1111 int curr_screen = -1;
1091 if (width == 0) 1152 if (width == 0)
1092 width = wattr.width - szHint.base_width; 1153 width = wattr.width - szHint.base_width;
1093 if (height == 0) 1154 if (height == 0)
1094 height = wattr.height - szHint.base_height; 1155 height = wattr.height - szHint.base_height;
1095 } 1156 }
1157
1096 if (width != TermWin.width || height != TermWin.height) 1158 if (width != TermWin.width || height != TermWin.height)
1097 { 1159 {
1098 width += szHint.base_width; 1160 width += szHint.base_width;
1099 height += szHint.base_height; 1161 height += szHint.base_height;
1100 resize_all_windows (width, height, 0); 1162 resize_all_windows (width, height, 0);
1105 * - X INPUT METHOD ROUTINES - * 1167 * - X INPUT METHOD ROUTINES - *
1106 * -------------------------------------------------------------------- */ 1168 * -------------------------------------------------------------------- */
1107#ifdef USE_XIM 1169#ifdef USE_XIM
1108 1170
1109void 1171void
1172rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1173{
1174 fg = pix_colors[Color_fg];
1175 bg = pix_colors[Color_bg];
1176}
1177
1178void
1110rxvt_term::im_set_size (XRectangle *size) 1179rxvt_term::im_set_size (XRectangle &size)
1111{ 1180{
1181 // the int_bwidth terms make no sense to me
1112 size->x = TermWin.int_bwidth; 1182 size.x = TermWin.int_bwidth;
1113 size->y = TermWin.int_bwidth; 1183 size.y = TermWin.int_bwidth;
1114 size->width = Width2Pixel (TermWin.ncol); 1184 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1115 size->height = Height2Pixel (TermWin.nrow); 1185 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1116} 1186}
1117 1187
1118void 1188void
1119rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1189rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1190 XRectangle &status_rect,
1191 const XRectangle &needed_rect)
1120{ 1192{
1121 *fg = PixColors[Color_fg]; 1193 preedit_rect.x = needed_rect.width;
1122 *bg = PixColors[Color_bg]; 1194 preedit_rect.y = 0;
1195 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
1196 preedit_rect.height = TermWin.fheight;
1197
1198 status_rect.x = 0;
1199 status_rect.y = 0;
1200 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
1201 status_rect.height = TermWin.fheight;
1123} 1202}
1124 1203
1125/* Checking whether input method is running. */ 1204/* Checking whether input method is running. */
1126bool 1205bool
1127rxvt_term::IMisRunning () 1206rxvt_term::IMisRunning ()
1128{ 1207{
1129 char *p; 1208 char *p;
1130 Atom atom; 1209 Atom atom;
1131 Window win; 1210 Window win;
1132 char server[IMBUFSIZ]; 1211 char server[IMBUFSIZ];
1133 1212
1134 /* get current locale modifier */ 1213 /* get current locale modifier */
1135 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1214 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1136 { 1215 {
1137 STRCPY (server, "@server="); 1216 strcpy (server, "@server=");
1138 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1217 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1218
1139 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1219 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1140 *p = '\0'; 1220 *p = '\0';
1141 1221
1142 atom = XInternAtom (display->display, server, False); 1222 atom = XInternAtom (display->display, server, False);
1143 win = XGetSelectionOwner (display->display, atom); 1223 win = XGetSelectionOwner (display->display, atom);
1224
1144 if (win != None) 1225 if (win != None)
1145 return True; 1226 return True;
1146 } 1227 }
1228
1147 return False; 1229 return False;
1148} 1230}
1149 1231
1150void 1232void
1151rxvt_term::IMSendSpot () 1233rxvt_term::IMSendSpot ()
1152{ 1234{
1153 XPoint spot; 1235 XPoint nspot;
1154 XVaNestedList preedit_attr; 1236 XVaNestedList preedit_attr;
1155 1237
1156 if (Input_Context == NULL 1238 if (!Input_Context
1239 || !TermWin.focus
1157 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1240 || !(input_style & XIMPreeditPosition))
1158 || ! (event_type == KeyPress
1159 || event_type == Expose
1160 || event_type == NoExpose
1161 || event_type == SelectionNotify
1162 || event_type == ButtonRelease || event_type == FocusIn)
1163 || !IMisRunning ())
1164 return; 1241 return;
1165 1242
1166 im_set_position (&spot); 1243 im_set_position (nspot);
1244
1245 if (nspot.x == spot.x && nspot.y == spot.y)
1246 return;
1247
1248 spot = nspot;
1167 1249
1168 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1250 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1169 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1251 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1170 XFree (preedit_attr); 1252 XFree (preedit_attr);
1171} 1253}
1172 1254
1173void 1255void
1174rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1175 XRectangle * needed_rect)
1176{
1177 int mbh, vtx = 0;
1178
1179 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1180 vtx = scrollbar_TotalWidth ();
1181
1182 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1183 mbh -= TermWin.lineSpace;
1184
1185 preedit_rect->x = needed_rect->width + vtx;
1186 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1187
1188 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1189 preedit_rect->height = Height2Pixel (1);
1190
1191 status_rect->x = vtx;
1192 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1193
1194 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1195 status_rect->height = Height2Pixel (1);
1196}
1197
1198void
1199rxvt_term::im_destroy () 1256rxvt_term::im_destroy ()
1200{ 1257{
1201 if (Input_Context)
1202 {
1203 XDestroyIC (Input_Context);
1204 Input_Context = NULL;
1205 }
1206
1207 if (input_method) 1258 if (input_method)
1208 { 1259 {
1260 if (Input_Context && input_method->xim)
1261 XDestroyIC (Input_Context);
1262
1209 display->put_xim (input_method); 1263 display->put_xim (input_method);
1210 input_method = 0; 1264 input_method = 0;
1211 } 1265 }
1266
1267 Input_Context = 0;
1212} 1268}
1213 1269
1214/* 1270/*
1215 * Try to open a XIM with the current modifiers, then see if we can 1271 * Try to open a XIM with the current modifiers, then see if we can
1216 * open a suitable preedit type 1272 * open a suitable preedit type
1217 */ 1273 */
1218bool 1274bool
1219rxvt_term::IM_get_IC (const char *modifiers) 1275rxvt_term::IM_get_IC (const char *modifiers)
1220{ 1276{
1221 int i, j, found; 1277 int i, j, found;
1222 XIM xim; 1278 XIM xim;
1223 XPoint spot; 1279 XPoint spot;
1224 XRectangle rect, status_rect, needed_rect; 1280 XRectangle rect, status_rect, needed_rect;
1225 unsigned long fg, bg; 1281 unsigned long fg, bg;
1226 const char *p; 1282 const char *p;
1227 char **s; 1283 char **s;
1228 XIMStyles *xim_styles; 1284 XIMStyles *xim_styles;
1229 XVaNestedList preedit_attr, status_attr;
1230 1285
1231 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1286 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1232 return false; 1287 return false;
1233 1288
1234 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1289 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1235 input_method = display->get_xim (locale, modifiers); 1290 input_method = display->get_xim (locale, modifiers);
1236 if (input_method == NULL) 1291 if (input_method == NULL)
1237 return false; 1292 return false;
1238 1293
1239 xim = input_method->xim; 1294 xim = input_method->xim;
1295 spot.x = spot.y = -1;
1240 1296
1241 xim_styles = NULL; 1297 xim_styles = NULL;
1242 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1298 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1243 || !xim_styles || !xim_styles->count_styles) 1299 || !xim_styles || !xim_styles->count_styles)
1244 { 1300 {
1245 display->put_xim (input_method); 1301 im_destroy ();
1246 return false; 1302 return false;
1247 } 1303 }
1248 1304
1249 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1305 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1306
1307 for (int pi = 0; pi < 2; pi++)
1308 {
1309 p = pet[pi];
1310
1311 if (!p)
1312 continue;
1313
1250 s = rxvt_splitcommastring (p); 1314 s = rxvt_splitcommastring (p);
1315
1251 for (i = found = 0; !found && s[i]; i++) 1316 for (i = found = 0; !found && s[i]; i++)
1252 { 1317 {
1253 if (!STRCMP (s[i], "OverTheSpot")) 1318 if (!strcmp (s[i], "OverTheSpot"))
1254 input_style = (XIMPreeditPosition | XIMStatusNothing); 1319 input_style = (XIMPreeditPosition | XIMStatusNothing);
1255 else if (!STRCMP (s[i], "OffTheSpot")) 1320 else if (!strcmp (s[i], "OffTheSpot"))
1256 input_style = (XIMPreeditArea | XIMStatusArea); 1321 input_style = (XIMPreeditArea | XIMStatusArea);
1257 else if (!STRCMP (s[i], "Root")) 1322 else if (!strcmp (s[i], "Root"))
1258 input_style = (XIMPreeditNothing | XIMStatusNothing); 1323 input_style = (XIMPreeditNothing | XIMStatusNothing);
1324 else if (!strcmp (s[i], "None"))
1325 input_style = (XIMPreeditNone | XIMStatusNone);
1259 1326
1260 for (j = 0; j < xim_styles->count_styles; j++) 1327 for (j = 0; j < xim_styles->count_styles; j++)
1261 if (input_style == xim_styles->supported_styles[j]) 1328 if (input_style == xim_styles->supported_styles[j])
1262 { 1329 {
1330 rxvt_freecommastring (s);
1331
1263 found = 1; 1332 found = 1;
1264 break; 1333 goto foundpet;
1334 }
1335
1265 } 1336 }
1266 }
1267 1337
1268 for (i = 0; s[i]; i++) 1338 rxvt_freecommastring (s);
1269 free (s[i]); 1339 }
1270 1340
1271 free (s); 1341foundpet:
1342
1272 XFree (xim_styles); 1343 XFree (xim_styles);
1273 1344
1274 if (!found) 1345 if (!found)
1275 { 1346 {
1276 display->put_xim (input_method); 1347 im_destroy ();
1277 return false; 1348 return false;
1278 } 1349 }
1279 1350
1280 preedit_attr = status_attr = NULL; 1351 XFontSet fs = 0;
1352 XVaNestedList preedit_attr = 0, status_attr = 0;
1353
1354 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1355 {
1356 // fake us a font-set, please
1357 char **missing_charset_list;
1358 int missing_charset_count;
1359 char *def_string;
1360 char pat[512];
1361
1362 sprintf (pat,
1363 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1364 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1365 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1366 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1367 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1368 "*",
1369 TermWin.fheight,
1370 TermWin.fheight + 1, TermWin.fheight - 1,
1371 TermWin.fheight - 2, TermWin.fheight + 2);
1372
1373 fs = XCreateFontSet (display->display, pat,
1374 &missing_charset_list, &missing_charset_count, &def_string);
1375
1376 if (missing_charset_list)
1377 XFreeStringList (missing_charset_list);
1378
1379 if (!fs)
1380 {
1381 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1382 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1383 }
1384 }
1281 1385
1282 if (input_style & XIMPreeditPosition) 1386 if (input_style & XIMPreeditPosition)
1283 { 1387 {
1284 im_set_size (&rect); 1388 im_set_size (rect);
1285 im_set_position (&spot); 1389 im_set_position (spot);
1286 im_set_color (&fg, &bg); 1390 im_set_color (fg, bg);
1287 1391
1288 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1392 preedit_attr = XVaCreateNestedList (0,
1393 XNForeground, fg,
1394 XNBackground, bg,
1395 XNArea, &rect,
1289 XNSpotLocation, &spot, 1396 XNSpotLocation, &spot,
1290 XNForeground, fg, XNBackground, bg,
1291 //XNFontSet, TermWin.fontset, 1397 XNFontSet, fs,
1292 NULL); 1398 NULL);
1293 } 1399 }
1294 else if (input_style & XIMPreeditArea) 1400 else if (input_style & XIMPreeditArea)
1295 { 1401 {
1296 im_set_color (&fg, &bg); 1402 im_set_color (fg, bg);
1297 1403
1298 /* 1404 /*
1299 * The necessary width of preedit area is unknown 1405 * The necessary width of preedit area is unknown
1300 * until create input context. 1406 * until create input context.
1301 */ 1407 */
1302 needed_rect.width = 0; 1408 needed_rect.width = 0;
1303
1304 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1409 im_set_preedit_area (rect, status_rect, needed_rect);
1305 1410
1306 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1411 preedit_attr = XVaCreateNestedList (0,
1412 XNForeground, fg,
1307 XNForeground, fg, XNBackground, bg, 1413 XNBackground, bg,
1414 XNArea, &rect,
1415 XNFontSet, fs,
1416 NULL);
1417 status_attr = XVaCreateNestedList (0,
1418 XNForeground, fg,
1419 XNBackground, bg,
1420 XNArea, &status_rect,
1308 //XNFontSet, TermWin.fontset, 1421 XNFontSet, fs,
1309 NULL); 1422 NULL);
1310 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1311 XNForeground, fg, XNBackground, bg,
1312 //XNFontSet, TermWin.fontset,
1313 NULL);
1314 } 1423 }
1315 1424
1316 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1425 Input_Context = XCreateIC (xim,
1426 XNInputStyle, input_style,
1317 XNClientWindow, TermWin.parent[0], 1427 XNClientWindow, TermWin.vt,
1318 XNFocusWindow, TermWin.parent[0], 1428 XNFocusWindow, TermWin.parent[0],
1319 preedit_attr ? XNPreeditAttributes : NULL, 1429 preedit_attr ? XNPreeditAttributes : NULL,
1320 preedit_attr, 1430 preedit_attr,
1321 status_attr ? XNStatusAttributes : NULL, 1431 status_attr ? XNStatusAttributes : NULL,
1322 status_attr, NULL); 1432 status_attr, NULL);
1433
1323 if (preedit_attr) XFree (preedit_attr); 1434 if (preedit_attr) XFree (preedit_attr);
1324 if (status_attr) XFree (status_attr); 1435 if (status_attr) XFree (status_attr);
1436 if (fs) XFreeFontSet (display->display, fs);
1325 1437
1326 if (Input_Context == NULL) 1438 if (Input_Context == NULL)
1327 { 1439 {
1328 rxvt_print_error ("failed to create input context"); 1440 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1329 display->put_xim (input_method); 1441 im_destroy ();
1330 return false; 1442 return false;
1331 } 1443 }
1332 1444
1333 if (input_style & XIMPreeditArea) 1445 if (input_style & XIMPreeditArea)
1334 IMSetStatusPosition (); 1446 IMSetStatusPosition ();
1360 if (p && *p) 1472 if (p && *p)
1361 { 1473 {
1362 bool found = false; 1474 bool found = false;
1363 1475
1364 s = rxvt_splitcommastring (p); 1476 s = rxvt_splitcommastring (p);
1477
1365 for (i = 0; s[i]; i++) 1478 for (i = 0; s[i]; i++)
1366 { 1479 {
1367 if (*s[i]) 1480 if (*s[i])
1368 { 1481 {
1369 STRCPY (buf, "@im="); 1482 strcpy (buf, "@im=");
1370 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1483 strncat (buf, s[i], IMBUFSIZ - 5);
1371 if (IM_get_IC (buf)) 1484 if (IM_get_IC (buf))
1372 { 1485 {
1373 found = true; 1486 found = true;
1374 break; 1487 break;
1375 } 1488 }
1376 } 1489 }
1377 } 1490 }
1378 for (i = 0; s[i]; i++) 1491
1379 free (s[i]); 1492 rxvt_freecommastring (s);
1380 free (s);
1381 1493
1382 if (found) 1494 if (found)
1383 goto done; 1495 goto done;
1384 } 1496 }
1385 1497
1399} 1511}
1400 1512
1401void 1513void
1402rxvt_term::IMSetStatusPosition () 1514rxvt_term::IMSetStatusPosition ()
1403{ 1515{
1404 XRectangle preedit_rect, status_rect, *needed_rect; 1516 XRectangle preedit_rect, status_rect, *needed_rect;
1405 XVaNestedList preedit_attr, status_attr; 1517 XVaNestedList preedit_attr, status_attr;
1406 1518
1407 if (Input_Context == NULL 1519 if (!Input_Context
1520 || !TermWin.focus
1408 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1521 || !(input_style & XIMPreeditArea)
1409 || !IMisRunning ()) 1522 || !IMisRunning ())
1410 return; 1523 return;
1411 1524
1412 /* Getting the necessary width of preedit area */ 1525 /* Getting the necessary width of preedit area */
1413 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1526 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1414 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1527 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1415 XFree (status_attr); 1528 XFree (status_attr);
1416 1529
1417 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1530 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1531 XFree (needed_rect);
1418 1532
1419 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1533 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1420 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1534 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1421 1535
1422 XSetICValues (Input_Context, 1536 XSetICValues (Input_Context,
1423 XNPreeditAttributes, preedit_attr, 1537 XNPreeditAttributes, preedit_attr,
1424 XNStatusAttributes, status_attr, NULL); 1538 XNStatusAttributes, status_attr, NULL);
1425 1539
1426 XFree (preedit_attr); 1540 XFree (preedit_attr);
1427 XFree (status_attr); 1541 XFree (status_attr);
1428} 1542}
1429#endif /* USE_XIM */ 1543#endif /* USE_XIM */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines