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.20 by pcg, Fri Jan 16 16:34:56 2004 UTC vs.
Revision 1.26 by pcg, Sun Feb 1 01:34:41 2004 UTC

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

Diff Legend

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