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

Diff Legend

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