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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines