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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines