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.13 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.25 by pcg, Sat Jan 31 03:27:45 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.13 2003/12/17 09:00:35 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
42 41
43#ifdef HAVE_TERMIOS_H 42#ifdef HAVE_TERMIOS_H
44# include <termios.h> 43# include <termios.h>
45#endif 44#endif
46 45
46#include <cstring>
47
48static char curlocale[128];
49
50void
51rxvt_set_locale (const char *locale)
52{
53 if (locale && STRNCMP (locale, curlocale, 128))
54 {
55 STRNCPY (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale);
57 }
58}
59
47void * 60void *
48rxvt_term::operator new (size_t s) 61rxvt_term::operator new (size_t s)
49{ 62{
50 void *p = malloc (s); 63 void *p = malloc (s);
51 64
… …
58{ 71{
59 free (p); 72 free (p);
60} 73}
61 74
62rxvt_term::rxvt_term () 75rxvt_term::rxvt_term ()
63: pty_ev (this, &rxvt_term::pty_cb), 76:
64#ifdef CURSOR_BLINK 77#ifdef CURSOR_BLINK
78 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
79#endif
80#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 81 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 82#endif
67#ifdef POINTER_BLANK 83#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 84 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 85#endif
70 x_ev (this, &rxvt_term::x_cb), 86 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb), 87 destroy_ev (this, &rxvt_term::destroy_cb),
88 pty_ev (this, &rxvt_term::pty_cb),
72 check_ev (this, &rxvt_term::check_cb), 89 x_ev (this, &rxvt_term::x_cb),
73 incr_ev (this, &rxvt_term::incr_cb) 90 incr_ev (this, &rxvt_term::incr_cb)
74{ 91{
75 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 92 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
76} 93}
77 94
78rxvt_term::~rxvt_term () 95rxvt_term::~rxvt_term ()
79{ 96{
80 scr_release (); 97 scr_release ();
81 98
99 free (locale);
100 free (codeset);
101
82#ifndef NO_SETOWNER_TTYDEV 102#ifndef NO_SETOWNER_TTYDEV
83 rxvt_privileged_ttydev (this, RESTORE); 103 privileged_ttydev (RESTORE);
84#endif 104#endif
85#ifdef UTMP_SUPPORT 105#ifdef UTMP_SUPPORT
86 rxvt_privileged_utmp (this, RESTORE); 106 privileged_utmp (RESTORE);
87#endif 107#endif
88#ifdef USE_XIM 108#ifdef USE_XIM
89 if (Input_Context != NULL) 109 if (Input_Context != NULL)
90 { 110 {
91 XDestroyIC (Input_Context); 111 XDestroyIC (Input_Context);
… …
107{ 127{
108 check_ev.stop (); 128 check_ev.stop ();
109 pty_ev.stop (); 129 pty_ev.stop ();
110 x_ev.stop (); 130 x_ev.stop ();
111#ifdef CURSOR_BLINK 131#ifdef CURSOR_BLINK
132 cursor_blink_ev.stop ();
133#endif
134#ifdef TEXT_BLINK
112 blink_ev.stop (); 135 text_blink_ev.stop ();
113#endif 136#endif
114#ifdef POINTER_BLANK 137#ifdef POINTER_BLANK
115 pointer_ev.stop (); 138 pointer_ev.stop ();
116#endif 139#endif
117 140
… …
131/* LIBPROTO */ 154/* LIBPROTO */
132rxvt_t 155rxvt_t
133rxvt_init (int argc, const char *const *argv) 156rxvt_init (int argc, const char *const *argv)
134{ 157{
135 SET_R (new rxvt_term); 158 SET_R (new rxvt_term);
136 dR;
137 159
138 if (!R->init_vars () || !R->init (argc, argv)) 160 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
139 { 161 {
140 delete R; 162 delete GET_R;
141 return NULL; 163 SET_R (0);
142 } 164 }
143 165
144 return R; 166 return GET_R;
145} 167}
146 168
147/* EXTPROTO */
148void 169void
149rxvt_init_signals () 170rxvt_init_signals ()
150{ 171{
151/* install exit handler for cleanup */ 172/* install exit handler for cleanup */
152#if 0 173#if 0
… …
175} 196}
176 197
177bool 198bool
178rxvt_term::init (int argc, const char *const *argv) 199rxvt_term::init (int argc, const char *const *argv)
179{ 200{
180 dR;//TODO (scrollbar, setidle)
181
182 /* 201 /*
183 * Save and then give up any super-user privileges 202 * Save and then give up any super-user privileges
184 * If we need privileges in any area then we must specifically request it. 203 * If we need privileges in any area then we must specifically request it.
185 * We should only need to be root in these cases: 204 * We should only need to be root in these cases:
186 * 1. write utmp entries on some systems 205 * 1. write utmp entries on some systems
187 * 2. chown tty on some systems 206 * 2. chown tty on some systems
188 */ 207 */
189 rxvt_privileges (this, SAVE); 208 privileges (SAVE);
190 rxvt_privileges (this, IGNORE); 209 privileges (IGNORE);
191 210
192 rxvt_init_secondary (this); 211 init_secondary ();
193 212
194 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 213 const char **cmd_argv = init_resources (argc, argv);
214
215 set_locale ("");
195 216
196#if (MENUBAR_MAX) 217#if (MENUBAR_MAX)
197 rxvt_menubar_read (this, rs[Rs_menu]); 218 menubar_read (rs[Rs_menu]);
198#endif 219#endif
199#ifdef HAVE_SCROLLBARS 220#ifdef HAVE_SCROLLBARS
200 if (Options & Opt_scrollBar) 221 if (Options & Opt_scrollBar)
201 scrollbar_setIdle (); /* set existence for size calculations */ 222 scrollBar.setIdle (); /* set existence for size calculations */
202#endif 223#endif
203 224
204 rxvt_Create_Windows (this, argc, argv); 225 create_windows (argc, argv);
205 226
206 rxvt_init_xlocale (this); 227 init_xlocale ();
207 228
208 scr_reset (); /* initialize screen */ 229 scr_reset (); /* initialize screen */
209#ifdef RXVT_GRAPHICS 230#ifdef RXVT_GRAPHICS
210 rxvt_Gr_reset (this); /* reset graphics */ 231 Gr_reset (); /* reset graphics */
211#endif 232#endif
212 233
213#if 0 234#if 0
214#ifdef DEBUG_X 235#ifdef DEBUG_X
215 XSynchronize(Xdisplay, True); 236 XSynchronize(Xdisplay, True);
216#endif 237#endif
217#endif 238#endif
218 239
219#ifdef HAVE_SCROLLBARS 240#ifdef HAVE_SCROLLBARS
220 if (Options & Opt_scrollBar) 241 if (Options & Opt_scrollBar)
221 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 242 resize_scrollbar (); /* create and map scrollbar */
222#endif 243#endif
223#if (MENUBAR_MAX) 244#if (MENUBAR_MAX)
224 if (menubar_visible(r)) 245 if (menubar_visible(r))
225 XMapWindow (Xdisplay, menuBar.win); 246 XMapWindow (Xdisplay, menuBar.win);
226#endif 247#endif
227#ifdef TRANSPARENT 248#ifdef TRANSPARENT
228 if (Options & Opt_transparent) 249 if (Options & Opt_transparent)
229 { 250 {
230 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 251 XSelectInput (Xdisplay, Xroot, PropertyChangeMask);
231 rxvt_check_our_parents (this); 252 check_our_parents ();
232 } 253 }
233#endif 254#endif
234 XMapWindow (Xdisplay, TermWin.vt); 255 XMapWindow (Xdisplay, TermWin.vt);
235 XMapWindow (Xdisplay, TermWin.parent[0]); 256 XMapWindow (Xdisplay, TermWin.parent[0]);
236 257
237 rxvt_init_env (this); 258 init_env ();
238 rxvt_init_command (this, cmd_argv); 259 init_command (cmd_argv);
239 260
240 x_ev.start (Xfd, EVENT_READ); 261 x_ev.start (Xfd, EVENT_READ);
241 pty_ev.start (cmd_fd, EVENT_READ); 262 pty_ev.start (cmd_fd, EVENT_READ);
242 263
243 check_ev.start (); 264 check_ev.start ();
… …
262 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 283 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
263 ; 284 ;
264 errno = save_errno; 285 errno = save_errno;
265 286
266#if 0 287#if 0
267 if (pid == R->cmd_pid) 288 if (pid == cmd_pid)
268 exit (EXIT_SUCCESS); 289 exit (EXIT_SUCCESS);
269#endif 290#endif
270} 291}
271 292
272/* 293/*
… …
283 rxvt_clean_exit(); 304 rxvt_clean_exit();
284 kill(getpid(), sig); 305 kill(getpid(), sig);
285} 306}
286 307
287/* ARGSUSED */ 308/* ARGSUSED */
288/* INTPROTO */ 309/* EXTPROTO */
289int 310int
290rxvt_xerror_handler(const Display * display 311rxvt_xerror_handler(const Display * display
291 __attribute__ ((unused)), const XErrorEvent * event) 312 __attribute__ ((unused)), const XErrorEvent * event)
292{ 313{
293 dR;
294
295 if (R->allowedxerror == -1) 314 if (GET_R->allowedxerror == -1)
296 R->allowedxerror = event->error_code; 315 GET_R->allowedxerror = event->error_code;
297 else 316 else
298 { 317 {
299 rxvt_print_error("XError: Request: %d . %d, Error: %d", 318 rxvt_print_error("XError: Request: %d . %d, Error: %d",
300 event->request_code, event->minor_code, 319 event->request_code, event->minor_code,
301 event->error_code); 320 event->error_code);
302 321
303 R->destroy (); 322 GET_R->destroy ();
304 } 323 }
305 324
306 return 0; 325 return 0;
307} 326}
308 327
… …
313 */ 332 */
314/* EXTPROTO */ 333/* EXTPROTO */
315void 334void
316rxvt_clean_exit () 335rxvt_clean_exit ()
317{ 336{
318 dR;
319
320 R->destroy (); 337 GET_R->destroy ();
321} 338}
322 339
323/* ------------------------------------------------------------------------- * 340/* ------------------------------------------------------------------------- *
324 * MEMORY ALLOCATION WRAPPERS * 341 * MEMORY ALLOCATION WRAPPERS *
325 * ------------------------------------------------------------------------- */ 342 * ------------------------------------------------------------------------- */
… …
376 393
377/* ------------------------------------------------------------------------- * 394/* ------------------------------------------------------------------------- *
378 * PRIVILEGED OPERATIONS * 395 * PRIVILEGED OPERATIONS *
379 * ------------------------------------------------------------------------- */ 396 * ------------------------------------------------------------------------- */
380/* take care of suid/sgid super-user (root) privileges */ 397/* take care of suid/sgid super-user (root) privileges */
381/* INTPROTO */
382void 398void
383rxvt_privileges(pR_ int mode) 399rxvt_term::privileges (int mode)
384{ 400{
385#if ! defined(__CYGWIN32__) 401#if ! defined(__CYGWIN32__)
386# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 402# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
387/* setreuid() is the poor man's setuid(), seteuid() */ 403/* setreuid() is the poor man's setuid(), seteuid() */
388# define seteuid(a) setreuid(-1, (a)) 404# define seteuid(a) setreuid(-1, (a))
… …
398 */ 414 */
399 seteuid(getuid()); 415 seteuid(getuid());
400 setegid(getgid()); 416 setegid(getgid());
401 break; 417 break;
402 case SAVE: 418 case SAVE:
403 R->euid = geteuid(); 419 euid = geteuid();
404 R->egid = getegid(); 420 egid = getegid();
405 break; 421 break;
406 case RESTORE: 422 case RESTORE:
407 seteuid(R->euid); 423 seteuid(euid);
408 setegid(R->egid); 424 setegid(egid);
409 break; 425 break;
410 } 426 }
411# else 427# else
412 switch (mode) { 428 switch (mode) {
413 case IGNORE: 429 case IGNORE:
… …
422# endif 438# endif
423#endif 439#endif
424} 440}
425 441
426#ifdef UTMP_SUPPORT 442#ifdef UTMP_SUPPORT
427/* EXTPROTO */
428void 443void
429rxvt_privileged_utmp(pR_ char action) 444rxvt_term::privileged_utmp (char action)
430{ 445{
431 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 446 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)",
432 action, R->next_utmp_action, getpid())); 447 action, next_utmp_action, getpid()));
433 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 448 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
434 || (R->Options & Opt_utmpInhibit) 449 || (Options & Opt_utmpInhibit)
435 || R->ttydev == NULL || *R->ttydev == '\0') 450 || ttydev == NULL || *ttydev == '\0')
436 return; 451 return;
437 452
438 rxvt_privileges(aR_ RESTORE); 453 privileges (RESTORE);
439 if (action == SAVE) { 454 if (action == SAVE) {
440 R->next_utmp_action = RESTORE; 455 next_utmp_action = RESTORE;
441 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 456 makeutent (ttydev, rs[Rs_display_name]);
442 } else { /* action == RESTORE */ 457 } else { /* action == RESTORE */
443 R->next_utmp_action = IGNORE; 458 next_utmp_action = IGNORE;
444 rxvt_cleanutent(aR); 459 cleanutent ();
445 } 460 }
446 rxvt_privileges(aR_ IGNORE); 461 privileges (IGNORE);
447} 462}
448#endif 463#endif
449 464
450#ifndef NO_SETOWNER_TTYDEV 465#ifndef NO_SETOWNER_TTYDEV
451/* EXTPROTO */
452void 466void
453rxvt_privileged_ttydev(pR_ char action) 467rxvt_term::privileged_ttydev (char action)
454{ 468{
455 D_MAIN((stderr, 469 D_MAIN((stderr,
456 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 470 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
457 action, R->next_tty_action, getpid())); 471 action, next_tty_action, getpid()));
458 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 472 if (next_tty_action != action || (action != SAVE && action != RESTORE)
459 || R->ttydev == NULL || *R->ttydev == '\0') 473 || ttydev == NULL || *ttydev == '\0')
460 return; 474 return;
461 475
462 rxvt_privileges(aR_ RESTORE); 476 privileges (RESTORE);
463 477
464 if (action == SAVE) { 478 if (action == SAVE) {
465 R->next_tty_action = RESTORE; 479 next_tty_action = RESTORE;
466# ifndef RESET_TTY_TO_COMMON_DEFAULTS 480# ifndef RESET_TTY_TO_COMMON_DEFAULTS
467/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 481/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */
468 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 482 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */
469 R->next_tty_action = IGNORE; 483 next_tty_action = IGNORE;
470 else 484 else
471# endif 485# endif
472 { 486 {
473 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 487 chown(ttydev, getuid(), ttygid); /* fail silently */
474 chmod(R->ttydev, R->ttymode); 488 chmod(ttydev, ttymode);
475# ifdef HAVE_REVOKE 489# ifdef HAVE_REVOKE
476 revoke(R->ttydev); 490 revoke(ttydev);
477# endif 491# endif
478 } 492 }
479 } else { /* action == RESTORE */ 493 } else { /* action == RESTORE */
480 R->next_tty_action = IGNORE; 494 next_tty_action = IGNORE;
481# ifndef RESET_TTY_TO_COMMON_DEFAULTS 495# ifndef RESET_TTY_TO_COMMON_DEFAULTS
482 chmod(R->ttydev, R->ttyfd_stat.st_mode); 496 chmod(ttydev, ttyfd_stat.st_mode);
483 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 497 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
484# else 498# else
485 chmod(R->ttydev, 499 chmod(ttydev,
486 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 500 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
487 chown(R->ttydev, 0, 0); 501 chown(ttydev, 0, 0);
488# endif 502# endif
489 } 503 }
490 504
491 rxvt_privileges(aR_ IGNORE); 505 privileges (IGNORE);
492 506
493# ifndef RESET_TTY_TO_COMMON_DEFAULTS 507# ifndef RESET_TTY_TO_COMMON_DEFAULTS
494 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 508 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
495 action == RESTORE ? "Restoring" : (action == 509 action == RESTORE ? "Restoring" : (action ==
496 SAVE ? "Saving" : 510 SAVE ? "Saving" :
497 "UNKNOWN ERROR for"), R->ttydev, 511 "UNKNOWN ERROR for"), ttydev,
498 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 512 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
499 R->ttyfd_stat.st_gid)); 513 ttyfd_stat.st_gid));
500# endif 514# endif
501} 515}
502#endif 516#endif
503 517
504/*----------------------------------------------------------------------*/ 518/*----------------------------------------------------------------------*/
505/* 519/*
506 * window size/position calculcations for XSizeHint and other storage. 520 * window size/position calculcations for XSizeHint and other storage.
507 * if width/height are non-zero then override calculated width/height 521 * if width/height are non-zero then override calculated width/height
508 */ 522 */
509/* EXTPROTO */
510void 523void
511rxvt_window_calc(pR_ unsigned int width, unsigned int height) 524rxvt_term::window_calc (unsigned int width, unsigned int height)
512{ 525{
513 short recalc_x, recalc_y; 526 short recalc_x, recalc_y;
514 int x, y, sb_w, mb_h, flags; 527 int x, y, sb_w, mb_h, flags;
515 unsigned int w, h; 528 unsigned int w, h;
516 unsigned int max_width, max_height; 529 unsigned int max_width, max_height;
517 530
518 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 531 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
519 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 532 TermWin.ncol, TermWin.nrow, szHint.width,
520 R->szHint.height)); 533 szHint.height));
521 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
522 R->szHint.win_gravity = NorthWestGravity; 535 szHint.win_gravity = NorthWestGravity;
523/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 536/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
524 537
525 recalc_x = recalc_y = 0; 538 recalc_x = recalc_y = 0;
526 flags = 0; 539 flags = 0;
527 if (!R->parsed_geometry) { 540 if (!parsed_geometry) {
528 R->parsed_geometry = 1; 541 parsed_geometry = 1;
529 if (R->rs[Rs_geometry]) 542 if (rs[Rs_geometry])
530 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 543 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
531 if (flags & WidthValue) { 544 if (flags & WidthValue) {
532 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 545 TermWin.ncol = BOUND_POSITIVE_INT16(w);
533 R->szHint.flags |= USSize; 546 szHint.flags |= USSize;
534 } 547 }
535 if (flags & HeightValue) { 548 if (flags & HeightValue) {
536 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 549 TermWin.nrow = BOUND_POSITIVE_INT16(h);
537 R->szHint.flags |= USSize; 550 szHint.flags |= USSize;
538 } 551 }
539 if (flags & XValue) { 552 if (flags & XValue) {
540 R->szHint.x = x; 553 szHint.x = x;
541 R->szHint.flags |= USPosition; 554 szHint.flags |= USPosition;
542 if (flags & XNegative) { 555 if (flags & XNegative) {
543 recalc_x = 1; 556 recalc_x = 1;
544 R->szHint.win_gravity = NorthEastGravity; 557 szHint.win_gravity = NorthEastGravity;
545 } 558 }
546 } 559 }
547 if (flags & YValue) { 560 if (flags & YValue) {
548 R->szHint.y = y; 561 szHint.y = y;
549 R->szHint.flags |= USPosition; 562 szHint.flags |= USPosition;
550 if (flags & YNegative) { 563 if (flags & YNegative) {
551 recalc_y = 1; 564 recalc_y = 1;
552 if (R->szHint.win_gravity == NorthEastGravity) 565 if (szHint.win_gravity == NorthEastGravity)
553 R->szHint.win_gravity = SouthEastGravity; 566 szHint.win_gravity = SouthEastGravity;
554 else 567 else
555 R->szHint.win_gravity = SouthWestGravity; 568 szHint.win_gravity = SouthWestGravity;
556 } 569 }
557 } 570 }
558 } 571 }
559/* TODO: BOUNDS */ 572/* TODO: BOUNDS */
560 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 573 TermWin.width = TermWin.ncol * TermWin.fwidth;
561 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 574 TermWin.height = TermWin.nrow * TermWin.fheight;
562 max_width = MAX_COLS * R->TermWin.fwidth; 575 max_width = MAX_COLS * TermWin.fwidth;
563 max_height = MAX_ROWS * R->TermWin.fheight; 576 max_height = MAX_ROWS * TermWin.fheight;
564 577
565 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 578 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
566 579
567 sb_w = mb_h = 0; 580 sb_w = mb_h = 0;
568 R->window_vt_x = R->window_vt_y = 0; 581 window_vt_x = window_vt_y = 0;
569 if (scrollbar_visible(R)) { 582 if (scrollbar_visible ()) {
570 sb_w = scrollbar_TotalWidth(); 583 sb_w = scrollbar_TotalWidth();
571 R->szHint.base_width += sb_w; 584 szHint.base_width += sb_w;
572 if (!(R->Options & Opt_scrollBar_right)) 585 if (!(Options & Opt_scrollBar_right))
573 R->window_vt_x = sb_w; 586 window_vt_x = sb_w;
574 } 587 }
575 if (menubar_visible(R)) { 588 if (menubar_visible ()) {
576 mb_h = menuBar_TotalHeight(); 589 mb_h = menuBar_TotalHeight();
577 R->szHint.base_height += mb_h; 590 szHint.base_height += mb_h;
578 R->window_vt_y = mb_h; 591 window_vt_y = mb_h;
579 } 592 }
580 R->szHint.width_inc = R->TermWin.fwidth; 593 szHint.width_inc = TermWin.fwidth;
581 R->szHint.height_inc = R->TermWin.fheight; 594 szHint.height_inc = TermWin.fheight;
582 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 595 szHint.min_width = szHint.base_width + szHint.width_inc;
583 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 596 szHint.min_height = szHint.base_height + szHint.height_inc;
584 597
585 if (width && width - R->szHint.base_width < max_width) { 598 if (width && width - szHint.base_width < max_width) {
586 R->szHint.width = width; 599 szHint.width = width;
587 R->TermWin.width = width - R->szHint.base_width; 600 TermWin.width = width - szHint.base_width;
588 } else { 601 } else {
589 MIN_IT(R->TermWin.width, max_width); 602 MIN_IT(TermWin.width, max_width);
590 R->szHint.width = R->szHint.base_width + R->TermWin.width; 603 szHint.width = szHint.base_width + TermWin.width;
591 } 604 }
592 if (height && height - R->szHint.base_height < max_height) { 605 if (height && height - szHint.base_height < max_height) {
593 R->szHint.height = height; 606 szHint.height = height;
594 R->TermWin.height = height - R->szHint.base_height; 607 TermWin.height = height - szHint.base_height;
595 } else { 608 } else {
596 MIN_IT(R->TermWin.height, max_height); 609 MIN_IT(TermWin.height, max_height);
597 R->szHint.height = R->szHint.base_height + R->TermWin.height; 610 szHint.height = szHint.base_height + TermWin.height;
598 } 611 }
599 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 612 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
600 R->window_sb_x = R->szHint.width - sb_w; 613 window_sb_x = szHint.width - sb_w;
601 614
602 if (recalc_x) 615 if (recalc_x)
603 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 616 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
604 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 617 - szHint.width - 2 * TermWin.ext_bwidth);
605 if (recalc_y) 618 if (recalc_y)
606 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 619 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay))
607 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 620 - szHint.height - 2 * TermWin.ext_bwidth);
608 621
609 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 622 TermWin.ncol = TermWin.width / TermWin.fwidth;
610 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 623 TermWin.nrow = TermWin.height / TermWin.fheight;
611 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 624 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
612 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 625 TermWin.ncol, TermWin.nrow, szHint.width,
613 R->szHint.height)); 626 szHint.height));
614 return; 627 return;
615} 628}
616 629
617/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
618/* 631/*
… …
620 * Called after a window size change. 633 * Called after a window size change.
621 */ 634 */
622void 635void
623rxvt_term::tt_winch () 636rxvt_term::tt_winch ()
624{ 637{
625 struct winsize ws; 638 struct winsize ws;
626 639
627 if (cmd_fd < 0) 640 if (cmd_fd < 0)
628 return; 641 return;
629 642
630 ws.ws_col = TermWin.ncol; 643 ws.ws_col = TermWin.ncol;
… …
648 * init = 1 - initialize 661 * init = 1 - initialize
649 * 662 *
650 * fontname == FONT_UP - switch to bigger font 663 * fontname == FONT_UP - switch to bigger font
651 * fontname == FONT_DN - switch to smaller font 664 * fontname == FONT_DN - switch to smaller font
652 */ 665 */
653/* EXTPROTO */
654void 666void
655rxvt_change_font(pR_ int init, const char *fontname) 667rxvt_term::change_font (int init, const char *fontname)
656{ 668{
657} 669}
658 670
659/* INTPROTO */
660void 671void
661rxvt_font_up_down(pR_ int n, int direction) 672rxvt_term::font_up_down (int n, int direction)
662{ 673{
663} 674}
664 675
665/*----------------------------------------------------------------------*/ 676/*----------------------------------------------------------------------*/
666/*----------------------------------------------------------------------*/ 677/*----------------------------------------------------------------------*/
667/* xterm sequences - title, iconName, color (exptl) */ 678/* xterm sequences - title, iconName, color (exptl) */
668/* EXTPROTO */
669void 679void
670rxvt_set_title(pR_ const char *str) 680rxvt_term::set_title (const char *str)
671{ 681{
672#ifndef SMART_WINDOW_TITLE 682#ifndef SMART_WINDOW_TITLE
673 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 683 XStoreName(Xdisplay, TermWin.parent[0], str);
674#else 684#else
675 char *name; 685 char *name;
676 686
677 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 687 if (XFetchName(Xdisplay, TermWin.parent[0], &name) == 0)
678 name = NULL; 688 name = NULL;
679 if (name == NULL || STRCMP(name, str)) 689 if (name == NULL || STRCMP(name, str))
680 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 690 XStoreName(Xdisplay, TermWin.parent[0], str);
681 if (name) 691 if (name)
682 XFree(name); 692 XFree(name);
683#endif 693#endif
684} 694}
685 695
686/* EXTPROTO */
687void 696void
688rxvt_set_iconName(pR_ const char *str) 697rxvt_term::set_iconName (const char *str)
689{ 698{
690#ifndef SMART_WINDOW_TITLE 699#ifndef SMART_WINDOW_TITLE
691 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 700 XSetIconName(Xdisplay, TermWin.parent[0], str);
692#else 701#else
693 char *name; 702 char *name;
694 703
695 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 704 if (XGetIconName(Xdisplay, TermWin.parent[0], &name))
696 name = NULL; 705 name = NULL;
697 if (name == NULL || STRCMP(name, str)) 706 if (name == NULL || STRCMP(name, str))
698 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 707 XSetIconName(Xdisplay, TermWin.parent[0], str);
699 if (name) 708 if (name)
700 XFree(name); 709 XFree(name);
701#endif 710#endif
702} 711}
703 712
704#ifdef XTERM_COLOR_CHANGE 713#ifdef XTERM_COLOR_CHANGE
705/* EXTPROTO */
706void 714void
707rxvt_set_window_color(pR_ int idx, const char *color) 715rxvt_term::set_window_color (int idx, const char *color)
708{ 716{
709 rxvt_color xcol; 717 rxvt_color xcol;
710 int i; 718 int i;
711 719
712 if (color == NULL || *color == '\0') 720 if (color == NULL || *color == '\0')
… …
716 if (isdigit(*color)) { 724 if (isdigit(*color)) {
717 i = atoi(color); 725 i = atoi(color);
718 if (i >= 8 && i <= 15) { /* bright colors */ 726 if (i >= 8 && i <= 15) { /* bright colors */
719 i -= 8; 727 i -= 8;
720# ifndef NO_BRIGHTCOLOR 728# ifndef NO_BRIGHTCOLOR
721 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 729 PixColors[idx] = PixColors[minBrightCOLOR + i];
722 SET_PIXCOLOR(R, idx); 730 SET_PIXCOLOR(idx);
723 goto Done; 731 goto Done;
724# endif 732# endif
725 } 733 }
726 if (i >= 0 && i <= 7) { /* normal colors */ 734 if (i >= 0 && i <= 7) { /* normal colors */
727 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 735 PixColors[idx] = PixColors[minCOLOR + i];
728 SET_PIXCOLOR(R, idx); 736 SET_PIXCOLOR(idx);
729 goto Done; 737 goto Done;
730 } 738 }
731 } 739 }
732 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 740 if (!rXParseAllocColor (& xcol, color))
733 return; 741 return;
734/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 742/* XStoreColor (Xdisplay, XCMAP, XColor*); */
735 743
736/* 744/*
737 * FIXME: should free colors here, but no idea how to do it so instead, 745 * FIXME: should free colors here, but no idea how to do it so instead,
738 * so just keep gobbling up the colormap 746 * so just keep gobbling up the colormap
739 */ 747 */
740# if 0 748# if 0
741 for (i = Color_Black; i <= Color_White; i++) 749 for (i = Color_Black; i <= Color_White; i++)
742 if (R->PixColors[idx] == R->PixColors[i]) 750 if (PixColors[idx] == PixColors[i])
743 break; 751 break;
744 if (i > Color_White) { 752 if (i > Color_White) {
745 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 753 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
746 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 754 XFreeColors(Xdisplay, XCMAP, (PixColors + idx), 1,
747 DisplayPlanes(R->Xdisplay, Xscreen)); 755 DisplayPlanes(Xdisplay, Xscreen));
748 } 756 }
749# endif 757# endif
750 758
751 R->PixColors[idx] = xcol; 759 PixColors[idx] = xcol;
752 SET_PIXCOLOR(R, idx); 760 SET_PIXCOLOR(idx);
753 761
754/* XSetWindowAttributes attr; */ 762/* XSetWindowAttributes attr; */
755/* Cursor cursor; */ 763/* Cursor cursor; */
756 Done: 764 Done:
757 if (idx == Color_bg && !(R->Options & Opt_transparent)) 765 if (idx == Color_bg && !(Options & Opt_transparent))
758 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 766 XSetWindowBackground(Xdisplay, TermWin.vt,
759 R->PixColors[Color_bg]); 767 PixColors[Color_bg]);
760 768
761/* handle Color_BD, scrollbar background, etc. */ 769/* handle Color_BD, scrollbar background, etc. */
762 770
763 rxvt_set_colorfgbg(aR); 771 set_colorfgbg ();
764 rxvt_recolour_cursor(aR); 772 recolour_cursor ();
765/* the only reasonable way to enforce a clean update */ 773/* the only reasonable way to enforce a clean update */
766 rxvt_scr_poweron(aR); 774 scr_poweron ();
767} 775}
768 776
769#else 777#else
770# define rxvt_set_window_color(aR_ idx,color) ((void)0) 778# define set_window_color (idx,color) ((void)0)
771#endif /* XTERM_COLOR_CHANGE */ 779#endif /* XTERM_COLOR_CHANGE */
772 780
773/* EXTPROTO */
774void 781void
775rxvt_recolour_cursor(pR) 782rxvt_term::recolour_cursor ()
776{ 783{
777 rxvt_color xcol[2];
778
779#if TODO 784#if TODO
785 rxvt_color xcol[2];
786
780 xcol[0] = R->PixColors[Color_pointer]; 787 xcol[0] = PixColors[Color_pointer];
781 xcol[1] = R->PixColors[Color_bg]; 788 xcol[1] = PixColors[Color_bg];
782 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 789 XQueryColors (Xdisplay, XCMAP, xcol, 2);
783 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 790 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
784#endif 791#endif
785} 792}
786 793
787/*----------------------------------------------------------------------*/ 794/*----------------------------------------------------------------------*/
788/* 795/*
789 * find if fg/bg matches any of the normal (low-intensity) colors 796 * find if fg/bg matches any of the normal (low-intensity) colors
790 */ 797 */
791/* INTPROTO */
792void 798void
793rxvt_set_colorfgbg(pR) 799rxvt_term::set_colorfgbg ()
794{ 800{
795 unsigned int i; 801 unsigned int i;
796 const char *xpmb = "\0"; 802 const char *xpmb = "\0";
797 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 803 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1];
798 804
799 R->env_colorfgbg = 805 env_colorfgbg =
800 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 806 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1);
801 STRCPY(fstr, "default"); 807 STRCPY(fstr, "default");
802 STRCPY(bstr, "default"); 808 STRCPY(bstr, "default");
803 for (i = Color_Black; i <= Color_White; i++) 809 for (i = Color_Black; i <= Color_White; i++)
804 if (R->PixColors[Color_fg] == R->PixColors[i]) { 810 if (PixColors[Color_fg] == PixColors[i]) {
805 sprintf(fstr, "%d", (i - Color_Black)); 811 sprintf(fstr, "%d", (i - Color_Black));
806 break; 812 break;
807 } 813 }
808 for (i = Color_Black; i <= Color_White; i++) 814 for (i = Color_Black; i <= Color_White; i++)
809 if (R->PixColors[Color_bg] == R->PixColors[i]) { 815 if (PixColors[Color_bg] == PixColors[i]) {
810 sprintf(bstr, "%d", (i - Color_Black)); 816 sprintf(bstr, "%d", (i - Color_Black));
811#ifdef XPM_BACKGROUND 817#ifdef XPM_BACKGROUND
812 xpmb = "default;"; 818 xpmb = "default;";
813#endif 819#endif
814 break; 820 break;
815 } 821 }
816 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 822 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
817 putenv(R->env_colorfgbg); 823 putenv(env_colorfgbg);
818 824
819#ifndef NO_BRIGHTCOLOR 825#ifndef NO_BRIGHTCOLOR
820 R->colorfgbg = DEFAULT_RSTYLE; 826 colorfgbg = DEFAULT_RSTYLE;
821 for (i = minCOLOR; i <= maxCOLOR; i++) { 827 for (i = minCOLOR; i <= maxCOLOR; i++) {
822 if (R->PixColors[Color_fg] == R->PixColors[i]) 828 if (PixColors[Color_fg] == PixColors[i])
823 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 829 colorfgbg = SET_FGCOLOR(colorfgbg, i);
824 if (R->PixColors[Color_bg] == R->PixColors[i]) 830 if (PixColors[Color_bg] == PixColors[i])
825 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 831 colorfgbg = SET_BGCOLOR(colorfgbg, i);
826 } 832 }
827#endif 833#endif
828} 834}
829 835
830/*----------------------------------------------------------------------*/ 836/*----------------------------------------------------------------------*/
831/* 837/*
832 * Colour determination for low colour displays, routine from 838 * Colour determination for low colour displays, routine from
833 * Hans de Goede <hans@highrise.nl> 839 * Hans de Goede <hans@highrise.nl>
834 */ 840 */
835 841
836/* EXTPROTO */
837int 842int
838rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 843rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
839{ 844{
840 screen_in_out->set(aR_ colour);
841
842 if (!screen_in_out->set(aR_ colour)) { 845 if (!screen_in_out->set (this, colour)) {
843 rxvt_print_error("can't allocate colour: %s", colour); 846 rxvt_print_error("can't allocate colour: %s", colour);
844 return false; 847 return false;
845 } 848 }
846 849
847 return true; 850 return true;
848} 851}
849 852
850/* -------------------------------------------------------------------- * 853/* -------------------------------------------------------------------- *
851 * - WINDOW RESIZING - * 854 * - WINDOW RESIZING - *
852 * -------------------------------------------------------------------- */ 855 * -------------------------------------------------------------------- */
853/* EXTPROTO */
854void 856void
855rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 857rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
856 int ignoreparent)
857{ 858{
858 int fix_screen; 859 int fix_screen;
859 860
860#ifdef SMART_RESIZE 861#ifdef SMART_RESIZE
861 int old_width = R->szHint.width, old_height = R->szHint.height; 862 int old_width = szHint.width, old_height = szHint.height;
862#endif 863#endif
863 864
864 rxvt_window_calc(aR_ width, height); 865 window_calc (width, height);
865 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 866 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint);
866 if (!ignoreparent) { 867 if (!ignoreparent)
868 {
867#ifdef SMART_RESIZE 869#ifdef SMART_RESIZE
868/* 870 /*
869 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 871 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
870 * reposition window on resize depending on placement on screen 872 * reposition window on resize depending on placement on screen
871 */ 873 */
872 int x, y, x1, y1; 874 int x, y, x1, y1;
873 int dx, dy; 875 int dx, dy;
874 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 876 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
875 Window unused_cr; 877 Window unused_cr;
876 878
877 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 879 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot,
878 0, 0, &x, &y, &unused_cr); 880 0, 0, &x, &y, &unused_cr);
879 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 881 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1,
880 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 882 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
881 /* 883 /*
882 * if Xroot isn't the parent window, a WM will probably have offset 884 * if Xroot isn't the parent window, a WM will probably have offset
883 * our position for handles and decorations. Counter it 885 * our position for handles and decorations. Counter it
884 */ 886 */
885 if (x1 != x || y1 != y) { 887 if (x1 != x || y1 != y) {
886 x -= x1; 888 x -= x1;
887 y -= y1; 889 y -= y1;
890 }
891
892 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2;
893 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2;
894 dx = old_width - szHint.width;
895 dy = old_height - szHint.height;
896
897 /* Check position of the center of the window */
898 if (x < x1) /* left half */
899 dx = 0;
900 else if (x == x1) /* exact center */
901 dx /= 2;
902 if (y < y1) /* top half */
903 dy = 0;
904 else if (y == y1) /* exact center */
905 dy /= 2;
906
907 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy,
908 szHint.width, szHint.height);
909#else
910 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width,
911 szHint.height);
912#endif
913 }
914
915 fix_screen = (TermWin.ncol != prev_ncol
916 || TermWin.nrow != prev_nrow);
917
918 if (fix_screen || width != old_width || height != old_height)
919 {
920 if (scrollbar_visible ())
921 {
922 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x,
923 0, scrollbar_TotalWidth (), szHint.height);
924 resize_scrollbar ();
888 } 925 }
889 926
890 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 927 if (menubar_visible ())
891 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 928 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
892 dx = old_width - R->szHint.width; 929 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
893 dy = old_height - R->szHint.height;
894 930
895 /* Check position of the center of the window */ 931 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
896 if (x < x1) /* left half */ 932 window_vt_y, TermWin_TotalWidth (),
897 dx = 0; 933 TermWin_TotalHeight ());
898 else if (x == x1) /* exact center */ 934#ifdef RXVT_GRAPHICS
899 dx /= 2; 935 if (old_height)
900 if (y < y1) /* top half */ 936 Gr_Resize (old_width - szHint.base_width,
901 dy = 0;
902 else if (y == y1) /* exact center */
903 dy /= 2;
904
905 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy,
906 R->szHint.width, R->szHint.height);
907#else
908 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width,
909 R->szHint.height); 937 old_height - szHint.base_height);
910#endif 938#endif
939 scr_clear ();
940#ifdef XPM_BACKGROUND
941 resize_pixmap ();
942#endif
943 }
944
945 if (fix_screen || old_height == 0)
911 } 946 {
947 int curr_screen = -1;
948 int old_ncol = prev_ncol;
912 949
913 fix_screen = (R->TermWin.ncol != R->prev_ncol 950 /* scr_reset only works on the primary screen */
914 || R->TermWin.nrow != R->prev_nrow); 951 if (old_height) /* this is not the first time through */
915 if (fix_screen || width != R->old_width || height != R->old_height) { 952 {
916 if (scrollbar_visible(R)) { 953 unsigned int ncol = TermWin.ncol;
917 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 954 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
918 0, scrollbar_TotalWidth(), R->szHint.height); 955 curr_screen = scr_change_screen (PRIMARY);
919 rxvt_Resize_scrollBar(aR); 956 TermWin.ncol = ncol;
920 } 957 }
921 if (menubar_visible(R))
922 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x,
923 0, TermWin_TotalWidth(), menuBar_TotalHeight());
924 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x,
925 R->window_vt_y, TermWin_TotalWidth(),
926 TermWin_TotalHeight());
927#ifdef RXVT_GRAPHICS
928 if (R->old_height)
929 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
930 R->old_height - R->szHint.base_height);
931#endif
932 rxvt_scr_clear(aR);
933#ifdef XPM_BACKGROUND
934 rxvt_resize_pixmap(aR);
935#endif
936 }
937 958
938 if (fix_screen || R->old_height == 0) {
939 int curr_screen = -1;
940 uint16_t old_ncol = R->prev_ncol;
941
942 /* scr_reset only works on the primary screen */
943 if (R->old_height) /* this is not the first time through */
944 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
945
946 R->scr_reset(); 959 scr_reset();
947 960
948 if (curr_screen >= 0) { /* this is not the first time through */ 961 if (curr_screen >= 0) /* this is not the first time through */
962 {
949 rxvt_scr_change_screen(aR_ curr_screen); 963 scr_change_screen (curr_screen);
950 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 964 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
951 } 965 }
952 } 966 }
953 967
954 R->old_width = R->szHint.width; 968 old_width = szHint.width;
955 R->old_height = R->szHint.height; 969 old_height = szHint.height;
956 970
957#ifdef USE_XIM 971#ifdef USE_XIM
958 rxvt_IMSetStatusPosition(aR); 972 IMSetStatusPosition ();
959#endif 973#endif
960} 974}
961 975
962/* 976/*
963 * Set the width/height of the vt window in characters. Units are pixels. 977 * Set the width/height of the vt window in characters. Units are pixels.
964 * good for toggling 80/132 columns 978 * good for toggling 80/132 columns
965 */ 979 */
966/* EXTPROTO */
967void 980void
968rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 981rxvt_term::set_widthheight (unsigned int width, unsigned int height)
969{ 982{
970 XWindowAttributes wattr; 983 XWindowAttributes wattr;
971 984
972 if (width == 0 || height == 0) { 985 if (width == 0 || height == 0) {
973 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 986 XGetWindowAttributes(Xdisplay, Xroot, &wattr);
974 if (width == 0) 987 if (width == 0)
975 width = wattr.width - R->szHint.base_width; 988 width = wattr.width - szHint.base_width;
976 if (height == 0) 989 if (height == 0)
977 height = wattr.height - R->szHint.base_height; 990 height = wattr.height - szHint.base_height;
978 } 991 }
979 if (width != R->TermWin.width || height != R->TermWin.height) { 992 if (width != TermWin.width || height != TermWin.height) {
980 width += R->szHint.base_width; 993 width += szHint.base_width;
981 height += R->szHint.base_height; 994 height += szHint.base_height;
982 rxvt_resize_all_windows(aR_ width, height, 0); 995 resize_all_windows (width, height, 0);
983 } 996 }
984} 997}
985 998
986/* -------------------------------------------------------------------- * 999/* -------------------------------------------------------------------- *
987 * - X INPUT METHOD ROUTINES - * 1000 * - X INPUT METHOD ROUTINES - *
988 * -------------------------------------------------------------------- */ 1001 * -------------------------------------------------------------------- */
989#ifdef USE_XIM 1002#ifdef USE_XIM
990/* INTPROTO */
991void 1003void
992rxvt_setSize(pR_ XRectangle * size) 1004rxvt_term::set_size (XRectangle *size)
993{ 1005{
994 size->x = R->TermWin.int_bwidth; 1006 size->x = TermWin.int_bwidth;
995 size->y = R->TermWin.int_bwidth; 1007 size->y = TermWin.int_bwidth;
996 size->width = Width2Pixel(R->TermWin.ncol); 1008 size->width = Width2Pixel(TermWin.ncol);
997 size->height = Height2Pixel(R->TermWin.nrow); 1009 size->height = Height2Pixel(TermWin.nrow);
998} 1010}
999 1011
1000/* INTPROTO */
1001void 1012void
1002rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1013rxvt_term::set_color (unsigned long *fg, unsigned long *bg)
1003{ 1014{
1004 *fg = R->PixColors[Color_fg]; 1015 *fg = PixColors[Color_fg];
1005 *bg = R->PixColors[Color_bg]; 1016 *bg = PixColors[Color_bg];
1006} 1017}
1007 1018
1008/* Checking whether input method is running. */ 1019/* Checking whether input method is running. */
1009/* INTPROTO */
1010Bool 1020bool
1011rxvt_IMisRunning(pR) 1021rxvt_term::IMisRunning ()
1012{ 1022{
1013 char *p; 1023 char *p;
1014 Atom atom; 1024 Atom atom;
1015 Window win; 1025 Window win;
1016 char server[IMBUFSIZ]; 1026 char server[IMBUFSIZ];
… …
1020 STRCPY(server, "@server="); 1030 STRCPY(server, "@server=");
1021 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1031 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1022 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1032 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */
1023 *p = '\0'; 1033 *p = '\0';
1024 1034
1025 atom = XInternAtom(R->Xdisplay, server, False); 1035 atom = XInternAtom(Xdisplay, server, False);
1026 win = XGetSelectionOwner(R->Xdisplay, atom); 1036 win = XGetSelectionOwner(Xdisplay, atom);
1027 if (win != None) 1037 if (win != None)
1028 return True; 1038 return True;
1029 } 1039 }
1030 return False; 1040 return False;
1031} 1041}
1032 1042
1033/* EXTPROTO */
1034void 1043void
1035rxvt_IMSendSpot(pR) 1044rxvt_term::IMSendSpot ()
1036{ 1045{
1037 XPoint spot; 1046 XPoint spot;
1038 XVaNestedList preedit_attr; 1047 XVaNestedList preedit_attr;
1039 1048
1040 if (R->Input_Context == NULL 1049 if (Input_Context == NULL
1041 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1050 || !TermWin.focus || !(input_style & XIMPreeditPosition)
1042 || !(R->event_type == KeyPress 1051 || !(event_type == KeyPress
1043 || R->event_type == Expose 1052 || event_type == Expose
1044 || R->event_type == NoExpose 1053 || event_type == NoExpose
1045 || R->event_type == SelectionNotify 1054 || event_type == SelectionNotify
1046 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1055 || event_type == ButtonRelease || event_type == FocusIn)
1047 || !rxvt_IMisRunning(aR)) 1056 || !IMisRunning ())
1048 return; 1057 return;
1049 1058
1050 rxvt_setPosition(aR_ & spot); 1059 set_position (&spot);
1051 1060
1052 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1061 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1053 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1062 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1054 XFree(preedit_attr); 1063 XFree(preedit_attr);
1055} 1064}
1056 1065
1066void
1067rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1068 XRectangle * needed_rect)
1069{
1070 int mbh, vtx = 0;
1071
1072 if (scrollbar_visible () && !(Options & Opt_scrollBar_right))
1073 vtx = scrollbar_TotalWidth();
1074
1075 mbh = menubar_visible () ? menuBar_TotalHeight() : 0;
1076 mbh -= TermWin.lineSpace;
1077
1078 preedit_rect->x = needed_rect->width + vtx;
1079 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1080
1081 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1082 preedit_rect->height = Height2Pixel(1);
1083
1084 status_rect->x = vtx;
1085 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1086
1087 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1088 status_rect->height = Height2Pixel(1);
1089}
1090
1091/* ARGSUSED */
1057/* EXTPROTO */ 1092/* EXTPROTO */
1058void
1059rxvt_setTermFontSet(pR_ int idx)
1060{
1061 char *string;
1062 long length;
1063 int success = 0;
1064
1065 if (idx < 0 || idx >= MAX_NFONTS)
1066 return;
1067}
1068
1069/* INTPROTO */
1070void
1071rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect,
1072 XRectangle * needed_rect)
1073{
1074 int mbh, vtx = 0;
1075
1076 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
1077 vtx = scrollbar_TotalWidth();
1078 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0;
1079 mbh -= R->TermWin.lineSpace;
1080
1081 preedit_rect->x = needed_rect->width + vtx;
1082 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1083
1084 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width
1085 + vtx;
1086 preedit_rect->height = Height2Pixel(1);
1087
1088 status_rect->x = vtx;
1089 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1090
1091 status_rect->width = needed_rect->width ? needed_rect->width
1092 : Width2Pixel(R->TermWin.ncol + 1);
1093 status_rect->height = Height2Pixel(1);
1094}
1095
1096/* ARGSUSED */
1097/* INTPROTO */
1098void 1093void
1099rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1094rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data
1100 __attribute__ ((unused)), XPointer call_data 1095 __attribute__ ((unused)), XPointer call_data
1101 __attribute__ ((unused))) 1096 __attribute__ ((unused)))
1102{ 1097{
1103 dR;
1104
1105 R->Input_Context = NULL; 1098 GET_R->Input_Context = NULL;
1106/* To avoid Segmentation Fault in C locale: Solaris only? */ 1099/* To avoid Segmentation Fault in C locale: Solaris only? */
1107 if (STRCMP(R->locale, "C")) 1100 if (STRCMP (GET_R->locale, "C"))
1108 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1101 XRegisterIMInstantiateCallback(GET_R->Xdisplay, NULL, NULL, NULL,
1109 rxvt_IMInstantiateCallback, NULL); 1102 rxvt_IMInstantiateCallback, NULL);
1110}
1111
1112/*
1113 * X manual pages and include files don't match on some systems:
1114 * some think this is an XIDProc and others an XIMProc so we can't
1115 * use the first argument - need to update this to be nice for
1116 * both types via some sort of configure detection
1117 */
1118/* ARGSUSED */
1119/* EXTPROTO */
1120void
1121rxvt_IMInstantiateCallback(Display * unused
1122 __attribute__ ((unused)), XPointer client_data
1123 __attribute__ ((unused)), XPointer call_data
1124 __attribute__ ((unused)))
1125{
1126 dR;
1127 int i, found, had_im;
1128 const char *p;
1129 char **s;
1130 char buf[IMBUFSIZ];
1131
1132 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1133 if (R->Input_Context)
1134 return;
1135
1136 p = R->rs[Rs_inputMethod];
1137 if (p && *p)
1138 {
1139 bool found = false;
1140
1141 s = rxvt_splitcommastring (p);
1142 for (i = 0; s[i]; i++)
1143 {
1144 if (*s[i])
1145 {
1146 STRCPY (buf, "@im=");
1147 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1148 if ((p = XSetLocaleModifiers (buf)) && *p
1149 && rxvt_IM_get_IC (aR))
1150 {
1151 found = true;
1152 break;
1153 }
1154 }
1155 }
1156 for (i = 0; s[i]; i++)
1157 free(s[i]);
1158 free(s);
1159
1160 if (found)
1161 return;
1162 }
1163
1164/* try with XMODIFIERS env. var. */
1165 if ((p = XSetLocaleModifiers ("")) && *p
1166 && rxvt_IM_get_IC (aR))
1167 return;
1168
1169/* try with no modifiers base IF the user didn't specify an IM */
1170 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1171 && rxvt_IM_get_IC (aR) == True)
1172 return;
1173} 1103}
1174 1104
1175/* 1105/*
1176 * Try to open a XIM with the current modifiers, then see if we can 1106 * Try to open a XIM with the current modifiers, then see if we can
1177 * open a suitable preedit type 1107 * open a suitable preedit type
1178 */ 1108 */
1179/* INTPROTO */
1180Bool 1109bool
1181rxvt_IM_get_IC(pR) 1110rxvt_term::IM_get_IC ()
1182{ 1111{
1183 int i, j, found; 1112 int i, j, found;
1184 XIM xim; 1113 XIM xim;
1185 XPoint spot; 1114 XPoint spot;
1186 XRectangle rect, status_rect, needed_rect; 1115 XRectangle rect, status_rect, needed_rect;
… …
1190 XIMStyles *xim_styles; 1119 XIMStyles *xim_styles;
1191 XVaNestedList preedit_attr, status_attr; 1120 XVaNestedList preedit_attr, status_attr;
1192 XIMCallback ximcallback; 1121 XIMCallback ximcallback;
1193 1122
1194 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1123 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1195 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1124 xim = XOpenIM (Xdisplay, NULL, NULL, NULL);
1196 if (xim == NULL) 1125 if (xim == NULL)
1197 return False; 1126 return False;
1198 1127
1199 xim_styles = NULL; 1128 xim_styles = NULL;
1200 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1129 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1201 || !xim_styles || !xim_styles->count_styles) { 1130 || !xim_styles || !xim_styles->count_styles) {
1202 XCloseIM(xim); 1131 XCloseIM(xim);
1203 return False; 1132 return False;
1204 } 1133 }
1205 1134
1206 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1135 p = rs[Rs_preeditType] ? rs[Rs_preeditType]
1207 : "OverTheSpot,OffTheSpot,Root"; 1136 : "OverTheSpot,OffTheSpot,Root";
1208 s = rxvt_splitcommastring(p); 1137 s = rxvt_splitcommastring(p);
1209 for (i = found = 0; !found && s[i]; i++) { 1138 for (i = found = 0; !found && s[i]; i++) {
1210 if (!STRCMP(s[i], "OverTheSpot")) 1139 if (!STRCMP(s[i], "OverTheSpot"))
1211 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1140 input_style = (XIMPreeditPosition | XIMStatusNothing);
1212 else if (!STRCMP(s[i], "OffTheSpot")) 1141 else if (!STRCMP(s[i], "OffTheSpot"))
1213 R->input_style = (XIMPreeditArea | XIMStatusArea); 1142 input_style = (XIMPreeditArea | XIMStatusArea);
1214 else if (!STRCMP(s[i], "Root")) 1143 else if (!STRCMP(s[i], "Root"))
1215 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1144 input_style = (XIMPreeditNothing | XIMStatusNothing);
1216 1145
1217 for (j = 0; j < xim_styles->count_styles; j++) 1146 for (j = 0; j < xim_styles->count_styles; j++)
1218 if (R->input_style == xim_styles->supported_styles[j]) { 1147 if (input_style == xim_styles->supported_styles[j]) {
1219 found = 1; 1148 found = 1;
1220 break; 1149 break;
1221 } 1150 }
1222 } 1151 }
1223 for (i = 0; s[i]; i++) 1152 for (i = 0; s[i]; i++)
… …
1230 return False; 1159 return False;
1231 } 1160 }
1232 1161
1233 ximcallback.callback = rxvt_IMDestroyCallback; 1162 ximcallback.callback = rxvt_IMDestroyCallback;
1234 1163
1235/* XXX: not sure why we need this (as well as IC one below) */ 1164 /* XXX: not sure why we need this (as well as IC one below) */
1236 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1165 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1237 1166
1238 preedit_attr = status_attr = NULL; 1167 preedit_attr = status_attr = NULL;
1239 1168
1240 if (R->input_style & XIMPreeditPosition) { 1169 if (input_style & XIMPreeditPosition) {
1241 rxvt_setSize(aR_ & rect); 1170 set_size (&rect);
1242 rxvt_setPosition(aR_ & spot); 1171 set_position (&spot);
1243 rxvt_setColor(aR_ & fg, &bg); 1172 set_color (&fg, &bg);
1244 1173
1245 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1174 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1246 XNSpotLocation, &spot, 1175 XNSpotLocation, &spot,
1247 XNForeground, fg, XNBackground, bg, 1176 XNForeground, fg, XNBackground, bg,
1248 //XNFontSet, R->TermWin.fontset, 1177 //XNFontSet, TermWin.fontset,
1249 NULL); 1178 NULL);
1250 } else if (R->input_style & XIMPreeditArea) { 1179 } else if (input_style & XIMPreeditArea) {
1251 rxvt_setColor(aR_ & fg, &bg); 1180 set_color (&fg, &bg);
1252 1181
1253 /* 1182 /*
1254 * The necessary width of preedit area is unknown 1183 * The necessary width of preedit area is unknown
1255 * until create input context. 1184 * until create input context.
1256 */ 1185 */
1257 needed_rect.width = 0; 1186 needed_rect.width = 0;
1258 1187
1259 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect); 1188 set_preedit_area(&rect, &status_rect, &needed_rect);
1260 1189
1261 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1190 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1262 XNForeground, fg, XNBackground, bg, 1191 XNForeground, fg, XNBackground, bg,
1263 //XNFontSet, R->TermWin.fontset, 1192 //XNFontSet, TermWin.fontset,
1264 NULL); 1193 NULL);
1265 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1194 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1266 XNForeground, fg, XNBackground, bg, 1195 XNForeground, fg, XNBackground, bg,
1267 //XNFontSet, R->TermWin.fontset, 1196 //XNFontSet, TermWin.fontset,
1268 NULL); 1197 NULL);
1269 } 1198 }
1270 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style, 1199 Input_Context = XCreateIC(xim, XNInputStyle, input_style,
1271 XNClientWindow, R->TermWin.parent[0], 1200 XNClientWindow, TermWin.parent[0],
1272 XNFocusWindow, R->TermWin.parent[0], 1201 XNFocusWindow, TermWin.parent[0],
1273 XNDestroyCallback, &ximcallback, 1202 XNDestroyCallback, &ximcallback,
1274 preedit_attr ? XNPreeditAttributes : NULL, 1203 preedit_attr ? XNPreeditAttributes : NULL,
1275 preedit_attr, 1204 preedit_attr,
1276 status_attr ? XNStatusAttributes : NULL, 1205 status_attr ? XNStatusAttributes : NULL,
1277 status_attr, NULL); 1206 status_attr, NULL);
1278 if (preedit_attr) 1207 if (preedit_attr)
1279 XFree(preedit_attr); 1208 XFree(preedit_attr);
1280 if (status_attr) 1209 if (status_attr)
1281 XFree(status_attr); 1210 XFree(status_attr);
1282 if (R->Input_Context == NULL) { 1211 if (Input_Context == NULL) {
1283 rxvt_print_error("failed to create input context"); 1212 rxvt_print_error("failed to create input context");
1284 XCloseIM(xim); 1213 XCloseIM(xim);
1285 return False; 1214 return False;
1286 } 1215 }
1287 if (R->input_style & XIMPreeditArea) 1216 if (input_style & XIMPreeditArea)
1288 rxvt_IMSetStatusPosition(aR); 1217 IMSetStatusPosition ();
1289 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1218 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1290 return True; 1219 return True;
1291} 1220}
1292 1221
1222/*
1223 * X manual pages and include files don't match on some systems:
1224 * some think this is an XIDProc and others an XIMProc so we can't
1225 * use the first argument - need to update this to be nice for
1226 * both types via some sort of configure detection
1227 */
1228/* ARGSUSED */
1293/* EXTPROTO */ 1229/* EXTPROTO */
1294void 1230void
1231rxvt_IMInstantiateCallback(Display * unused
1232 __attribute__ ((unused)), XPointer client_data
1233 __attribute__ ((unused)), XPointer call_data
1234 __attribute__ ((unused)))
1235{
1236 int i, found, had_im;
1237 const char *p;
1238 char **s;
1239 char buf[IMBUFSIZ];
1240
1241 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1242 if (GET_R->Input_Context)
1243 return;
1244
1245#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1246 if (GET_R->rs[Rs_imLocale])
1247 setlocale (LC_CTYPE, GET_R->rs[Rs_imLocale]);
1248#endif
1249
1250 p = GET_R->rs[Rs_inputMethod];
1251 if (p && *p)
1252 {
1253 bool found = false;
1254
1255 s = rxvt_splitcommastring (p);
1256 for (i = 0; s[i]; i++)
1257 {
1258 if (*s[i])
1259 {
1260 STRCPY (buf, "@im=");
1261 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1262 if ((p = XSetLocaleModifiers (buf)) && *p && GET_R->IM_get_IC ())
1263 {
1264 found = true;
1265 break;
1266 }
1267 }
1268 }
1269 for (i = 0; s[i]; i++)
1270 free(s[i]);
1271 free(s);
1272
1273 if (found)
1274 goto done;
1275 }
1276
1277/* try with XMODIFIERS env. var. */
1278 if ((p = XSetLocaleModifiers ("")) && *p
1279 && GET_R->IM_get_IC ())
1280 goto done;
1281
1282/* try with no modifiers base IF the user didn't specify an IM */
1283 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1284 && GET_R->IM_get_IC () == True)
1285 goto done;
1286
1287done:
1288#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1289 if (GET_R->rs[Rs_imLocale])
1290 setlocale (LC_CTYPE, GET_R->locale);
1291#endif
1292}
1293
1294void
1295rxvt_IMSetStatusPosition(pR) 1295rxvt_term::IMSetStatusPosition ()
1296{ 1296{
1297 XRectangle preedit_rect, status_rect, *needed_rect; 1297 XRectangle preedit_rect, status_rect, *needed_rect;
1298 XVaNestedList preedit_attr, status_attr; 1298 XVaNestedList preedit_attr, status_attr;
1299 1299
1300 if (R->Input_Context == NULL 1300 if (Input_Context == NULL
1301 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1301 || !TermWin.focus || !(input_style & XIMPreeditArea)
1302 || !rxvt_IMisRunning(aR)) 1302 || !IMisRunning ())
1303 return; 1303 return;
1304 1304
1305/* Getting the necessary width of preedit area */ 1305/* Getting the necessary width of preedit area */
1306 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1306 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1307 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1307 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL);
1308 XFree(status_attr); 1308 XFree(status_attr);
1309 1309
1310 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1310 set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1311 1311
1312 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1312 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1313 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1313 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1314 1314
1315 XSetICValues(R->Input_Context, 1315 XSetICValues(Input_Context,
1316 XNPreeditAttributes, preedit_attr, 1316 XNPreeditAttributes, preedit_attr,
1317 XNStatusAttributes, status_attr, NULL); 1317 XNStatusAttributes, status_attr, NULL);
1318 1318
1319 XFree(preedit_attr); 1319 XFree(preedit_attr);
1320 XFree(status_attr); 1320 XFree(status_attr);

Diff Legend

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