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.136 by root, Mon Feb 14 18:47:54 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines