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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines