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.108 by root, Wed Aug 25 05:03:33 2004 UTC vs.
Revision 1.148 by root, Wed Nov 30 21:05:39 2005 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 */
36 35
37#include <signal.h> 36#include <csignal>
37#include <cstring>
38 38
39#ifdef TTY_GID_SUPPORT 39#ifdef TTY_GID_SUPPORT
40# include <grp.h> 40# include <grp.h>
41#endif 41#endif
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring> 47#ifdef KEYSYM_RESOURCE
48# include "keyboard.h"
49#endif
48 50
49vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
50 52
51static char curlocale[128]; 53static char curlocale[128];
52 54
… …
166 incr_ev (this, &rxvt_term::incr_cb) 168 incr_ev (this, &rxvt_term::incr_cb)
167{ 169{
168 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 170 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
169 171
170 termlist.push_back (this); 172 termlist.push_back (this);
171}
172 173
173rxvt_term::~rxvt_term () 174#ifdef KEYSYM_RESOURCE
174{ 175 keyboard = new keyboard_manager;
175 termlist.erase (find (termlist.begin (), termlist.end(), this));
176 176
177 if (!keyboard)
178 rxvt_fatal ("out of memory, aborting.\n");
179#endif
180}
181
182// clean up the most important stuff, do *not* call x or free mem etc.
183// for use before an emergency exit
184void rxvt_term::emergency_cleanup ()
185{
177 if (cmd_pid) 186 if (cmd_pid)
178 kill (-cmd_pid, SIGHUP); 187 kill (-cmd_pid, SIGHUP);
179 188
180 pty.put ();
181
182#ifdef UTMP_SUPPORT 189#ifdef UTMP_SUPPORT
183 privileged_utmp (RESTORE); 190 privileged_utmp (RESTORE);
184#endif 191#endif
192
193 pty.put ();
194}
195
196rxvt_term::~rxvt_term ()
197{
198 termlist.erase (find (termlist.begin (), termlist.end(), this));
199
200 emergency_cleanup ();
185 201
186#if ENABLE_STYLES 202#if ENABLE_STYLES
187 for (int i = RS_styleCount; --i; ) 203 for (int i = RS_styleCount; --i; )
188 if (TermWin.fontset[i] != TermWin.fontset[0]) 204 if (TermWin.fontset[i] != TermWin.fontset[0])
189 delete TermWin.fontset[i]; 205 delete TermWin.fontset[i];
190#endif 206#endif
191 delete TermWin.fontset[0]; 207 delete TermWin.fontset[0];
192 208
193 if (display) 209 if (display)
194 { 210 {
211 dDisp;
212
195 selection_clear (); 213 selection_clear ();
196 214
197#ifdef USE_XIM 215#ifdef USE_XIM
198 im_destroy (); 216 im_destroy ();
199#endif 217#endif
200#ifdef MENUBAR 218#ifdef MENUBAR
201 if (menubarGC) XFreeGC (display->display, menubarGC); 219 if (menubarGC) XFreeGC (disp, menubarGC);
202#endif 220#endif
203#ifdef XTERM_SCROLLBAR 221#ifdef XTERM_SCROLLBAR
204 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 222 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
205 if (ShadowGC) XFreeGC (display->display, ShadowGC); 223 if (ShadowGC) XFreeGC (disp, ShadowGC);
206#endif 224#endif
207#ifdef PLAIN_SCROLLBAR 225#ifdef PLAIN_SCROLLBAR
208 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 226 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
209#endif 227#endif
210#ifdef NEXT_SCROLLBAR 228#ifdef NEXT_SCROLLBAR
211 if (blackGC) XFreeGC (display->display, blackGC); 229 if (blackGC) XFreeGC (disp, blackGC);
212 if (whiteGC) XFreeGC (display->display, whiteGC); 230 if (whiteGC) XFreeGC (disp, whiteGC);
213 if (grayGC) XFreeGC (display->display, grayGC); 231 if (grayGC) XFreeGC (disp, grayGC);
214 if (darkGC) XFreeGC (display->display, darkGC); 232 if (darkGC) XFreeGC (disp, darkGC);
215 if (stippleGC) XFreeGC (display->display, stippleGC); 233 if (stippleGC) XFreeGC (disp, stippleGC);
216 if (dimple) XFreePixmap (display->display, dimple); 234 if (dimple) XFreePixmap (disp, dimple);
217 if (upArrow) XFreePixmap (display->display, upArrow); 235 if (upArrow) XFreePixmap (disp, upArrow);
218 if (downArrow) XFreePixmap (display->display, downArrow); 236 if (downArrow) XFreePixmap (disp, downArrow);
219 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 237 if (upArrowHi) XFreePixmap (disp, upArrowHi);
220 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 238 if (downArrowHi) XFreePixmap (disp, downArrowHi);
221#endif 239#endif
222#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
223 if (topShadowGC) XFreeGC (display->display, topShadowGC); 241 if (topShadowGC) XFreeGC (disp, topShadowGC);
224 if (botShadowGC) XFreeGC (display->display, botShadowGC); 242 if (botShadowGC) XFreeGC (disp, botShadowGC);
225 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 243 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
226#endif 244#endif
227 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 245 if (TermWin.gc) XFreeGC (disp, TermWin.gc);
228 246
229#if defined(MENUBAR) && (MENUBAR_MAX > 1) 247#if defined(MENUBAR) && (MENUBAR_MAX > 1)
230 delete menuBar.drawable; 248 delete menuBar.drawable;
231 //if (menuBar.win) 249 //if (menuBar.win)
232 // XDestroyWindow (display->display, menuBar.win); 250 // XDestroyWindow (disp, menuBar.win);
233#endif 251#endif
234 delete TermWin.drawable; 252 delete TermWin.drawable;
235 // destroy all windows 253 // destroy all windows
236 if (TermWin.parent[0]) 254 if (TermWin.parent[0])
237 XDestroyWindow (display->display, TermWin.parent[0]); 255 XDestroyWindow (disp, TermWin.parent[0]);
238 } 256 }
239 257
240 // TODO: free pixcolours, colours should become part of rxvt_display 258 // TODO: free pixcolours, colours should become part of rxvt_display
241 259
242 delete pix_colors_focused; 260 delete pix_colors_focused;
243#ifdef OFF_FOCUS_FADING 261#if OFF_FOCUS_FADING
244 delete pix_colors_unfocused; 262 delete pix_colors_unfocused;
245#endif 263#endif
246 264
247 displays.put (display); 265 displays.put (display);
248 266
249 scr_release (); 267 scr_release ();
250 268
251 /* clear all resources */ 269 /* clear all resources */
252 for (int i = 0; i < allocated.size (); i++) 270 for (int i = 0; i < allocated.size (); i++)
253 free (allocated[i]); 271 free (allocated [i]);
254 272
255 free (selection.text); 273 free (selection.text);
256 // TODO: manage env vars in child only(!) 274 // TODO: manage env vars in child only(!)
257 free (env_windowid); 275 free (env_windowid);
258 free (env_display); 276 free (env_display);
259 free (env_term); 277 free (env_term);
260 free (env_colorfgbg); 278 free (env_colorfgbg);
261 free (locale); 279 free (locale);
262#if 0 280 free (v_buffer);
263 free (codeset); 281 free (incr_buf);
264#endif
265 282
266 delete envv; 283 delete envv;
267 delete argv; 284 delete argv;
285
286#ifdef KEYSYM_RESOURCE
287 delete keyboard;
288#endif
268} 289}
269 290
270void 291void
271rxvt_term::destroy () 292rxvt_term::destroy ()
272{ 293{
… …
324 345
325 delete this; 346 delete this;
326} 347}
327 348
328/*----------------------------------------------------------------------*/ 349/*----------------------------------------------------------------------*/
329/* rxvt_init () */ 350/*
351 * Exit gracefully, clearing the utmp entry and restoring tty attributes
352 * TODO: if debugging, this should free up any known resources if we can
353 */
354static XErrorHandler old_xerror_handler;
355
356static void
357rxvt_emergency_cleanup ()
358{
359 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
360 (*t)->emergency_cleanup ();
361}
362
363#if ENABLE_FRILLS
364static void
365print_x_error (Display *dpy, XErrorEvent *event)
366{
367 char buffer[BUFSIZ];
368 char mesg[BUFSIZ];
369 char number[32];
370 char *mtype = "XlibMessage";
371 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
372 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
373 rxvt_warn ("An X Error occured, trying to continue after report.\n");
374 rxvt_warn ("%s: %s\n", mesg, buffer);
375 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
376 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
377 sprintf(number, "%d", event->request_code);
378 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
379 rxvt_warn ("(which is %s)\n", buffer);
380 if (event->request_code >= 128) {
381 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
382 mesg, BUFSIZ);
383 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
384 }
385 if ((event->error_code == BadWindow) ||
386 (event->error_code == BadPixmap) ||
387 (event->error_code == BadCursor) ||
388 (event->error_code == BadFont) ||
389 (event->error_code == BadDrawable) ||
390 (event->error_code == BadColor) ||
391 (event->error_code == BadGC) ||
392 (event->error_code == BadIDChoice) ||
393 (event->error_code == BadValue) ||
394 (event->error_code == BadAtom)) {
395 if (event->error_code == BadValue)
396 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
397 mesg, BUFSIZ);
398 else if (event->error_code == BadAtom)
399 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
400 mesg, BUFSIZ);
401 else
402 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
403 mesg, BUFSIZ);
404 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
405 }
406 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
407 mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
409}
410#endif
411
412int
413rxvt_xerror_handler (Display *display, XErrorEvent *event)
414{
415 if (GET_R->allowedxerror == -1)
416 GET_R->allowedxerror = event->error_code;
417 else
418 {
419 // GET_R is most likely not the terminal which caused the error,
420 // so just output the error and continue
421#if ENABLE_FRILLS
422 print_x_error (display, event);
423#else
424 old_xerror_handler (display, event);
425#endif
426 }
427
428 return 0;
429}
430
431int
432rxvt_xioerror_handler (Display *display)
433{
434 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
435 DisplayString (display));
436 rxvt_emergency_cleanup ();
437 _exit (EXIT_FAILURE);
438}
439
440/*----------------------------------------------------------------------*/
330bool 441bool
331rxvt_term::init (int argc, const char *const *argv) 442rxvt_term::init (int argc, const char *const *argv)
332{ 443{
333 SET_R (this); 444 SET_R (this);
334 445
446 set_locale ("");
447
335 if (!init_vars ()) 448 if (!init_vars ())
336 return false; 449 return false;
337 450
338 init_secondary (); 451 init_secondary ();
339 452
340 const char **cmd_argv = init_resources (argc, argv); 453 const char **cmd_argv = init_resources (argc, argv);
341 454
342 set_locale (""); 455#ifdef KEYSYM_RESOURCE
456 keyboard->register_done ();
457#endif
343 458
344#if MENUBAR_MAX 459#if MENUBAR_MAX
345 menubar_read (rs[Rs_menu]); 460 menubar_read (rs[Rs_menu]);
346#endif 461#endif
347#ifdef HAVE_SCROLLBARS 462#ifdef HAVE_SCROLLBARS
… …
349 scrollBar.setIdle (); /* set existence for size calculations */ 464 scrollBar.setIdle (); /* set existence for size calculations */
350#endif 465#endif
351 466
352 create_windows (argc, argv); 467 create_windows (argc, argv);
353 468
469 dDisp;
470
354 init_xlocale (); 471 init_xlocale ();
355 472
356 scr_reset (); /* initialize screen */ 473 scr_reset (); /* initialize screen */
357 474
358#if 0 475#if 0
359 XSynchronize (display->display, True); 476 XSynchronize (disp, True);
360#endif 477#endif
361 478
362#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
363 if (options & Opt_scrollBar) 480 if (options & Opt_scrollBar)
364 resize_scrollbar (); /* create and map scrollbar */ 481 resize_scrollbar (); /* create and map scrollbar */
365#endif 482#endif
366#if (MENUBAR_MAX) 483#if (MENUBAR_MAX)
367 if (menubar_visible ()) 484 if (menubar_visible ())
368 XMapWindow (display->display, menuBar.win); 485 XMapWindow (disp, menuBar.win);
369#endif 486#endif
370#ifdef TRANSPARENT 487#ifdef TRANSPARENT
371 if (options & Opt_transparent) 488 if (options & Opt_transparent)
372 { 489 {
373 XSelectInput (display->display, display->root, PropertyChangeMask); 490 XSelectInput (disp, display->root, PropertyChangeMask);
374 check_our_parents (); 491 check_our_parents ();
375 rootwin_ev.start (display, display->root); 492 rootwin_ev.start (display, display->root);
376 } 493 }
377#endif 494#endif
378 495
379 XMapWindow (display->display, TermWin.vt); 496 XMapWindow (disp, TermWin.vt);
380 XMapWindow (display->display, TermWin.parent[0]); 497 XMapWindow (disp, TermWin.parent[0]);
381 498
382 set_colorfgbg (); 499 set_colorfgbg ();
383 500
384 init_command (cmd_argv); 501 init_command (cmd_argv);
385 502
503 free (cmd_argv);
504
386 pty_ev.start (pty.pty, EVENT_READ); 505 pty_ev.start (pty.pty, EVENT_READ);
387 506
388 check_ev.start (); 507 check_ev.start ();
389 508
390 return true; 509 return true;
391} 510}
392 511
393static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 512static struct sig_handlers
513{
514 sig_watcher sw_chld, sw_term, sw_int;
515
516 void sig_chld (sig_watcher &w)
517 {
518 // we are being called for every SIGCHLD, find the corresponding term
519 int pid;
520
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid)
524 {
525 (*t)->destroy ();
526 break;
527 }
528 }
529
530 /*
531 * Catch a fatal signal and tidy up before quitting
532 */
533 void
534 sig_term (sig_watcher &w)
535 {
536#ifdef DEBUG_CMD
537 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
538#endif
539 rxvt_emergency_cleanup ();
540 signal (w.signum, SIG_DFL);
541 kill (getpid (), w.signum);
542 }
543
544 sig_handlers ()
545 : sw_chld (this, &sig_handlers::sig_chld),
546 sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term)
548 {
549 }
550} sig_handlers;
394 551
395void 552void
396rxvt_init () 553rxvt_init ()
397{ 554{
398 /* install exit handler for cleanup */
399#if 0
400#ifdef HAVE_ATEXIT
401 atexit (rxvt_clean_exit);
402#else
403#endif
404#endif
405 /* 555 /*
406 * Save and then give up any super-user privileges 556 * Save and then give up any super-user privileges
407 * If we need privileges in any area then we must specifically request it. 557 * If we need privileges in any area then we must specifically request it.
408 * We should only need to be root in these cases: 558 * We should only need to be root in these cases:
409 * 1. write utmp entries on some systems 559 * 1. write utmp entries on some systems
410 * 2. chown tty on some systems 560 * 2. chown tty on some systems
411 */ 561 */
412 rxvt_privileges (SAVE); 562 rxvt_privileges (SAVE);
413 rxvt_privileges (IGNORE); 563 rxvt_privileges (IGNORE);
414 564
415 struct sigaction sa; 565 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN);
416 567
417 sigfillset (&sa.sa_mask); 568 sig_handlers.sw_chld.start (SIGCHLD);
418 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 569 sig_handlers.sw_term.start (SIGTERM);
419 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0); 570 sig_handlers.sw_int.start (SIGINT);
420 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
421 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
422 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
423 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
424 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
425 571
426 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 572 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
427 /* signal (SIGURG, SIG_DFL); */ 573 /* signal (SIGURG, SIG_DFL); */
428 574
429 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss
430 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 577 XSetIOErrorHandler (rxvt_xioerror_handler);
431}
432
433/* ------------------------------------------------------------------------- *
434 * SIGNAL HANDLING & EXIT HANDLER *
435 * ------------------------------------------------------------------------- */
436/*
437 * Catch a SIGCHLD signal and exit if the direct child has died
438 */
439
440void rxvt_term::child_exited (int pid)
441{
442 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
443 if (pid == (*t)->cmd_pid)
444 {
445 (*t)->destroy ();
446 break;
447 }
448}
449
450/* ARGSUSED */
451/* INTPROTO */
452RETSIGTYPE
453rxvt_Child_signal (int sig __attribute__ ((unused)))
454{
455 int pid, save_errno = errno;
456
457 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
458 rxvt_term::child_exited (pid);
459
460 errno = save_errno;
461}
462
463/*
464 * Catch a fatal signal and tidy up before quitting
465 */
466/* INTPROTO */
467RETSIGTYPE
468rxvt_Exit_signal (int sig)
469{
470 signal (sig, SIG_DFL);
471#ifdef DEBUG_CMD
472 rxvt_warn ("caught signal %d, exiting.\n", sig);
473#endif
474 rxvt_clean_exit ();
475 kill (getpid (), sig);
476}
477
478/* INTPROTO */
479int
480rxvt_xerror_handler (Display *display, XErrorEvent *event)
481{
482 if (GET_R->allowedxerror == -1)
483 GET_R->allowedxerror = event->error_code;
484 else
485 {
486 old_xerror_handler (display, event);
487 GET_R->destroy ();
488 }
489
490 return 0;
491}
492
493/*----------------------------------------------------------------------*/
494/*
495 * Exit gracefully, clearing the utmp entry and restoring tty attributes
496 * TODO: if debugging, this should free up any known resources if we can
497 */
498/* INTPROTO */
499void
500rxvt_clean_exit ()
501{
502 // TODO: rxvtd should clean up all ressources
503 if (GET_R)
504 GET_R->destroy ();
505} 578}
506 579
507/* ------------------------------------------------------------------------- * 580/* ------------------------------------------------------------------------- *
508 * MEMORY ALLOCATION WRAPPERS * 581 * MEMORY ALLOCATION WRAPPERS *
509 * ------------------------------------------------------------------------- */ 582 * ------------------------------------------------------------------------- */
510/* INTPROTO */ 583void *
511void *
512rxvt_malloc (size_t size) 584rxvt_malloc (size_t size)
513{ 585{
514 void *p;
515
516 p = malloc (size); 586 void *p = malloc (size);
587
517 if (p) 588 if (!p)
518 return p;
519
520 rxvt_fatal ("memory allocation failure. aborting.\n"); 589 rxvt_fatal ("memory allocation failure. aborting.\n");
521 /* NOTREACHED */
522}
523 590
524/* INTPROTO */ 591 return p;
525void * 592}
593
594void *
526rxvt_calloc (size_t number, size_t size) 595rxvt_calloc (size_t number, size_t size)
527{ 596{
528 void *p;
529
530 p = calloc (number, size); 597 void *p = calloc (number, size);
598
531 if (p) 599 if (!p)
532 return p;
533
534 rxvt_fatal ("memory allocation failure. aborting.\n"); 600 rxvt_fatal ("memory allocation failure. aborting.\n");
535 /* NOTREACHED */
536}
537 601
538/* INTPROTO */ 602 return p;
603}
604
539void * 605void *
540rxvt_realloc (void *ptr, size_t size) 606rxvt_realloc (void *ptr, size_t size)
541{ 607{
542 void *p;
543
544 if (ptr)
545 p = realloc (ptr, size); 608 void *p = realloc (ptr, size);
546 else
547 p = malloc (size);
548 609
549 if (p) 610 if (!p)
550 return p;
551
552 rxvt_fatal ("memory allocation failure. aborting.\n"); 611 rxvt_fatal ("memory allocation failure. aborting.\n");
553 /* NOTREACHED */ 612
613 return p;
554} 614}
555 615
556/* ------------------------------------------------------------------------- * 616/* ------------------------------------------------------------------------- *
557 * PRIVILEGED OPERATIONS * 617 * PRIVILEGED OPERATIONS *
558 * ------------------------------------------------------------------------- */ 618 * ------------------------------------------------------------------------- */
… …
633 * if width/height are non-zero then override calculated width/height 693 * if width/height are non-zero then override calculated width/height
634 */ 694 */
635void 695void
636rxvt_term::window_calc (unsigned int width, unsigned int height) 696rxvt_term::window_calc (unsigned int width, unsigned int height)
637{ 697{
638 short recalc_x, recalc_y; 698 short recalc_x, recalc_y;
639 int x, y, sb_w, mb_h, flags; 699 int x, y, sb_w, mb_h, flags;
640 unsigned int w, h; 700 unsigned int w, h;
641 unsigned int max_width, max_height; 701 unsigned int max_width, max_height;
702 dDisp;
642 703
643 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
644 TermWin.ncol, TermWin.nrow, szHint.width, 705 TermWin.ncol, TermWin.nrow, szHint.width,
645 szHint.height)); 706 szHint.height));
646 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
… …
652 if (!parsed_geometry) 713 if (!parsed_geometry)
653 { 714 {
654 parsed_geometry = 1; 715 parsed_geometry = 1;
655 if (rs[Rs_geometry]) 716 if (rs[Rs_geometry])
656 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718
657 if (flags & WidthValue) 719 if (flags & WidthValue)
658 { 720 {
659 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 721 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
660 szHint.flags |= USSize; 722 szHint.flags |= USSize;
661 } 723 }
724
662 if (flags & HeightValue) 725 if (flags & HeightValue)
663 { 726 {
664 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 727 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
665 szHint.flags |= USSize; 728 szHint.flags |= USSize;
666 } 729 }
730
667 if (flags & XValue) 731 if (flags & XValue)
668 { 732 {
669 szHint.x = x; 733 szHint.x = x;
670 szHint.flags |= USPosition; 734 szHint.flags |= USPosition;
671 if (flags & XNegative) 735 if (flags & XNegative)
672 { 736 {
673 recalc_x = 1; 737 recalc_x = 1;
674 szHint.win_gravity = NorthEastGravity; 738 szHint.win_gravity = NorthEastGravity;
675 } 739 }
676 } 740 }
741
677 if (flags & YValue) 742 if (flags & YValue)
678 { 743 {
679 szHint.y = y; 744 szHint.y = y;
680 szHint.flags |= USPosition; 745 szHint.flags |= USPosition;
681 if (flags & YNegative) 746 if (flags & YNegative)
… …
744 809
745 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 810 if (scrollbar_visible () && (options & Opt_scrollBar_right))
746 window_sb_x = szHint.width - sb_w; 811 window_sb_x = szHint.width - sb_w;
747 812
748 if (recalc_x) 813 if (recalc_x)
749 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 814 szHint.x += (DisplayWidth (disp, display->screen)
750 - szHint.width - 2 * TermWin.ext_bwidth); 815 - szHint.width - 2 * TermWin.ext_bwidth);
751 if (recalc_y) 816 if (recalc_y)
752 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 817 szHint.y += (DisplayHeight (disp, display->screen)
753 - szHint.height - 2 * TermWin.ext_bwidth); 818 - szHint.height - 2 * TermWin.ext_bwidth);
754 819
755 TermWin.ncol = TermWin.width / TermWin.fwidth; 820 TermWin.ncol = TermWin.width / TermWin.fwidth;
756 TermWin.nrow = TermWin.height / TermWin.fheight; 821 TermWin.nrow = TermWin.height / TermWin.fheight;
757 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
780 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
781 846
782#if 0 847#if 0
783 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
784 if (cmd_pid) /* force through to the command */ 849 if (cmd_pid) /* force through to the command */
785 kill (cmd_pid, SIGWINCH); 850 kill (-cmd_pid, SIGWINCH);
786#endif 851#endif
787} 852}
788 853
789/*----------------------------------------------------------------------*/ 854/*----------------------------------------------------------------------*/
790/* set_fonts () - load and set the various fonts 855/* set_fonts () - load and set the various fonts
791/* 856 *
792 * init = 1 - initialize 857 * init = 1 - initialize
793 * 858 *
794 * fontname == FONT_UP - switch to bigger font 859 * fontname == FONT_UP - switch to bigger font
795 * fontname == FONT_DN - switch to smaller font 860 * fontname == FONT_DN - switch to smaller font
796 */ 861 */
… …
798rxvt_term::set_fonts () 863rxvt_term::set_fonts ()
799{ 864{
800 rxvt_fontset *fs = new rxvt_fontset (this); 865 rxvt_fontset *fs = new rxvt_fontset (this);
801 rxvt_fontprop prop; 866 rxvt_fontprop prop;
802 867
803 prop.width = prop.height = prop.weight = prop.slant
804 = rxvt_fontprop::unset;
805
806 if (!fs 868 if (!fs
807 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed", prop) 869 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
808 || !fs->realize_font (1)) 870 || !fs->realize_font (1))
809 { 871 {
810 delete fs; 872 delete fs;
811 return false; 873 return false;
812 } 874 }
… …
818#endif 880#endif
819 881
820 delete TermWin.fontset[0]; 882 delete TermWin.fontset[0];
821 TermWin.fontset[0] = fs; 883 TermWin.fontset[0] = fs;
822 884
823 fs->prop = prop = (*fs)[1]->properties (); 885 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace;
887 fs->set_prop (prop);
824 888
825 TermWin.fwidth = prop.width; 889 TermWin.fwidth = prop.width;
826 TermWin.fheight = prop.height; 890 TermWin.fheight = prop.height;
827 TermWin.fweight = prop.weight; 891 TermWin.fweight = prop.weight;
828 TermWin.fslant = prop.slant; 892 TermWin.fslant = prop.slant;
… …
848 912
849 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 913 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
850 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 914 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
851 } 915 }
852 916
853 fs->populate (res, prop2); 917 fs->populate (res);
918 fs->set_prop (prop2);
854 } 919 }
855#else 920#else
856 TermWin.fontset[style] = TermWin.fontset[0]; 921 TermWin.fontset[style] = TermWin.fontset[0];
857#endif 922#endif
858 } 923 }
… …
865 } 930 }
866 931
867 return true; 932 return true;
868} 933}
869 934
935void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936{
937 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0],
939 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941}
942
943void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944{
945 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws);
948
949 XChangeProperty (display->display, TermWin.parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s));
952
953 free (s);
954 free (ws);
955}
956
870/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
871/*----------------------------------------------------------------------*/ 958/*----------------------------------------------------------------------*/
872/* xterm sequences - title, iconName, color (exptl) */ 959/* xterm sequences - title, iconName, color (exptl) */
873void 960void
874rxvt_term::set_title (const char *str) 961rxvt_term::set_title (const char *str)
875{ 962{
876#ifdef SMART_WINDOW_TITLE 963 set_string_property (XA_WM_NAME, str);
877 char *name; 964#if ENABLE_EWMH
878 965 set_utf8_property (xa[XA_NET_WM_NAME], str);
879 if (!XFetchName (display->display, TermWin.parent[0], &name))
880 name = NULL;
881
882 if (name == NULL || strcmp (name, str))
883#endif
884 XStoreName (display->display, TermWin.parent[0], str);
885
886#ifdef SMART_WINDOW_TITLE
887 if (name)
888 XFree (name);
889#endif 966#endif
890} 967}
891 968
892void 969void
893rxvt_term::set_icon_name (const char *str) 970rxvt_term::set_icon_name (const char *str)
894{ 971{
895#ifdef SMART_WINDOW_TITLE 972 set_string_property (XA_WM_ICON_NAME, str);
896 char *name; 973#if ENABLE_EWMH
897 974 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
898 if (!XGetIconName (display->display, TermWin.parent[0], &name))
899 name = NULL;
900
901 if (name == NULL || strcmp (name, str))
902#endif
903 XSetIconName (display->display, TermWin.parent[0], str);
904
905#ifdef SMART_WINDOW_TITLE
906 if (name)
907 XFree (name);
908#endif 975#endif
909} 976}
910 977
911#ifdef XTERM_COLOR_CHANGE 978#ifdef XTERM_COLOR_CHANGE
912void 979void
… …
920 987
921 /* handle color aliases */ 988 /* handle color aliases */
922 if (isdigit (*color)) 989 if (isdigit (*color))
923 { 990 {
924 i = atoi (color); 991 i = atoi (color);
992
925 if (i >= 8 && i <= 15) 993 if (i >= 8 && i <= 15)
926 { /* bright colors */ 994 { /* bright colors */
927 i -= 8; 995 i -= 8;
928# ifndef NO_BRIGHTCOLOR 996# ifndef NO_BRIGHTCOLOR
929 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 997 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
930 SET_PIXCOLOR (idx); 998 SET_PIXCOLOR (idx);
931 goto Done; 999 goto done;
932# endif 1000# endif
933
934 } 1001 }
1002
935 if (i >= 0 && i <= 7) 1003 if (i >= 0 && i <= 7)
936 { /* normal colors */ 1004 { /* normal colors */
937 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1005 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
938 SET_PIXCOLOR (idx); 1006 SET_PIXCOLOR (idx);
939 goto Done; 1007 goto done;
940 } 1008 }
941 } 1009 }
942 1010
943 if (!rXParseAllocColor (& xcol, color)) 1011 if (!rXParseAllocColor (&xcol, color))
944 return; 1012 return;
945 1013
946 /* XStoreColor (display->display, display->cmap, XColor*); */ 1014 /* XStoreColor (display->display, display->cmap, XColor*); */
947 1015
948 /* 1016 /*
… …
964 pix_colors_focused[idx] = xcol; 1032 pix_colors_focused[idx] = xcol;
965 SET_PIXCOLOR (idx); 1033 SET_PIXCOLOR (idx);
966 1034
967 /* XSetWindowAttributes attr; */ 1035 /* XSetWindowAttributes attr; */
968 /* Cursor cursor; */ 1036 /* Cursor cursor; */
969Done: 1037done:
1038
970#ifdef OFF_FOCUS_FADING 1039#if OFF_FOCUS_FADING
971 if (rs[Rs_fade]) 1040 if (rs[Rs_fade])
972 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1041 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
973#endif 1042#endif
974 1043
975 /*TODO: handle Color_BD, scrollbar background, etc. */ 1044 /*TODO: handle Color_BD, scrollbar background, etc. */
976 1045
977 recolour_cursor (); 1046 recolour_cursor ();
… …
1031 1100
1032 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1101 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1033} 1102}
1034 1103
1035/*----------------------------------------------------------------------*/ 1104/*----------------------------------------------------------------------*/
1036/*
1037 * Colour determination for low colour displays, routine from
1038 * Hans de Goede <hans@highrise.nl>
1039 */
1040 1105
1041int 1106int
1042rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1107rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1043{ 1108{
1044 if (!screen_in_out->set (display, colour)) 1109 if (!screen_in_out->set (display, colour))
… …
1055 * -------------------------------------------------------------------- */ 1120 * -------------------------------------------------------------------- */
1056void 1121void
1057rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1122rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1058{ 1123{
1059 int fix_screen; 1124 int fix_screen;
1060
1061#ifdef SMART_RESIZE 1125#ifdef SMART_RESIZE
1062 int old_width = szHint.width, old_height = szHint.height; 1126 int old_width = szHint.width, old_height = szHint.height;
1063#endif 1127#endif
1128 dDisp;
1064 1129
1065 window_calc (width, height); 1130 window_calc (width, height);
1066 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1131 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1067 1132
1068 if (!ignoreparent) 1133 if (!ignoreparent)
1069 { 1134 {
1070#ifdef SMART_RESIZE 1135#ifdef SMART_RESIZE
1071 /* 1136 /*
… …
1075 int x, y, x1, y1; 1140 int x, y, x1, y1;
1076 int dx, dy; 1141 int dx, dy;
1077 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1142 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1078 Window unused_cr; 1143 Window unused_cr;
1079 1144
1080 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1145 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1081 0, 0, &x, &y, &unused_cr); 1146 0, 0, &x, &y, &unused_cr);
1082 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1147 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1083 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1148 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1084 /* 1149 /*
1085 * if display->root isn't the parent window, a WM will probably have offset 1150 * if display->root isn't the parent window, a WM will probably have offset
1086 * our position for handles and decorations. Counter it 1151 * our position for handles and decorations. Counter it
1087 */ 1152 */
… …
1089 { 1154 {
1090 x -= x1; 1155 x -= x1;
1091 y -= y1; 1156 y -= y1;
1092 } 1157 }
1093 1158
1094 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1159 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1095 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1160 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1096 dx = old_width - szHint.width; 1161 dx = old_width - szHint.width;
1097 dy = old_height - szHint.height; 1162 dy = old_height - szHint.height;
1098 1163
1099 /* Check position of the center of the window */ 1164 /* Check position of the center of the window */
1100 if (x < x1) /* left half */ 1165 if (x < x1) /* left half */
… …
1104 if (y < y1) /* top half */ 1169 if (y < y1) /* top half */
1105 dy = 0; 1170 dy = 0;
1106 else if (y == y1) /* exact center */ 1171 else if (y == y1) /* exact center */
1107 dy /= 2; 1172 dy /= 2;
1108 1173
1109 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1174 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1110 szHint.width, szHint.height); 1175 szHint.width, szHint.height);
1111#else 1176#else
1112 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1177 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1113#endif 1178#endif
1114 } 1179 }
1115 1180
1116 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1181 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1117 1182
1118 if (fix_screen || width != old_width || height != old_height) 1183 if (fix_screen || width != old_width || height != old_height)
1119 { 1184 {
1120 if (scrollbar_visible ()) 1185 if (scrollbar_visible ())
1121 { 1186 {
1122 XMoveResizeWindow (display->display, scrollBar.win, 1187 XMoveResizeWindow (disp, scrollBar.win,
1123 window_sb_x, 0, 1188 window_sb_x, 0,
1124 scrollbar_TotalWidth (), szHint.height); 1189 scrollbar_TotalWidth (), szHint.height);
1125 resize_scrollbar (); 1190 resize_scrollbar ();
1126 } 1191 }
1127 1192
1128 if (menubar_visible ()) 1193 if (menubar_visible ())
1129 XMoveResizeWindow (display->display, menuBar.win, 1194 XMoveResizeWindow (disp, menuBar.win,
1130 window_vt_x, 0, 1195 window_vt_x, 0,
1131 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1196 TermWin_TotalWidth (), menuBar_TotalHeight ());
1132 1197
1133 XMoveResizeWindow (display->display, TermWin.vt, 1198 XMoveResizeWindow (disp, TermWin.vt,
1134 window_vt_x, window_vt_y, 1199 window_vt_x, window_vt_y,
1135 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1200 TermWin_TotalWidth (), TermWin_TotalHeight ());
1201
1136 scr_clear (); 1202 scr_clear ();
1137#ifdef XPM_BACKGROUND 1203#ifdef XPM_BACKGROUND
1138 resize_pixmap (); 1204 resize_pixmap ();
1139#endif 1205#endif
1140 } 1206 }
… …
1163 } 1229 }
1164 1230
1165 old_width = szHint.width; 1231 old_width = szHint.width;
1166 old_height = szHint.height; 1232 old_height = szHint.height;
1167 1233
1234#ifdef XPM_BACKGROUND
1235 if (TermWin.pixmap)
1236 scr_touch (false);
1237#endif
1238
1168#ifdef USE_XIM 1239#ifdef USE_XIM
1169 IMSetStatusPosition (); 1240 IMSetStatusPosition ();
1170#endif 1241#endif
1171} 1242}
1172 1243
… …
1180 XWindowAttributes wattr; 1251 XWindowAttributes wattr;
1181 1252
1182 if (width == 0 || height == 0) 1253 if (width == 0 || height == 0)
1183 { 1254 {
1184 XGetWindowAttributes (display->display, display->root, &wattr); 1255 XGetWindowAttributes (display->display, display->root, &wattr);
1256
1185 if (width == 0) 1257 if (width == 0)
1186 width = wattr.width - szHint.base_width; 1258 width = wattr.width - szHint.base_width;
1187 if (height == 0) 1259 if (height == 0)
1188 height = wattr.height - szHint.base_height; 1260 height = wattr.height - szHint.base_height;
1189 } 1261 }
… …
1263} 1335}
1264 1336
1265void 1337void
1266rxvt_term::IMSendSpot () 1338rxvt_term::IMSendSpot ()
1267{ 1339{
1268 XPoint spot; 1340 XPoint nspot;
1269 XVaNestedList preedit_attr; 1341 XVaNestedList preedit_attr;
1270 1342
1271 if (!Input_Context 1343 if (!Input_Context
1272 || !TermWin.focus 1344 || !TermWin.focus
1273 || !(input_style & XIMPreeditPosition) 1345 || !(input_style & XIMPreeditPosition))
1274#if 0
1275 || !(event_type == KeyPress
1276 || event_type == Expose
1277 || event_type == NoExpose
1278 || event_type == SelectionNotify
1279 || event_type == ButtonRelease || event_type == FocusIn)
1280#endif
1281 || !IMisRunning ())
1282 return; 1346 return;
1283 1347
1284 im_set_position (spot); 1348 im_set_position (nspot);
1349
1350 if (nspot.x == spot.x && nspot.y == spot.y)
1351 return;
1352
1353 spot = nspot;
1285 1354
1286 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1355 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1287 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1356 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1288 XFree (preedit_attr); 1357 XFree (preedit_attr);
1289} 1358}
1290 1359
1291void 1360void
1292rxvt_term::im_destroy () 1361rxvt_term::im_destroy ()
1293{ 1362{
1294 if (Input_Context)
1295 {
1296 XDestroyIC (Input_Context);
1297 Input_Context = 0;
1298 }
1299
1300 if (input_method) 1363 if (input_method)
1301 { 1364 {
1365 if (Input_Context && input_method->xim)
1366 XDestroyIC (Input_Context);
1367
1302 display->put_xim (input_method); 1368 display->put_xim (input_method);
1303 input_method = 0; 1369 input_method = 0;
1304 } 1370 }
1371
1372 Input_Context = 0;
1305} 1373}
1306 1374
1307/* 1375/*
1308 * Try to open a XIM with the current modifiers, then see if we can 1376 * Try to open a XIM with the current modifiers, then see if we can
1309 * open a suitable preedit type 1377 * open a suitable preedit type
… …
1327 input_method = display->get_xim (locale, modifiers); 1395 input_method = display->get_xim (locale, modifiers);
1328 if (input_method == NULL) 1396 if (input_method == NULL)
1329 return false; 1397 return false;
1330 1398
1331 xim = input_method->xim; 1399 xim = input_method->xim;
1400 spot.x = spot.y = -1;
1332 1401
1333 xim_styles = NULL; 1402 xim_styles = NULL;
1334 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1403 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1335 || !xim_styles || !xim_styles->count_styles) 1404 || !xim_styles || !xim_styles->count_styles)
1336 { 1405 {
1337 im_destroy (); 1406 im_destroy ();
1338 return false; 1407 return false;
1339 } 1408 }
1340 1409
1341 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1410 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1411
1412 for (int pi = 0; pi < 2; pi++)
1413 {
1414 p = pet[pi];
1415
1416 if (!p)
1417 continue;
1418
1342 s = rxvt_splitcommastring (p); 1419 s = rxvt_splitcommastring (p);
1343 1420
1344 for (i = found = 0; !found && s[i]; i++) 1421 for (i = found = 0; !found && s[i]; i++)
1345 { 1422 {
1346 if (!strcmp (s[i], "OverTheSpot")) 1423 if (!strcmp (s[i], "OverTheSpot"))
1347 input_style = (XIMPreeditPosition | XIMStatusNothing); 1424 input_style = (XIMPreeditPosition | XIMStatusNothing);
1348 else if (!strcmp (s[i], "OffTheSpot")) 1425 else if (!strcmp (s[i], "OffTheSpot"))
1349 input_style = (XIMPreeditArea | XIMStatusArea); 1426 input_style = (XIMPreeditArea | XIMStatusArea);
1350 else if (!strcmp (s[i], "Root")) 1427 else if (!strcmp (s[i], "Root"))
1351 input_style = (XIMPreeditNothing | XIMStatusNothing); 1428 input_style = (XIMPreeditNothing | XIMStatusNothing);
1429 else if (!strcmp (s[i], "None"))
1430 input_style = (XIMPreeditNone | XIMStatusNone);
1352 1431
1353 for (j = 0; j < xim_styles->count_styles; j++) 1432 for (j = 0; j < xim_styles->count_styles; j++)
1354 if (input_style == xim_styles->supported_styles[j]) 1433 if (input_style == xim_styles->supported_styles[j])
1355 { 1434 {
1435 rxvt_freecommastring (s);
1436
1356 found = 1; 1437 found = 1;
1357 break; 1438 goto foundpet;
1439 }
1440
1358 } 1441 }
1359 }
1360 1442
1361 for (i = 0; s[i]; i++) 1443 rxvt_freecommastring (s);
1362 free (s[i]); 1444 }
1363 1445
1364 free (s); 1446foundpet:
1447
1365 XFree (xim_styles); 1448 XFree (xim_styles);
1366 1449
1367 if (!found) 1450 if (!found)
1368 { 1451 {
1369 im_destroy (); 1452 im_destroy ();
… …
1390 "*", 1473 "*",
1391 TermWin.fheight, 1474 TermWin.fheight,
1392 TermWin.fheight + 1, TermWin.fheight - 1, 1475 TermWin.fheight + 1, TermWin.fheight - 1,
1393 TermWin.fheight - 2, TermWin.fheight + 2); 1476 TermWin.fheight - 2, TermWin.fheight + 2);
1394 1477
1395 fs = XCreateFontSet (display->display, pat, 1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1396 &missing_charset_list, &missing_charset_count, &def_string); 1479 &missing_charset_list, &missing_charset_count, &def_string);
1397 1480
1398 if (missing_charset_list) 1481 if (missing_charset_list)
1399 XFreeStringList (missing_charset_list); 1482 XFreeStringList (missing_charset_list);
1400 1483
… …
1472} 1555}
1473 1556
1474void 1557void
1475rxvt_term::im_cb () 1558rxvt_term::im_cb ()
1476{ 1559{
1477 int i, found, had_im; 1560 int i;
1478 const char *p; 1561 const char *p;
1479 char **s; 1562 char **s;
1480 char buf[IMBUFSIZ]; 1563 char buf[IMBUFSIZ];
1481 1564
1565 SET_R (this);
1566
1482 im_destroy (); 1567 im_destroy ();
1483 1568
1484 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1569 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1485 if (Input_Context) 1570 if (Input_Context)
1486 return; 1571 return;
… …
1494 if (p && *p) 1579 if (p && *p)
1495 { 1580 {
1496 bool found = false; 1581 bool found = false;
1497 1582
1498 s = rxvt_splitcommastring (p); 1583 s = rxvt_splitcommastring (p);
1584
1499 for (i = 0; s[i]; i++) 1585 for (i = 0; s[i]; i++)
1500 { 1586 {
1501 if (*s[i]) 1587 if (*s[i])
1502 { 1588 {
1503 strcpy (buf, "@im="); 1589 strcpy (buf, "@im=");
… …
1507 found = true; 1593 found = true;
1508 break; 1594 break;
1509 } 1595 }
1510 } 1596 }
1511 } 1597 }
1512 for (i = 0; s[i]; i++) 1598
1513 free (s[i]); 1599 rxvt_freecommastring (s);
1514 free (s);
1515 1600
1516 if (found) 1601 if (found)
1517 goto done; 1602 goto done;
1518 } 1603 }
1519 1604

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines