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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines