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.73 by root, Fri Jul 30 14:59:12 2004 UTC vs.
Revision 1.135 by root, Sun Feb 13 11:07:57 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines