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.76 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.143 by root, Sun Feb 20 00:09:25 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines