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.70 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.143 by root, Sun Feb 20 00:09:25 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines