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.80 by root, Fri Aug 13 19:31:23 2004 UTC vs.
Revision 1.156 by root, Mon Jan 2 18:20:23 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines