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.10 by pcg, Wed Dec 3 23:19:44 2003 UTC vs.
Revision 1.22 by pcg, Sat Jan 31 00:20:21 2004 UTC

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

Diff Legend

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