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

Diff Legend

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