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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines