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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines