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.54 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.139 by root, Wed Feb 16 21:37:10 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines