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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines