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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines