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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines