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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines