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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines