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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines