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

Diff Legend

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