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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines