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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines