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.31 by pcg, Fri Feb 13 12:11:05 2004 UTC vs.
Revision 1.40 by pcg, Sun Feb 22 08:09:38 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
… …
90 text_blink_ev (this, &rxvt_term::text_blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
91#endif 92#endif
92#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
94#endif 95#endif
96#ifdef USE_XIM
97 im_ev (this, &rxvt_term::im_cb),
98#endif
95 check_ev (this, &rxvt_term::check_cb), 99 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 100 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 101 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb), 102 incr_ev (this, &rxvt_term::incr_cb)
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
102{ 103{
103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
104} 105}
105 106
106rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
107{ 108{
108 if (cmd_fd >= 0) 109 if (cmd_fd >= 0)
109 close (cmd_fd); 110 close (cmd_fd);
110 111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]);
124
125 // TODO: free pixcolours, colours should become part of rxvt_display
126
127 delete PixColors;
128
129 displays.put (display);
130
111 scr_release (); 131 scr_release ();
112 132
133 free (env_windowid);
134 free (env_display);
135 free (env_term);
136 free (env_colorfgbg);
113 free (locale); 137 free (locale);
114 free (codeset); 138 free (codeset);
115 139
116#ifndef NO_SETOWNER_TTYDEV 140 delete envv;
117 privileged_ttydev (RESTORE); 141 delete argv;
118#endif
119#ifdef UTMP_SUPPORT
120 privileged_utmp (RESTORE);
121#endif
122
123 // TODO: free pixcolours, colours should become part of rxvt_display
124
125 delete PixColors;
126 delete TermWin.fontset;
127
128 displays.put (display);
129} 142}
130 143
131void 144void
132rxvt_term::destroy () 145rxvt_term::destroy ()
133{ 146{
134 if (display) 147 if (display)
135 { 148 {
136 if (TermWin.parent[0])
137 XDestroyWindow (display->display, TermWin.parent[0]);
138
139 rootwin_ev.stop (display); 149 rootwin_ev.stop (display);
140 termwin_ev.stop (display); 150 termwin_ev.stop (display);
141 vt_ev.stop (display); 151 vt_ev.stop (display);
142
143#ifdef USE_XIM 152#ifdef USE_XIM
144 im_destroy (); 153 im_destroy ();
145 im_ev.stop (display); 154 im_ev.stop (display);
146#endif 155#endif
147#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
… …
174 183
175 delete this; 184 delete this;
176} 185}
177 186
178/*----------------------------------------------------------------------*/ 187/*----------------------------------------------------------------------*/
179/* rxvt_init() */ 188/* rxvt_init () */
180/* LIBPROTO */ 189/* LIBPROTO */
181rxvt_t 190rxvt_t
182rxvt_init (int argc, const char *const *argv) 191rxvt_init (int argc, const char *const *argv)
183{ 192{
184 SET_R (new rxvt_term); 193 SET_R (new rxvt_term);
… …
190 } 199 }
191 200
192 return GET_R; 201 return GET_R;
193} 202}
194 203
195static int (*old_xerror_handler)(Display *dpy, XErrorEvent *event); 204static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
196 205
197void 206void
198rxvt_init_signals () 207rxvt_init_signals ()
199{ 208{
200 /* install exit handler for cleanup */ 209 /* install exit handler for cleanup */
201#if 0 210#if 0
202#ifdef HAVE_ATEXIT 211#ifdef HAVE_ATEXIT
203 atexit(rxvt_clean_exit); 212 atexit (rxvt_clean_exit);
204#else 213#else
205#endif 214#endif
206#endif 215#endif
207 216
208 struct sigaction sa; 217 struct sigaction sa;
… …
253 create_windows (argc, argv); 262 create_windows (argc, argv);
254 263
255 init_xlocale (); 264 init_xlocale ();
256 265
257 scr_reset (); /* initialize screen */ 266 scr_reset (); /* initialize screen */
258#ifdef RXVT_GRAPHICS
259 Gr_reset (); /* reset graphics */
260#endif
261 267
262#if 0 268#if 0
263#ifdef DEBUG_X
264 XSynchronize(display->display, True); 269 XSynchronize (display->display, True);
265#endif
266#endif 270#endif
267 271
268#ifdef HAVE_SCROLLBARS 272#ifdef HAVE_SCROLLBARS
269 if (Options & Opt_scrollBar) 273 if (Options & Opt_scrollBar)
270 resize_scrollbar (); /* create and map scrollbar */ 274 resize_scrollbar (); /* create and map scrollbar */
271#endif 275#endif
272#if (MENUBAR_MAX) 276#if (MENUBAR_MAX)
273 if (menubar_visible(r)) 277 if (menubar_visible (r))
274 XMapWindow (display->display, menuBar.win); 278 XMapWindow (display->display, menuBar.win);
275#endif 279#endif
276#ifdef TRANSPARENT 280#ifdef TRANSPARENT
277 if (Options & Opt_transparent) 281 if (Options & Opt_transparent)
278 { 282 {
… …
284 rootwin_ev.start (display, display->root); 288 rootwin_ev.start (display, display->root);
285 289
286 XMapWindow (display->display, TermWin.vt); 290 XMapWindow (display->display, TermWin.vt);
287 XMapWindow (display->display, TermWin.parent[0]); 291 XMapWindow (display->display, TermWin.parent[0]);
288 292
289 init_env ();
290 init_command (cmd_argv); 293 init_command (cmd_argv);
291 294
292 pty_ev.start (cmd_fd, EVENT_READ); 295 pty_ev.start (cmd_fd, EVENT_READ);
293 296
294 check_ev.start (); 297 check_ev.start ();
… …
303 * Catch a SIGCHLD signal and exit if the direct child has died 306 * Catch a SIGCHLD signal and exit if the direct child has died
304 */ 307 */
305/* ARGSUSED */ 308/* ARGSUSED */
306/* EXTPROTO */ 309/* EXTPROTO */
307RETSIGTYPE 310RETSIGTYPE
308rxvt_Child_signal(int sig __attribute__ ((unused))) 311rxvt_Child_signal (int sig __attribute__ ((unused)))
309{ 312{
310 int pid, save_errno = errno; 313 int pid, save_errno = errno;
311 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 314 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
312 ; 315 ;
313 errno = save_errno; 316 errno = save_errno;
… …
321/* 324/*
322 * Catch a fatal signal and tidy up before quitting 325 * Catch a fatal signal and tidy up before quitting
323 */ 326 */
324/* EXTPROTO */ 327/* EXTPROTO */
325RETSIGTYPE 328RETSIGTYPE
326rxvt_Exit_signal(int sig) 329rxvt_Exit_signal (int sig)
327{ 330{
328 signal (sig, SIG_DFL); 331 signal (sig, SIG_DFL);
329#ifdef DEBUG_CMD 332#ifdef DEBUG_CMD
330 rxvt_print_error ("signal %d", sig); 333 rxvt_print_error ("signal %d", sig);
331#endif 334#endif
332 rxvt_clean_exit(); 335 rxvt_clean_exit ();
333 kill (getpid (), sig); 336 kill (getpid (), sig);
334} 337}
335 338
336/* INTPROTO */ 339/* INTPROTO */
337int 340int
… …
365/* ------------------------------------------------------------------------- * 368/* ------------------------------------------------------------------------- *
366 * MEMORY ALLOCATION WRAPPERS * 369 * MEMORY ALLOCATION WRAPPERS *
367 * ------------------------------------------------------------------------- */ 370 * ------------------------------------------------------------------------- */
368/* EXTPROTO */ 371/* EXTPROTO */
369void * 372void *
370rxvt_malloc(size_t size) 373rxvt_malloc (size_t size)
371{ 374{
372 void *p; 375 void *p;
373 376
374 p = malloc(size); 377 p = malloc (size);
375 if (p) 378 if (p)
376 return p; 379 return p;
377 380
378 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 381 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
379 rxvt_clean_exit(); 382 rxvt_clean_exit ();
380 exit(EXIT_FAILURE); 383 exit (EXIT_FAILURE);
381 /* NOTREACHED */ 384 /* NOTREACHED */
382} 385}
383 386
384/* EXTPROTO */ 387/* EXTPROTO */
385void * 388void *
386rxvt_calloc(size_t number, size_t size) 389rxvt_calloc (size_t number, size_t size)
387{ 390{
388 void *p; 391 void *p;
389 392
390 p = calloc(number, size); 393 p = calloc (number, size);
391 if (p) 394 if (p)
392 return p; 395 return p;
393 396
394 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 397 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
395 rxvt_clean_exit(); 398 rxvt_clean_exit ();
396 exit(EXIT_FAILURE); 399 exit (EXIT_FAILURE);
397 /* NOTREACHED */ 400 /* NOTREACHED */
398} 401}
399 402
400/* EXTPROTO */ 403/* EXTPROTO */
401void * 404void *
402rxvt_realloc(void *ptr, size_t size) 405rxvt_realloc (void *ptr, size_t size)
403{ 406{
404 void *p; 407 void *p;
405 408
406 if (ptr) 409 if (ptr)
407 p = realloc(ptr, size); 410 p = realloc (ptr, size);
408 else 411 else
409 p = malloc(size); 412 p = malloc (size);
410 if (p) 413 if (p)
411 return p; 414 return p;
412 415
413 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 416 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
414 rxvt_clean_exit(); 417 rxvt_clean_exit ();
415 exit(EXIT_FAILURE); 418 exit (EXIT_FAILURE);
416 /* NOTREACHED */ 419 /* NOTREACHED */
417} 420}
418 421
419/* ------------------------------------------------------------------------- * 422/* ------------------------------------------------------------------------- *
420 * PRIVILEGED OPERATIONS * 423 * PRIVILEGED OPERATIONS *
… …
423void 426void
424rxvt_term::privileges (int mode) 427rxvt_term::privileges (int mode)
425{ 428{
426#if ! defined(__CYGWIN32__) 429#if ! defined(__CYGWIN32__)
427# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 430# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
428 /* setreuid() is the poor man's setuid(), seteuid() */ 431 /* setreuid () is the poor man's setuid (), seteuid () */
429# define seteuid(a) setreuid(-1, (a)) 432# define seteuid(a) setreuid(-1, (a))
430# define setegid(a) setregid(-1, (a)) 433# define setegid(a) setregid(-1, (a))
431# define HAVE_SETEUID 434# define HAVE_SETEUID
432# endif 435# endif
433# ifdef HAVE_SETEUID 436# ifdef HAVE_SETEUID
… …
436 case IGNORE: 439 case IGNORE:
437 /* 440 /*
438 * change effective uid/gid - not real uid/gid - so we can switch 441 * change effective uid/gid - not real uid/gid - so we can switch
439 * back to root later, as required 442 * back to root later, as required
440 */ 443 */
441 seteuid(getuid()); 444 seteuid (getuid ());
442 setegid(getgid()); 445 setegid (getgid ());
443 break; 446 break;
444 case SAVE: 447 case SAVE:
445 euid = geteuid(); 448 euid = geteuid ();
446 egid = getegid(); 449 egid = getegid ();
447 break; 450 break;
448 case RESTORE: 451 case RESTORE:
449 seteuid(euid); 452 seteuid (euid);
450 setegid(egid); 453 setegid (egid);
451 break; 454 break;
452 } 455 }
453# else 456# else
454 switch (mode) 457 switch (mode)
455 { 458 {
456 case IGNORE: 459 case IGNORE:
457 setuid(getuid()); 460 setuid (getuid ());
458 setgid(getgid()); 461 setgid (getgid ());
459 /* FALLTHROUGH */ 462 /* FALLTHROUGH */
460 case SAVE: 463 case SAVE:
461 /* FALLTHROUGH */ 464 /* FALLTHROUGH */
462 case RESTORE: 465 case RESTORE:
463 break; 466 break;
… …
468 471
469#ifdef UTMP_SUPPORT 472#ifdef UTMP_SUPPORT
470void 473void
471rxvt_term::privileged_utmp (char action) 474rxvt_term::privileged_utmp (char action)
472{ 475{
473 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 476 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
474 action, next_utmp_action, getpid())); 477 action, next_utmp_action, getpid ()));
475 if (next_utmp_action != action || (action != SAVE && action != RESTORE) 478 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
476 || (Options & Opt_utmpInhibit) 479 || (Options & Opt_utmpInhibit)
477 || ttydev == NULL || *ttydev == '\0') 480 || ttydev == NULL || *ttydev == '\0')
478 return; 481 return;
479 482
… …
494 497
495#ifndef NO_SETOWNER_TTYDEV 498#ifndef NO_SETOWNER_TTYDEV
496void 499void
497rxvt_term::privileged_ttydev (char action) 500rxvt_term::privileged_ttydev (char action)
498{ 501{
499 D_MAIN((stderr, 502 D_MAIN ((stderr,
500 "privileged_ttydev (%c); waiting for: %c (pid: %d)", 503 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
501 action, next_tty_action, getpid())); 504 action, next_tty_action, getpid ()));
502 if (next_tty_action != action || (action != SAVE && action != RESTORE) 505 if (next_tty_action != action || (action != SAVE && action != RESTORE)
503 || ttydev == NULL || *ttydev == '\0') 506 || ttydev == NULL || *ttydev == '\0')
504 return; 507 return;
505 508
506 privileges (RESTORE); 509 privileges (RESTORE);
507 510
508 if (action == SAVE) 511 if (action == SAVE)
509 { 512 {
510 next_tty_action = RESTORE; 513 next_tty_action = RESTORE;
511# ifndef RESET_TTY_TO_COMMON_DEFAULTS 514# ifndef RESET_TTY_TO_COMMON_DEFAULTS
512 /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 515 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
513 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ 516 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
514 next_tty_action = IGNORE; 517 next_tty_action = IGNORE;
515 else 518 else
516# endif 519# endif
517 520
518 { 521 {
519 chown(ttydev, getuid(), ttygid); /* fail silently */ 522 chown (ttydev, getuid (), ttygid); /* fail silently */
520 chmod(ttydev, ttymode); 523 chmod (ttydev, ttymode);
521# ifdef HAVE_REVOKE 524# ifdef HAVE_REVOKE
522 revoke(ttydev); 525 revoke (ttydev);
523# endif 526# endif
524 527
525 } 528 }
526 } 529 }
527 else 530 else
528 { /* action == RESTORE */ 531 { /* action == RESTORE */
529 next_tty_action = IGNORE; 532 next_tty_action = IGNORE;
530# ifndef RESET_TTY_TO_COMMON_DEFAULTS 533# ifndef RESET_TTY_TO_COMMON_DEFAULTS
531 chmod(ttydev, ttyfd_stat.st_mode); 534 chmod (ttydev, ttyfd_stat.st_mode);
532 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); 535 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
533# else 536# else
534 chmod(ttydev, 537 chmod (ttydev,
535 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 538 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
536 chown(ttydev, 0, 0); 539 chown (ttydev, 0, 0);
537# endif 540# endif
538 541
539 } 542 }
540 543
541 privileges (IGNORE); 544 privileges (IGNORE);
542 545
543# ifndef RESET_TTY_TO_COMMON_DEFAULTS 546# ifndef RESET_TTY_TO_COMMON_DEFAULTS
544 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 547 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
545 action == RESTORE ? "Restoring" : (action == 548 action == RESTORE ? "Restoring" : (action ==
546 SAVE ? "Saving" : 549 SAVE ? "Saving" :
547 "UNKNOWN ERROR for"), ttydev, 550 "UNKNOWN ERROR for"), ttydev,
548 ttyfd_stat.st_mode, ttyfd_stat.st_uid, 551 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
549 ttyfd_stat.st_gid)); 552 ttyfd_stat.st_gid));
… …
562 short recalc_x, recalc_y; 565 short recalc_x, recalc_y;
563 int x, y, sb_w, mb_h, flags; 566 int x, y, sb_w, mb_h, flags;
564 unsigned int w, h; 567 unsigned int w, h;
565 unsigned int max_width, max_height; 568 unsigned int max_width, max_height;
566 569
567 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 570 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
568 TermWin.ncol, TermWin.nrow, szHint.width, 571 TermWin.ncol, TermWin.nrow, szHint.width,
569 szHint.height)); 572 szHint.height));
570 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 573 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
571 szHint.win_gravity = NorthWestGravity; 574 szHint.win_gravity = NorthWestGravity;
572 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 575 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
… …
575 flags = 0; 578 flags = 0;
576 if (!parsed_geometry) 579 if (!parsed_geometry)
577 { 580 {
578 parsed_geometry = 1; 581 parsed_geometry = 1;
579 if (rs[Rs_geometry]) 582 if (rs[Rs_geometry])
580 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 583 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
581 if (flags & WidthValue) 584 if (flags & WidthValue)
582 { 585 {
583 TermWin.ncol = BOUND_POSITIVE_INT16(w); 586 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
584 szHint.flags |= USSize; 587 szHint.flags |= USSize;
585 } 588 }
586 if (flags & HeightValue) 589 if (flags & HeightValue)
587 { 590 {
588 TermWin.nrow = BOUND_POSITIVE_INT16(h); 591 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
589 szHint.flags |= USSize; 592 szHint.flags |= USSize;
590 } 593 }
591 if (flags & XValue) 594 if (flags & XValue)
592 { 595 {
593 szHint.x = x; 596 szHint.x = x;
… …
622 625
623 sb_w = mb_h = 0; 626 sb_w = mb_h = 0;
624 window_vt_x = window_vt_y = 0; 627 window_vt_x = window_vt_y = 0;
625 if (scrollbar_visible ()) 628 if (scrollbar_visible ())
626 { 629 {
627 sb_w = scrollbar_TotalWidth(); 630 sb_w = scrollbar_TotalWidth ();
628 szHint.base_width += sb_w; 631 szHint.base_width += sb_w;
629 if (!(Options & Opt_scrollBar_right)) 632 if (! (Options & Opt_scrollBar_right))
630 window_vt_x = sb_w; 633 window_vt_x = sb_w;
631 } 634 }
632 if (menubar_visible ()) 635 if (menubar_visible ())
633 { 636 {
634 mb_h = menuBar_TotalHeight(); 637 mb_h = menuBar_TotalHeight ();
635 szHint.base_height += mb_h; 638 szHint.base_height += mb_h;
636 window_vt_y = mb_h; 639 window_vt_y = mb_h;
637 } 640 }
638 szHint.width_inc = TermWin.fwidth; 641 szHint.width_inc = TermWin.fwidth;
639 szHint.height_inc = TermWin.fheight; 642 szHint.height_inc = TermWin.fheight;
… …
645 szHint.width = width; 648 szHint.width = width;
646 TermWin.width = width - szHint.base_width; 649 TermWin.width = width - szHint.base_width;
647 } 650 }
648 else 651 else
649 { 652 {
650 MIN_IT(TermWin.width, max_width); 653 MIN_IT (TermWin.width, max_width);
651 szHint.width = szHint.base_width + TermWin.width; 654 szHint.width = szHint.base_width + TermWin.width;
652 } 655 }
653 if (height && height - szHint.base_height < max_height) 656 if (height && height - szHint.base_height < max_height)
654 { 657 {
655 szHint.height = height; 658 szHint.height = height;
656 TermWin.height = height - szHint.base_height; 659 TermWin.height = height - szHint.base_height;
657 } 660 }
658 else 661 else
659 { 662 {
660 MIN_IT(TermWin.height, max_height); 663 MIN_IT (TermWin.height, max_height);
661 szHint.height = szHint.base_height + TermWin.height; 664 szHint.height = szHint.base_height + TermWin.height;
662 } 665 }
663 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 666 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
664 window_sb_x = szHint.width - sb_w; 667 window_sb_x = szHint.width - sb_w;
665 668
… …
670 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 673 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
671 - szHint.height - 2 * TermWin.ext_bwidth); 674 - szHint.height - 2 * TermWin.ext_bwidth);
672 675
673 TermWin.ncol = TermWin.width / TermWin.fwidth; 676 TermWin.ncol = TermWin.width / TermWin.fwidth;
674 TermWin.nrow = TermWin.height / TermWin.fheight; 677 TermWin.nrow = TermWin.height / TermWin.fheight;
675 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 678 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
676 TermWin.ncol, TermWin.nrow, szHint.width, 679 TermWin.ncol, TermWin.nrow, szHint.width,
677 szHint.height)); 680 szHint.height));
678 return; 681 return;
679} 682}
680 683
… …
696 ws.ws_xpixel = ws.ws_ypixel = 0; 699 ws.ws_xpixel = ws.ws_ypixel = 0;
697#ifndef DEBUG_SIZE 700#ifndef DEBUG_SIZE
698 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 701 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
699#else 702#else
700 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 703 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
701 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 704 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
702# ifdef SIGWINCH 705# ifdef SIGWINCH
703 else if (cmd_pid) /* force through to the command */ 706 else if (cmd_pid) /* force through to the command */
704 kill (cmd_pid, SIGWINCH); 707 kill (cmd_pid, SIGWINCH);
705# endif 708# endif
706#endif 709#endif
707} 710}
708 711
709/*----------------------------------------------------------------------*/ 712/*----------------------------------------------------------------------*/
710/* rxvt_change_font() - Switch to a new font */ 713/* rxvt_change_font () - Switch to a new font */
711/* 714/*
712 * init = 1 - initialize 715 * init = 1 - initialize
713 * 716 *
714 * fontname == FONT_UP - switch to bigger font 717 * fontname == FONT_UP - switch to bigger font
715 * fontname == FONT_DN - switch to smaller font 718 * fontname == FONT_DN - switch to smaller font
… …
727/* xterm sequences - title, iconName, color (exptl) */ 730/* xterm sequences - title, iconName, color (exptl) */
728void 731void
729rxvt_term::set_title (const char *str) 732rxvt_term::set_title (const char *str)
730{ 733{
731#ifndef SMART_WINDOW_TITLE 734#ifndef SMART_WINDOW_TITLE
732 XStoreName(display->display, TermWin.parent[0], str); 735 XStoreName (display->display, TermWin.parent[0], str);
733#else 736#else
734 char *name; 737 char *name;
735 738
736 if (XFetchName(display->display, TermWin.parent[0], &name) == 0) 739 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
737 name = NULL; 740 name = NULL;
738 if (name == NULL || STRCMP(name, str)) 741 if (name == NULL || STRCMP (name, str))
739 XStoreName(display->display, TermWin.parent[0], str); 742 XStoreName (display->display, TermWin.parent[0], str);
740 if (name) 743 if (name)
741 XFree(name); 744 XFree (name);
742#endif 745#endif
743} 746}
744 747
745void 748void
746rxvt_term::set_iconName (const char *str) 749rxvt_term::set_iconName (const char *str)
747{ 750{
748#ifndef SMART_WINDOW_TITLE 751#ifndef SMART_WINDOW_TITLE
749 XSetIconName(display->display, TermWin.parent[0], str); 752 XSetIconName (display->display, TermWin.parent[0], str);
750#else 753#else
751 char *name; 754 char *name;
752 755
753 if (XGetIconName(display->display, TermWin.parent[0], &name)) 756 if (XGetIconName (display->display, TermWin.parent[0], &name))
754 name = NULL; 757 name = NULL;
755 if (name == NULL || STRCMP(name, str)) 758 if (name == NULL || STRCMP (name, str))
756 XSetIconName(display->display, TermWin.parent[0], str); 759 XSetIconName (display->display, TermWin.parent[0], str);
757 if (name) 760 if (name)
758 XFree(name); 761 XFree (name);
759#endif 762#endif
760} 763}
761 764
762#ifdef XTERM_COLOR_CHANGE 765#ifdef XTERM_COLOR_CHANGE
763void 766void
… …
768 771
769 if (color == NULL || *color == '\0') 772 if (color == NULL || *color == '\0')
770 return; 773 return;
771 774
772 /* handle color aliases */ 775 /* handle color aliases */
773 if (isdigit(*color)) 776 if (isdigit (*color))
774 { 777 {
775 i = atoi(color); 778 i = atoi (color);
776 if (i >= 8 && i <= 15) 779 if (i >= 8 && i <= 15)
777 { /* bright colors */ 780 { /* bright colors */
778 i -= 8; 781 i -= 8;
779# ifndef NO_BRIGHTCOLOR 782# ifndef NO_BRIGHTCOLOR
780 PixColors[idx] = PixColors[minBrightCOLOR + i]; 783 PixColors[idx] = PixColors[minBrightCOLOR + i];
781 SET_PIXCOLOR(idx); 784 SET_PIXCOLOR (idx);
782 goto Done; 785 goto Done;
783# endif 786# endif
784 787
785 } 788 }
786 if (i >= 0 && i <= 7) 789 if (i >= 0 && i <= 7)
787 { /* normal colors */ 790 { /* normal colors */
788 PixColors[idx] = PixColors[minCOLOR + i]; 791 PixColors[idx] = PixColors[minCOLOR + i];
789 SET_PIXCOLOR(idx); 792 SET_PIXCOLOR (idx);
790 goto Done; 793 goto Done;
791 } 794 }
792 } 795 }
793 if (!rXParseAllocColor (& xcol, color)) 796 if (!rXParseAllocColor (& xcol, color))
794 return; 797 return;
… …
803 if (PixColors[idx] == PixColors[i]) 806 if (PixColors[idx] == PixColors[i])
804 break; 807 break;
805 if (i > Color_White) 808 if (i > Color_White)
806 { 809 {
807 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 810 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
808 XFreeColors(display->display, XCMAP, (PixColors + idx), 1, 811 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
809 DisplayPlanes(display->display, display->screen)); 812 DisplayPlanes (display->display, display->screen));
810 } 813 }
811# endif 814# endif
812 815
813 PixColors[idx] = xcol; 816 PixColors[idx] = xcol;
814 SET_PIXCOLOR(idx); 817 SET_PIXCOLOR (idx);
815 818
816 /* XSetWindowAttributes attr; */ 819 /* XSetWindowAttributes attr; */
817 /* Cursor cursor; */ 820 /* Cursor cursor; */
818Done: 821Done:
819 if (idx == Color_bg && !(Options & Opt_transparent)) 822 if (idx == Color_bg && ! (Options & Opt_transparent))
820 XSetWindowBackground(display->display, TermWin.vt, 823 XSetWindowBackground (display->display, TermWin.vt,
821 PixColors[Color_bg]); 824 PixColors[Color_bg]);
822 825
823 /* handle Color_BD, scrollbar background, etc. */ 826 /* handle Color_BD, scrollbar background, etc. */
824 827
825 set_colorfgbg (); 828 set_colorfgbg ();
… …
839 rxvt_color xcol[2]; 842 rxvt_color xcol[2];
840 843
841 xcol[0] = PixColors[Color_pointer]; 844 xcol[0] = PixColors[Color_pointer];
842 xcol[1] = PixColors[Color_bg]; 845 xcol[1] = PixColors[Color_bg];
843 XQueryColors (display->display, XCMAP, xcol, 2); 846 XQueryColors (display->display, XCMAP, xcol, 2);
844 XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1])); 847 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
845#endif 848#endif
846} 849}
847 850
848/*----------------------------------------------------------------------*/ 851/*----------------------------------------------------------------------*/
849/* 852/*
… …
852void 855void
853rxvt_term::set_colorfgbg () 856rxvt_term::set_colorfgbg ()
854{ 857{
855 unsigned int i; 858 unsigned int i;
856 const char *xpmb = "\0"; 859 const char *xpmb = "\0";
857 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 860 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
858 861
859 env_colorfgbg = 862 env_colorfgbg =
860 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 863 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
861 STRCPY(fstr, "default"); 864 STRCPY (fstr, "default");
862 STRCPY(bstr, "default"); 865 STRCPY (bstr, "default");
863 for (i = Color_Black; i <= Color_White; i++) 866 for (i = Color_Black; i <= Color_White; i++)
864 if (PixColors[Color_fg] == PixColors[i]) 867 if (PixColors[Color_fg] == PixColors[i])
865 { 868 {
866 sprintf(fstr, "%d", (i - Color_Black)); 869 sprintf (fstr, "%d", (i - Color_Black));
867 break; 870 break;
868 } 871 }
869 for (i = Color_Black; i <= Color_White; i++) 872 for (i = Color_Black; i <= Color_White; i++)
870 if (PixColors[Color_bg] == PixColors[i]) 873 if (PixColors[Color_bg] == PixColors[i])
871 { 874 {
872 sprintf(bstr, "%d", (i - Color_Black)); 875 sprintf (bstr, "%d", (i - Color_Black));
873#ifdef XPM_BACKGROUND 876#ifdef XPM_BACKGROUND
874 xpmb = "default;"; 877 xpmb = "default;";
875#endif 878#endif
876 break; 879 break;
877 } 880 }
881
878 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 882 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
879 putenv(env_colorfgbg);
880 883
881#ifndef NO_BRIGHTCOLOR 884#ifndef NO_BRIGHTCOLOR
882 colorfgbg = DEFAULT_RSTYLE; 885 colorfgbg = DEFAULT_RSTYLE;
883 for (i = minCOLOR; i <= maxCOLOR; i++) 886 for (i = minCOLOR; i <= maxCOLOR; i++)
884 { 887 {
885 if (PixColors[Color_fg] == PixColors[i]) 888 if (PixColors[Color_fg] == PixColors[i])
886 colorfgbg = SET_FGCOLOR(colorfgbg, i); 889 colorfgbg = SET_FGCOLOR (colorfgbg, i);
887 if (PixColors[Color_bg] == PixColors[i]) 890 if (PixColors[Color_bg] == PixColors[i])
888 colorfgbg = SET_BGCOLOR(colorfgbg, i); 891 colorfgbg = SET_BGCOLOR (colorfgbg, i);
889 } 892 }
890#endif 893#endif
891} 894}
892 895
893/*----------------------------------------------------------------------*/ 896/*----------------------------------------------------------------------*/
… …
899int 902int
900rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 903rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
901{ 904{
902 if (!screen_in_out->set (display, colour)) 905 if (!screen_in_out->set (display, colour))
903 { 906 {
904 rxvt_print_error("can't allocate colour: %s", colour); 907 rxvt_print_error ("can't allocate colour: %s", colour);
905 return false; 908 return false;
906 } 909 }
907 910
908 return true; 911 return true;
909} 912}
… …
989 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 992 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
990 993
991 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 994 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
992 window_vt_y, TermWin_TotalWidth (), 995 window_vt_y, TermWin_TotalWidth (),
993 TermWin_TotalHeight ()); 996 TermWin_TotalHeight ());
994#ifdef RXVT_GRAPHICS
995 if (old_height)
996 Gr_Resize (old_width - szHint.base_width,
997 old_height - szHint.base_height);
998#endif
999 scr_clear (); 997 scr_clear ();
1000#ifdef XPM_BACKGROUND 998#ifdef XPM_BACKGROUND
1001 resize_pixmap (); 999 resize_pixmap ();
1002#endif 1000#endif
1003 1001
… …
1015 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1013 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1016 curr_screen = scr_change_screen (PRIMARY); 1014 curr_screen = scr_change_screen (PRIMARY);
1017 TermWin.ncol = ncol; 1015 TermWin.ncol = ncol;
1018 } 1016 }
1019 1017
1020 scr_reset(); 1018 scr_reset ();
1021 1019
1022 if (curr_screen >= 0) /* this is not the first time through */ 1020 if (curr_screen >= 0) /* this is not the first time through */
1023 { 1021 {
1024 scr_change_screen (curr_screen); 1022 scr_change_screen (curr_screen);
1025 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1023 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
… …
1043{ 1041{
1044 XWindowAttributes wattr; 1042 XWindowAttributes wattr;
1045 1043
1046 if (width == 0 || height == 0) 1044 if (width == 0 || height == 0)
1047 { 1045 {
1048 XGetWindowAttributes(display->display, display->root, &wattr); 1046 XGetWindowAttributes (display->display, display->root, &wattr);
1049 if (width == 0) 1047 if (width == 0)
1050 width = wattr.width - szHint.base_width; 1048 width = wattr.width - szHint.base_width;
1051 if (height == 0) 1049 if (height == 0)
1052 height = wattr.height - szHint.base_height; 1050 height = wattr.height - szHint.base_height;
1053 } 1051 }
… …
1067void 1065void
1068rxvt_term::im_set_size (XRectangle *size) 1066rxvt_term::im_set_size (XRectangle *size)
1069{ 1067{
1070 size->x = TermWin.int_bwidth; 1068 size->x = TermWin.int_bwidth;
1071 size->y = TermWin.int_bwidth; 1069 size->y = TermWin.int_bwidth;
1072 size->width = Width2Pixel(TermWin.ncol); 1070 size->width = Width2Pixel (TermWin.ncol);
1073 size->height = Height2Pixel(TermWin.nrow); 1071 size->height = Height2Pixel (TermWin.nrow);
1074} 1072}
1075 1073
1076void 1074void
1077rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1075rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1078{ 1076{
… …
1088 Atom atom; 1086 Atom atom;
1089 Window win; 1087 Window win;
1090 char server[IMBUFSIZ]; 1088 char server[IMBUFSIZ];
1091 1089
1092 /* get current locale modifier */ 1090 /* get current locale modifier */
1093 if ((p = XSetLocaleModifiers(NULL)) != NULL) 1091 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1094 { 1092 {
1095 STRCPY(server, "@server="); 1093 STRCPY (server, "@server=");
1096 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1094 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1097 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1095 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1098 *p = '\0'; 1096 *p = '\0';
1099 1097
1100 atom = XInternAtom(display->display, server, False); 1098 atom = XInternAtom (display->display, server, False);
1101 win = XGetSelectionOwner(display->display, atom); 1099 win = XGetSelectionOwner (display->display, atom);
1102 if (win != None) 1100 if (win != None)
1103 return True; 1101 return True;
1104 } 1102 }
1105 return False; 1103 return False;
1106} 1104}
… …
1110{ 1108{
1111 XPoint spot; 1109 XPoint spot;
1112 XVaNestedList preedit_attr; 1110 XVaNestedList preedit_attr;
1113 1111
1114 if (Input_Context == NULL 1112 if (Input_Context == NULL
1115 || !TermWin.focus || !(input_style & XIMPreeditPosition) 1113 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1116 || !(event_type == KeyPress 1114 || ! (event_type == KeyPress
1117 || event_type == Expose 1115 || event_type == Expose
1118 || event_type == NoExpose 1116 || event_type == NoExpose
1119 || event_type == SelectionNotify 1117 || event_type == SelectionNotify
1120 || event_type == ButtonRelease || event_type == FocusIn) 1118 || event_type == ButtonRelease || event_type == FocusIn)
1121 || !IMisRunning ()) 1119 || !IMisRunning ())
1122 return; 1120 return;
1123 1121
1124 im_set_position (&spot); 1122 im_set_position (&spot);
1125 1123
1126 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1124 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1127 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1125 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1128 XFree(preedit_attr); 1126 XFree (preedit_attr);
1129} 1127}
1130 1128
1131void 1129void
1132rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1130rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1133 XRectangle * needed_rect) 1131 XRectangle * needed_rect)
1134{ 1132{
1135 int mbh, vtx = 0; 1133 int mbh, vtx = 0;
1136 1134
1137 if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) 1135 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1138 vtx = scrollbar_TotalWidth(); 1136 vtx = scrollbar_TotalWidth ();
1139 1137
1140 mbh = menubar_visible () ? menuBar_TotalHeight() : 0; 1138 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1141 mbh -= TermWin.lineSpace; 1139 mbh -= TermWin.lineSpace;
1142 1140
1143 preedit_rect->x = needed_rect->width + vtx; 1141 preedit_rect->x = needed_rect->width + vtx;
1144 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1142 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1145 1143
1146 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; 1144 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1147 preedit_rect->height = Height2Pixel(1); 1145 preedit_rect->height = Height2Pixel (1);
1148 1146
1149 status_rect->x = vtx; 1147 status_rect->x = vtx;
1150 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1148 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1151 1149
1152 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1150 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1153 status_rect->height = Height2Pixel(1); 1151 status_rect->height = Height2Pixel (1);
1154} 1152}
1155 1153
1156void 1154void
1157rxvt_term::im_destroy () 1155rxvt_term::im_destroy ()
1158{ 1156{
… …
1184 const char *p; 1182 const char *p;
1185 char **s; 1183 char **s;
1186 XIMStyles *xim_styles; 1184 XIMStyles *xim_styles;
1187 XVaNestedList preedit_attr, status_attr; 1185 XVaNestedList preedit_attr, status_attr;
1188 1186
1189 if (!((p = XSetLocaleModifiers (modifiers)) && *p)) 1187 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1190 return false; 1188 return false;
1191 1189
1192 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1190 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1193 input_method = display->get_xim (locale, modifiers); 1191 input_method = display->get_xim (locale, modifiers);
1194 if (input_method == NULL) 1192 if (input_method == NULL)
1195 return false; 1193 return false;
1196 1194
1197 xim = input_method->xim; 1195 xim = input_method->xim;
… …
1203 display->put_xim (input_method); 1201 display->put_xim (input_method);
1204 return false; 1202 return false;
1205 } 1203 }
1206 1204
1207 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1205 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1208 s = rxvt_splitcommastring(p); 1206 s = rxvt_splitcommastring (p);
1209 for (i = found = 0; !found && s[i]; i++) 1207 for (i = found = 0; !found && s[i]; i++)
1210 { 1208 {
1211 if (!STRCMP(s[i], "OverTheSpot")) 1209 if (!STRCMP (s[i], "OverTheSpot"))
1212 input_style = (XIMPreeditPosition | XIMStatusNothing); 1210 input_style = (XIMPreeditPosition | XIMStatusNothing);
1213 else if (!STRCMP(s[i], "OffTheSpot")) 1211 else if (!STRCMP (s[i], "OffTheSpot"))
1214 input_style = (XIMPreeditArea | XIMStatusArea); 1212 input_style = (XIMPreeditArea | XIMStatusArea);
1215 else if (!STRCMP(s[i], "Root")) 1213 else if (!STRCMP (s[i], "Root"))
1216 input_style = (XIMPreeditNothing | XIMStatusNothing); 1214 input_style = (XIMPreeditNothing | XIMStatusNothing);
1217 1215
1218 for (j = 0; j < xim_styles->count_styles; j++) 1216 for (j = 0; j < xim_styles->count_styles; j++)
1219 if (input_style == xim_styles->supported_styles[j]) 1217 if (input_style == xim_styles->supported_styles[j])
1220 { 1218 {
… …
1241 { 1239 {
1242 im_set_size (&rect); 1240 im_set_size (&rect);
1243 im_set_position (&spot); 1241 im_set_position (&spot);
1244 im_set_color (&fg, &bg); 1242 im_set_color (&fg, &bg);
1245 1243
1246 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1244 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1247 XNSpotLocation, &spot, 1245 XNSpotLocation, &spot,
1248 XNForeground, fg, XNBackground, bg, 1246 XNForeground, fg, XNBackground, bg,
1249 //XNFontSet, TermWin.fontset, 1247 //XNFontSet, TermWin.fontset,
1250 NULL); 1248 NULL);
1251 } 1249 }
… …
1259 */ 1257 */
1260 needed_rect.width = 0; 1258 needed_rect.width = 0;
1261 1259
1262 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1260 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1263 1261
1264 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1262 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1265 XNForeground, fg, XNBackground, bg, 1263 XNForeground, fg, XNBackground, bg,
1266 //XNFontSet, TermWin.fontset, 1264 //XNFontSet, TermWin.fontset,
1267 NULL); 1265 NULL);
1268 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1266 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1269 XNForeground, fg, XNBackground, bg, 1267 XNForeground, fg, XNBackground, bg,
1270 //XNFontSet, TermWin.fontset, 1268 //XNFontSet, TermWin.fontset,
1271 NULL); 1269 NULL);
1272 } 1270 }
1273 1271
1274 Input_Context = XCreateIC(xim, XNInputStyle, input_style, 1272 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1275 XNClientWindow, TermWin.parent[0], 1273 XNClientWindow, TermWin.parent[0],
1276 XNFocusWindow, TermWin.parent[0], 1274 XNFocusWindow, TermWin.parent[0],
1277 preedit_attr ? XNPreeditAttributes : NULL, 1275 preedit_attr ? XNPreeditAttributes : NULL,
1278 preedit_attr, 1276 preedit_attr,
1279 status_attr ? XNStatusAttributes : NULL, 1277 status_attr ? XNStatusAttributes : NULL,
1280 status_attr, NULL); 1278 status_attr, NULL);
1281 if (preedit_attr) XFree(preedit_attr); 1279 if (preedit_attr) XFree (preedit_attr);
1282 if (status_attr) XFree(status_attr); 1280 if (status_attr) XFree (status_attr);
1283 1281
1284 if (Input_Context == NULL) 1282 if (Input_Context == NULL)
1285 { 1283 {
1286 rxvt_print_error("failed to create input context"); 1284 rxvt_print_error ("failed to create input context");
1287 display->put_xim (input_method); 1285 display->put_xim (input_method);
1288 return false; 1286 return false;
1289 } 1287 }
1290 1288
1291 if (input_style & XIMPreeditArea) 1289 if (input_style & XIMPreeditArea)
1292 IMSetStatusPosition (); 1290 IMSetStatusPosition ();
1293 1291
1294 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1292 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1295 return true; 1293 return true;
1296} 1294}
1297 1295
1298void 1296void
1299rxvt_term::im_cb () 1297rxvt_term::im_cb ()
… …
1303 char **s; 1301 char **s;
1304 char buf[IMBUFSIZ]; 1302 char buf[IMBUFSIZ];
1305 1303
1306 im_destroy (); 1304 im_destroy ();
1307 1305
1308 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1306 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1309 if (Input_Context) 1307 if (Input_Context)
1310 return; 1308 return;
1311 1309
1312#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1310#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1313 if (rs[Rs_imLocale]) 1311 if (rs[Rs_imLocale])
1314 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1312 SET_LOCALE (rs[Rs_imLocale]);
1315#endif 1313#endif
1316 1314
1317 p = rs[Rs_inputMethod]; 1315 p = rs[Rs_inputMethod];
1318 if (p && *p) 1316 if (p && *p)
1319 { 1317 {
… …
1332 break; 1330 break;
1333 } 1331 }
1334 } 1332 }
1335 } 1333 }
1336 for (i = 0; s[i]; i++) 1334 for (i = 0; s[i]; i++)
1337 free(s[i]); 1335 free (s[i]);
1338 free(s); 1336 free (s);
1339 1337
1340 if (found) 1338 if (found)
1341 goto done; 1339 goto done;
1342 } 1340 }
1343 1341
… …
1350 goto done; 1348 goto done;
1351 1349
1352done: 1350done:
1353#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1351#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1354 if (rs[Rs_imLocale]) 1352 if (rs[Rs_imLocale])
1355 setlocale (LC_CTYPE, locale); 1353 SET_LOCALE (locale);
1356#endif 1354#endif
1357} 1355}
1358 1356
1359void 1357void
1360rxvt_term::IMSetStatusPosition () 1358rxvt_term::IMSetStatusPosition ()
1361{ 1359{
1362 XRectangle preedit_rect, status_rect, *needed_rect; 1360 XRectangle preedit_rect, status_rect, *needed_rect;
1363 XVaNestedList preedit_attr, status_attr; 1361 XVaNestedList preedit_attr, status_attr;
1364 1362
1365 if (Input_Context == NULL 1363 if (Input_Context == NULL
1366 || !TermWin.focus || !(input_style & XIMPreeditArea) 1364 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1367 || !IMisRunning ()) 1365 || !IMisRunning ())
1368 return; 1366 return;
1369 1367
1370 /* Getting the necessary width of preedit area */ 1368 /* Getting the necessary width of preedit area */
1371 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1369 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1372 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); 1370 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1373 XFree(status_attr); 1371 XFree (status_attr);
1374 1372
1375 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1373 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1376 1374
1377 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1375 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1378 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1376 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1379 1377
1380 XSetICValues(Input_Context, 1378 XSetICValues (Input_Context,
1381 XNPreeditAttributes, preedit_attr, 1379 XNPreeditAttributes, preedit_attr,
1382 XNStatusAttributes, status_attr, NULL); 1380 XNStatusAttributes, status_attr, NULL);
1383 1381
1384 XFree(preedit_attr); 1382 XFree (preedit_attr);
1385 XFree(status_attr); 1383 XFree (status_attr);
1386} 1384}
1387#endif /* USE_XIM */ 1385#endif /* USE_XIM */
1388 1386
1389/*----------------------------------------------------------------------*/ 1387/*----------------------------------------------------------------------*/
1390rxvt_t rxvt_current_term; 1388rxvt_t rxvt_current_term;

Diff Legend

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