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.16 by pcg, Thu Dec 18 07:31:19 2003 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.16 2003/12/18 07:31:19 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: pty_ev (this, &rxvt_term::pty_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), 86 check_ev (this, &rxvt_term::check_cb),
85 destroy_ev (this, &rxvt_term::destroy_cb), 87 destroy_ev (this, &rxvt_term::destroy_cb),
88 pty_ev (this, &rxvt_term::pty_cb),
86 check_ev (this, &rxvt_term::check_cb), 89 x_ev (this, &rxvt_term::x_cb),
87 incr_ev (this, &rxvt_term::incr_cb) 90 incr_ev (this, &rxvt_term::incr_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
220 224
221 rxvt_Create_Windows (this, argc, argv); 225 create_windows (argc, argv);
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);
233#endif 237#endif
234#endif 238#endif
235 239
236#ifdef HAVE_SCROLLBARS 240#ifdef HAVE_SCROLLBARS
237 if (Options & Opt_scrollBar) 241 if (Options & Opt_scrollBar)
238 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 242 resize_scrollbar (); /* create and map scrollbar */
239#endif 243#endif
240#if (MENUBAR_MAX) 244#if (MENUBAR_MAX)
241 if (menubar_visible(r)) 245 if (menubar_visible(r))
242 XMapWindow (Xdisplay, menuBar.win); 246 XMapWindow (Xdisplay, menuBar.win);
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/*----------------------------------------------------------------------*/
522/* 530/*
523 * window size/position calculcations for XSizeHint and other storage. 531 * window size/position calculcations for XSizeHint and other storage.
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 */
526/* EXTPROTO */
527void 534void
528rxvt_window_calc(pR_ unsigned int width, unsigned int height) 535rxvt_term::window_calc (unsigned int width, unsigned int height)
529{ 536{
530 short recalc_x, recalc_y; 537 short recalc_x, recalc_y;
531 int x, y, sb_w, mb_h, flags; 538 int x, y, sb_w, mb_h, flags;
532 unsigned int w, h; 539 unsigned int w, h;
533 unsigned int max_width, max_height; 540 unsigned int max_width, max_height;
534 541
535 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",
536 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 543 TermWin.ncol, TermWin.nrow, szHint.width,
537 R->szHint.height)); 544 szHint.height));
538 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 545 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
539 R->szHint.win_gravity = NorthWestGravity; 546 szHint.win_gravity = NorthWestGravity;
540/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 547 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
541 548
542 recalc_x = recalc_y = 0; 549 recalc_x = recalc_y = 0;
543 flags = 0; 550 flags = 0;
544 if (!R->parsed_geometry) { 551 if (!parsed_geometry)
552 {
545 R->parsed_geometry = 1; 553 parsed_geometry = 1;
546 if (R->rs[Rs_geometry]) 554 if (rs[Rs_geometry])
547 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 555 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
548 if (flags & WidthValue) { 556 if (flags & WidthValue)
557 {
549 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 558 TermWin.ncol = BOUND_POSITIVE_INT16(w);
550 R->szHint.flags |= USSize; 559 szHint.flags |= USSize;
551 } 560 }
552 if (flags & HeightValue) { 561 if (flags & HeightValue)
562 {
553 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 563 TermWin.nrow = BOUND_POSITIVE_INT16(h);
554 R->szHint.flags |= USSize; 564 szHint.flags |= USSize;
555 } 565 }
556 if (flags & XValue) { 566 if (flags & XValue)
567 {
557 R->szHint.x = x; 568 szHint.x = x;
558 R->szHint.flags |= USPosition; 569 szHint.flags |= USPosition;
559 if (flags & XNegative) { 570 if (flags & XNegative)
571 {
560 recalc_x = 1; 572 recalc_x = 1;
561 R->szHint.win_gravity = NorthEastGravity; 573 szHint.win_gravity = NorthEastGravity;
562 } 574 }
563 } 575 }
564 if (flags & YValue) { 576 if (flags & YValue)
577 {
565 R->szHint.y = y; 578 szHint.y = y;
566 R->szHint.flags |= USPosition; 579 szHint.flags |= USPosition;
567 if (flags & YNegative) { 580 if (flags & YNegative)
581 {
568 recalc_y = 1; 582 recalc_y = 1;
569 if (R->szHint.win_gravity == NorthEastGravity) 583 if (szHint.win_gravity == NorthEastGravity)
570 R->szHint.win_gravity = SouthEastGravity; 584 szHint.win_gravity = SouthEastGravity;
571 else 585 else
572 R->szHint.win_gravity = SouthWestGravity; 586 szHint.win_gravity = SouthWestGravity;
573 } 587 }
574 } 588 }
575 } 589 }
576/* TODO: BOUNDS */ 590 /* TODO: BOUNDS */
577 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 591 TermWin.width = TermWin.ncol * TermWin.fwidth;
578 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 592 TermWin.height = TermWin.nrow * TermWin.fheight;
579 max_width = MAX_COLS * R->TermWin.fwidth; 593 max_width = MAX_COLS * TermWin.fwidth;
580 max_height = MAX_ROWS * R->TermWin.fheight; 594 max_height = MAX_ROWS * TermWin.fheight;
581 595
582 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 596 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
583 597
584 sb_w = mb_h = 0; 598 sb_w = mb_h = 0;
585 R->window_vt_x = R->window_vt_y = 0; 599 window_vt_x = window_vt_y = 0;
586 if (scrollbar_visible(R)) { 600 if (scrollbar_visible ())
601 {
587 sb_w = scrollbar_TotalWidth(); 602 sb_w = scrollbar_TotalWidth();
588 R->szHint.base_width += sb_w; 603 szHint.base_width += sb_w;
589 if (!(R->Options & Opt_scrollBar_right)) 604 if (!(Options & Opt_scrollBar_right))
590 R->window_vt_x = sb_w; 605 window_vt_x = sb_w;
591 } 606 }
592 if (menubar_visible(R)) { 607 if (menubar_visible ())
608 {
593 mb_h = menuBar_TotalHeight(); 609 mb_h = menuBar_TotalHeight();
594 R->szHint.base_height += mb_h; 610 szHint.base_height += mb_h;
595 R->window_vt_y = mb_h; 611 window_vt_y = mb_h;
596 } 612 }
597 R->szHint.width_inc = R->TermWin.fwidth; 613 szHint.width_inc = TermWin.fwidth;
598 R->szHint.height_inc = R->TermWin.fheight; 614 szHint.height_inc = TermWin.fheight;
599 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 615 szHint.min_width = szHint.base_width + szHint.width_inc;
600 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 616 szHint.min_height = szHint.base_height + szHint.height_inc;
601 617
602 if (width && width - R->szHint.base_width < max_width) { 618 if (width && width - szHint.base_width < max_width)
619 {
603 R->szHint.width = width; 620 szHint.width = width;
604 R->TermWin.width = width - R->szHint.base_width; 621 TermWin.width = width - szHint.base_width;
605 } else { 622 }
623 else
624 {
606 MIN_IT(R->TermWin.width, max_width); 625 MIN_IT(TermWin.width, max_width);
607 R->szHint.width = R->szHint.base_width + R->TermWin.width; 626 szHint.width = szHint.base_width + TermWin.width;
608 } 627 }
609 if (height && height - R->szHint.base_height < max_height) { 628 if (height && height - szHint.base_height < max_height)
629 {
610 R->szHint.height = height; 630 szHint.height = height;
611 R->TermWin.height = height - R->szHint.base_height; 631 TermWin.height = height - szHint.base_height;
612 } else { 632 }
633 else
634 {
613 MIN_IT(R->TermWin.height, max_height); 635 MIN_IT(TermWin.height, max_height);
614 R->szHint.height = R->szHint.base_height + R->TermWin.height; 636 szHint.height = szHint.base_height + TermWin.height;
615 } 637 }
616 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 638 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
617 R->window_sb_x = R->szHint.width - sb_w; 639 window_sb_x = szHint.width - sb_w;
618 640
619 if (recalc_x) 641 if (recalc_x)
620 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 642 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
621 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 643 - szHint.width - 2 * TermWin.ext_bwidth);
622 if (recalc_y) 644 if (recalc_y)
623 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 645 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay))
624 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 646 - szHint.height - 2 * TermWin.ext_bwidth);
625 647
626 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 648 TermWin.ncol = TermWin.width / TermWin.fwidth;
627 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 649 TermWin.nrow = TermWin.height / TermWin.fheight;
628 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",
629 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 651 TermWin.ncol, TermWin.nrow, szHint.width,
630 R->szHint.height)); 652 szHint.height));
631 return; 653 return;
632} 654}
633 655
634/*----------------------------------------------------------------------*/ 656/*----------------------------------------------------------------------*/
635/* 657/*
636 * Tell the teletype handler what size the window is. 658 * Tell the teletype handler what size the window is.
637 * Called after a window size change. 659 * Called after a window size change.
638 */ 660 */
639void 661void
640rxvt_term::tt_winch () 662rxvt_term::tt_winch ()
641{ 663{
642 struct winsize ws; 664 struct winsize ws;
643 665
644 if (cmd_fd < 0) 666 if (cmd_fd < 0)
645 return; 667 return;
646 668
647 ws.ws_col = TermWin.ncol; 669 ws.ws_col = TermWin.ncol;
665 * init = 1 - initialize 687 * init = 1 - initialize
666 * 688 *
667 * fontname == FONT_UP - switch to bigger font 689 * fontname == FONT_UP - switch to bigger font
668 * fontname == FONT_DN - switch to smaller font 690 * fontname == FONT_DN - switch to smaller font
669 */ 691 */
670/* EXTPROTO */
671void 692void
672rxvt_change_font(pR_ int init, const char *fontname) 693rxvt_term::change_font (int init, const char *fontname)
673{ 694{}
674}
675 695
676/* INTPROTO */
677void 696void
678rxvt_font_up_down(pR_ int n, int direction) 697rxvt_term::font_up_down (int n, int direction)
679{ 698{}
680}
681 699
682/*----------------------------------------------------------------------*/ 700/*----------------------------------------------------------------------*/
683/*----------------------------------------------------------------------*/ 701/*----------------------------------------------------------------------*/
684/* xterm sequences - title, iconName, color (exptl) */ 702/* xterm sequences - title, iconName, color (exptl) */
685/* EXTPROTO */
686void 703void
687rxvt_set_title(pR_ const char *str) 704rxvt_term::set_title (const char *str)
688{ 705{
689#ifndef SMART_WINDOW_TITLE 706#ifndef SMART_WINDOW_TITLE
690 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 707 XStoreName(Xdisplay, TermWin.parent[0], str);
691#else 708#else
692 char *name; 709 char *name;
693 710
694 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 711 if (XFetchName(Xdisplay, TermWin.parent[0], &name) == 0)
695 name = NULL; 712 name = NULL;
696 if (name == NULL || STRCMP(name, str)) 713 if (name == NULL || STRCMP(name, str))
697 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 714 XStoreName(Xdisplay, TermWin.parent[0], str);
698 if (name) 715 if (name)
699 XFree(name); 716 XFree(name);
700#endif 717#endif
701} 718}
702 719
703/* EXTPROTO */
704void 720void
705rxvt_set_iconName(pR_ const char *str) 721rxvt_term::set_iconName (const char *str)
706{ 722{
707#ifndef SMART_WINDOW_TITLE 723#ifndef SMART_WINDOW_TITLE
708 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 724 XSetIconName(Xdisplay, TermWin.parent[0], str);
709#else 725#else
710 char *name; 726 char *name;
711 727
712 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 728 if (XGetIconName(Xdisplay, TermWin.parent[0], &name))
713 name = NULL; 729 name = NULL;
714 if (name == NULL || STRCMP(name, str)) 730 if (name == NULL || STRCMP(name, str))
715 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 731 XSetIconName(Xdisplay, TermWin.parent[0], str);
716 if (name) 732 if (name)
717 XFree(name); 733 XFree(name);
718#endif 734#endif
719} 735}
720 736
721#ifdef XTERM_COLOR_CHANGE 737#ifdef XTERM_COLOR_CHANGE
722/* EXTPROTO */
723void 738void
724rxvt_set_window_color(pR_ int idx, const char *color) 739rxvt_term::set_window_color (int idx, const char *color)
725{ 740{
726 rxvt_color xcol; 741 rxvt_color xcol;
727 int i; 742 int i;
728 743
729 if (color == NULL || *color == '\0') 744 if (color == NULL || *color == '\0')
730 return; 745 return;
731 746
732/* handle color aliases */ 747 /* handle color aliases */
733 if (isdigit(*color)) { 748 if (isdigit(*color))
749 {
734 i = atoi(color); 750 i = atoi(color);
751 if (i >= 8 && i <= 15)
735 if (i >= 8 && i <= 15) { /* bright colors */ 752 { /* bright colors */
736 i -= 8; 753 i -= 8;
737# ifndef NO_BRIGHTCOLOR 754# ifndef NO_BRIGHTCOLOR
738 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 755 PixColors[idx] = PixColors[minBrightCOLOR + i];
739 SET_PIXCOLOR(R, idx); 756 SET_PIXCOLOR(idx);
740 goto Done; 757 goto Done;
741# endif 758# endif
759
742 } 760 }
743 if (i >= 0 && i <= 7) { /* normal colors */ 761 if (i >= 0 && i <= 7)
762 { /* normal colors */
744 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 763 PixColors[idx] = PixColors[minCOLOR + i];
745 SET_PIXCOLOR(R, idx); 764 SET_PIXCOLOR(idx);
746 goto Done; 765 goto Done;
747 } 766 }
748 } 767 }
749 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 768 if (!rXParseAllocColor (& xcol, color))
750 return; 769 return;
751/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 770 /* XStoreColor (Xdisplay, XCMAP, XColor*); */
752 771
753/* 772 /*
754 * 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,
755 * so just keep gobbling up the colormap 774 * so just keep gobbling up the colormap
756 */ 775 */
757# if 0 776# if 0
758 for (i = Color_Black; i <= Color_White; i++) 777 for (i = Color_Black; i <= Color_White; i++)
759 if (R->PixColors[idx] == R->PixColors[i]) 778 if (PixColors[idx] == PixColors[i])
760 break; 779 break;
761 if (i > Color_White) { 780 if (i > Color_White)
781 {
762 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 782 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
763 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 783 XFreeColors(Xdisplay, XCMAP, (PixColors + idx), 1,
764 DisplayPlanes(R->Xdisplay, Xscreen)); 784 DisplayPlanes(Xdisplay, Xscreen));
765 } 785 }
766# endif 786# endif
767 787
768 R->PixColors[idx] = xcol; 788 PixColors[idx] = xcol;
769 SET_PIXCOLOR(R, idx); 789 SET_PIXCOLOR(idx);
770 790
771/* XSetWindowAttributes attr; */ 791 /* XSetWindowAttributes attr; */
772/* Cursor cursor; */ 792 /* Cursor cursor; */
773 Done: 793Done:
774 if (idx == Color_bg && !(R->Options & Opt_transparent)) 794 if (idx == Color_bg && !(Options & Opt_transparent))
775 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 795 XSetWindowBackground(Xdisplay, TermWin.vt,
776 R->PixColors[Color_bg]); 796 PixColors[Color_bg]);
777 797
778/* handle Color_BD, scrollbar background, etc. */ 798 /* handle Color_BD, scrollbar background, etc. */
779 799
780 rxvt_set_colorfgbg (aR); 800 set_colorfgbg ();
781 R->recolour_cursor (); 801 recolour_cursor ();
782/* the only reasonable way to enforce a clean update */ 802 /* the only reasonable way to enforce a clean update */
783 rxvt_scr_poweron (aR); 803 scr_poweron ();
784} 804}
785 805
786#else 806#else
787# define rxvt_set_window_color(aR_ idx,color) ((void)0) 807# define set_window_color (idx,color) ((void)0)
788#endif /* XTERM_COLOR_CHANGE */ 808#endif /* XTERM_COLOR_CHANGE */
789 809
790void 810void
791rxvt_term::recolour_cursor () 811rxvt_term::recolour_cursor ()
792{ 812{
793#if TODO 813#if TODO
794 rxvt_color xcol[2]; 814 rxvt_color xcol[2];
795 815
796 xcol[0] = PixColors[Color_pointer]; 816 xcol[0] = PixColors[Color_pointer];
797 xcol[1] = PixColors[Color_bg]; 817 xcol[1] = PixColors[Color_bg];
798 XQueryColors (Xdisplay, XCMAP, xcol, 2); 818 XQueryColors (Xdisplay, XCMAP, xcol, 2);
799 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1])); 819 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
800#endif 820#endif
801} 821}
802 822
803/*----------------------------------------------------------------------*/ 823/*----------------------------------------------------------------------*/
804/* 824/*
805 * 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
806 */ 826 */
807/* INTPROTO */
808void 827void
809rxvt_set_colorfgbg(pR) 828rxvt_term::set_colorfgbg ()
810{ 829{
811 unsigned int i; 830 unsigned int i;
812 const char *xpmb = "\0"; 831 const char *xpmb = "\0";
813 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 832 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1];
814 833
815 R->env_colorfgbg = 834 env_colorfgbg =
816 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 835 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1);
817 STRCPY(fstr, "default"); 836 STRCPY(fstr, "default");
818 STRCPY(bstr, "default"); 837 STRCPY(bstr, "default");
819 for (i = Color_Black; i <= Color_White; i++) 838 for (i = Color_Black; i <= Color_White; i++)
820 if (R->PixColors[Color_fg] == R->PixColors[i]) { 839 if (PixColors[Color_fg] == PixColors[i])
840 {
821 sprintf(fstr, "%d", (i - Color_Black)); 841 sprintf(fstr, "%d", (i - Color_Black));
822 break; 842 break;
823 } 843 }
824 for (i = Color_Black; i <= Color_White; i++) 844 for (i = Color_Black; i <= Color_White; i++)
825 if (R->PixColors[Color_bg] == R->PixColors[i]) { 845 if (PixColors[Color_bg] == PixColors[i])
846 {
826 sprintf(bstr, "%d", (i - Color_Black)); 847 sprintf(bstr, "%d", (i - Color_Black));
827#ifdef XPM_BACKGROUND 848#ifdef XPM_BACKGROUND
828 xpmb = "default;"; 849 xpmb = "default;";
829#endif 850#endif
830 break; 851 break;
831 } 852 }
832 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 853 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
833 putenv(R->env_colorfgbg); 854 putenv(env_colorfgbg);
834 855
835#ifndef NO_BRIGHTCOLOR 856#ifndef NO_BRIGHTCOLOR
836 R->colorfgbg = DEFAULT_RSTYLE; 857 colorfgbg = DEFAULT_RSTYLE;
837 for (i = minCOLOR; i <= maxCOLOR; i++) { 858 for (i = minCOLOR; i <= maxCOLOR; i++)
859 {
838 if (R->PixColors[Color_fg] == R->PixColors[i]) 860 if (PixColors[Color_fg] == PixColors[i])
839 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 861 colorfgbg = SET_FGCOLOR(colorfgbg, i);
840 if (R->PixColors[Color_bg] == R->PixColors[i]) 862 if (PixColors[Color_bg] == PixColors[i])
841 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 863 colorfgbg = SET_BGCOLOR(colorfgbg, i);
842 } 864 }
843#endif 865#endif
844} 866}
845 867
846/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
847/* 869/*
848 * Colour determination for low colour displays, routine from 870 * Colour determination for low colour displays, routine from
849 * Hans de Goede <hans@highrise.nl> 871 * Hans de Goede <hans@highrise.nl>
850 */ 872 */
851 873
852/* EXTPROTO */
853int 874int
854rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 875rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
855{ 876{
856 screen_in_out->set(aR_ colour);
857
858 if (!screen_in_out->set(aR_ colour)) { 877 if (!screen_in_out->set (this, colour))
878 {
859 rxvt_print_error("can't allocate colour: %s", colour); 879 rxvt_print_error("can't allocate colour: %s", colour);
860 return false; 880 return false;
861 } 881 }
862 882
863 return true; 883 return true;
864} 884}
865 885
866/* -------------------------------------------------------------------- * 886/* -------------------------------------------------------------------- *
867 * - WINDOW RESIZING - * 887 * - WINDOW RESIZING - *
868 * -------------------------------------------------------------------- */ 888 * -------------------------------------------------------------------- */
869/* EXTPROTO */
870void 889void
871rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 890rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
872 int ignoreparent)
873{ 891{
874 int fix_screen; 892 int fix_screen;
875 893
876#ifdef SMART_RESIZE 894#ifdef SMART_RESIZE
877 int old_width = R->szHint.width, old_height = R->szHint.height; 895 int old_width = szHint.width, old_height = szHint.height;
878#endif 896#endif
879 897
880 rxvt_window_calc(aR_ width, height); 898 window_calc (width, height);
881 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 899 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint);
882 if (!ignoreparent) { 900 if (!ignoreparent)
901 {
883#ifdef SMART_RESIZE 902#ifdef SMART_RESIZE
884/* 903 /*
885 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 904 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
886 * reposition window on resize depending on placement on screen 905 * reposition window on resize depending on placement on screen
887 */ 906 */
888 int x, y, x1, y1; 907 int x, y, x1, y1;
889 int dx, dy; 908 int dx, dy;
890 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 909 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
891 Window unused_cr; 910 Window unused_cr;
892 911
893 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 912 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot,
894 0, 0, &x, &y, &unused_cr); 913 0, 0, &x, &y, &unused_cr);
895 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 914 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1,
896 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 915 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
897 /* 916 /*
898 * 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
899 * our position for handles and decorations. Counter it 918 * our position for handles and decorations. Counter it
900 */ 919 */
901 if (x1 != x || y1 != y) { 920 if (x1 != x || y1 != y)
921 {
902 x -= x1; 922 x -= x1;
903 y -= y1; 923 y -= y1;
904 } 924 }
905 925
906 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 926 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2;
907 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 927 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2;
908 dx = old_width - R->szHint.width; 928 dx = old_width - szHint.width;
909 dy = old_height - R->szHint.height; 929 dy = old_height - szHint.height;
910 930
911 /* Check position of the center of the window */ 931 /* Check position of the center of the window */
912 if (x < x1) /* left half */ 932 if (x < x1) /* left half */
913 dx = 0; 933 dx = 0;
914 else if (x == x1) /* exact center */ 934 else if (x == x1) /* exact center */
915 dx /= 2; 935 dx /= 2;
916 if (y < y1) /* top half */ 936 if (y < y1) /* top half */
917 dy = 0; 937 dy = 0;
918 else if (y == y1) /* exact center */ 938 else if (y == y1) /* exact center */
919 dy /= 2; 939 dy /= 2;
920 940
921 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 941 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy,
922 R->szHint.width, R->szHint.height); 942 szHint.width, szHint.height);
923#else 943#else
924 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 944 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width,
925 R->szHint.height); 945 szHint.height);
926#endif 946#endif
927 }
928 947
948 }
949
929 fix_screen = (R->TermWin.ncol != R->prev_ncol 950 fix_screen = (TermWin.ncol != prev_ncol
930 || R->TermWin.nrow != R->prev_nrow); 951 || TermWin.nrow != prev_nrow);
952
931 if (fix_screen || width != R->old_width || height != R->old_height) { 953 if (fix_screen || width != old_width || height != old_height)
954 {
932 if (scrollbar_visible(R)) { 955 if (scrollbar_visible ())
956 {
933 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 957 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x,
934 0, scrollbar_TotalWidth(), R->szHint.height); 958 0, scrollbar_TotalWidth (), szHint.height);
935 rxvt_Resize_scrollBar(aR); 959 resize_scrollbar ();
936 } 960 }
961
937 if (menubar_visible(R)) 962 if (menubar_visible ())
938 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 963 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
939 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 964 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
965
940 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 966 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
941 R->window_vt_y, TermWin_TotalWidth(), 967 window_vt_y, TermWin_TotalWidth (),
942 TermWin_TotalHeight()); 968 TermWin_TotalHeight ());
943#ifdef RXVT_GRAPHICS 969#ifdef RXVT_GRAPHICS
944 if (R->old_height) 970 if (old_height)
945 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width, 971 Gr_Resize (old_width - szHint.base_width,
946 R->old_height - R->szHint.base_height); 972 old_height - szHint.base_height);
947#endif 973#endif
948 rxvt_scr_clear(aR); 974 scr_clear ();
949#ifdef XPM_BACKGROUND 975#ifdef XPM_BACKGROUND
950 rxvt_resize_pixmap(aR); 976 resize_pixmap ();
951#endif 977#endif
952 }
953 978
979 }
980
954 if (fix_screen || R->old_height == 0) { 981 if (fix_screen || old_height == 0)
982 {
955 int curr_screen = -1; 983 int curr_screen = -1;
956 uint16_t old_ncol = R->prev_ncol; 984 int old_ncol = prev_ncol;
957 985
958 /* scr_reset only works on the primary screen */ 986 /* scr_reset only works on the primary screen */
959 if (R->old_height) /* this is not the first time through */ 987 if (old_height) /* this is not the first time through */
988 {
989 unsigned int ncol = TermWin.ncol;
990 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
960 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 991 curr_screen = scr_change_screen (PRIMARY);
961 992 TermWin.ncol = ncol;
962 R->scr_reset();
963
964 if (curr_screen >= 0) { /* this is not the first time through */
965 rxvt_scr_change_screen(aR_ curr_screen);
966 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
967 } 993 }
968 }
969 994
995 scr_reset();
996
997 if (curr_screen >= 0) /* this is not the first time through */
998 {
999 scr_change_screen (curr_screen);
1000 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1001 }
1002 }
1003
970 R->old_width = R->szHint.width; 1004 old_width = szHint.width;
971 R->old_height = R->szHint.height; 1005 old_height = szHint.height;
972 1006
973#ifdef USE_XIM 1007#ifdef USE_XIM
974 rxvt_IMSetStatusPosition(aR); 1008 IMSetStatusPosition ();
975#endif 1009#endif
976} 1010}
977 1011
978/* 1012/*
979 * 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.
980 * good for toggling 80/132 columns 1014 * good for toggling 80/132 columns
981 */ 1015 */
982/* EXTPROTO */
983void 1016void
984rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1017rxvt_term::set_widthheight (unsigned int width, unsigned int height)
985{ 1018{
986 XWindowAttributes wattr; 1019 XWindowAttributes wattr;
987 1020
988 if (width == 0 || height == 0) { 1021 if (width == 0 || height == 0)
1022 {
989 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1023 XGetWindowAttributes(Xdisplay, Xroot, &wattr);
990 if (width == 0) 1024 if (width == 0)
991 width = wattr.width - R->szHint.base_width; 1025 width = wattr.width - szHint.base_width;
992 if (height == 0) 1026 if (height == 0)
993 height = wattr.height - R->szHint.base_height; 1027 height = wattr.height - szHint.base_height;
994 } 1028 }
995 if (width != R->TermWin.width || height != R->TermWin.height) { 1029 if (width != TermWin.width || height != TermWin.height)
1030 {
996 width += R->szHint.base_width; 1031 width += szHint.base_width;
997 height += R->szHint.base_height; 1032 height += szHint.base_height;
998 rxvt_resize_all_windows(aR_ width, height, 0); 1033 resize_all_windows (width, height, 0);
999 } 1034 }
1000} 1035}
1001 1036
1002/* -------------------------------------------------------------------- * 1037/* -------------------------------------------------------------------- *
1003 * - X INPUT METHOD ROUTINES - * 1038 * - X INPUT METHOD ROUTINES - *
1004 * -------------------------------------------------------------------- */ 1039 * -------------------------------------------------------------------- */
1005#ifdef USE_XIM 1040#ifdef USE_XIM
1006/* INTPROTO */
1007void 1041void
1008rxvt_setSize(pR_ XRectangle * size) 1042rxvt_term::set_size (XRectangle *size)
1009{ 1043{
1010 size->x = R->TermWin.int_bwidth; 1044 size->x = TermWin.int_bwidth;
1011 size->y = R->TermWin.int_bwidth; 1045 size->y = TermWin.int_bwidth;
1012 size->width = Width2Pixel(R->TermWin.ncol); 1046 size->width = Width2Pixel(TermWin.ncol);
1013 size->height = Height2Pixel(R->TermWin.nrow); 1047 size->height = Height2Pixel(TermWin.nrow);
1014} 1048}
1015 1049
1016/* INTPROTO */
1017void 1050void
1018rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1051rxvt_term::set_color (unsigned long *fg, unsigned long *bg)
1019{ 1052{
1020 *fg = R->PixColors[Color_fg]; 1053 *fg = PixColors[Color_fg];
1021 *bg = R->PixColors[Color_bg]; 1054 *bg = PixColors[Color_bg];
1022} 1055}
1023 1056
1024/* Checking whether input method is running. */ 1057/* Checking whether input method is running. */
1025/* INTPROTO */
1026Bool 1058bool
1027rxvt_IMisRunning(pR) 1059rxvt_term::IMisRunning ()
1028{ 1060{
1029 char *p; 1061 char *p;
1030 Atom atom; 1062 Atom atom;
1031 Window win; 1063 Window win;
1032 char server[IMBUFSIZ]; 1064 char server[IMBUFSIZ];
1033 1065
1034/* get current locale modifier */ 1066 /* get current locale modifier */
1035 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1067 if ((p = XSetLocaleModifiers(NULL)) != NULL)
1068 {
1036 STRCPY(server, "@server="); 1069 STRCPY(server, "@server=");
1037 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1070 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1038 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1071 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */
1039 *p = '\0'; 1072 *p = '\0';
1040 1073
1041 atom = XInternAtom(R->Xdisplay, server, False); 1074 atom = XInternAtom(Xdisplay, server, False);
1042 win = XGetSelectionOwner(R->Xdisplay, atom); 1075 win = XGetSelectionOwner(Xdisplay, atom);
1043 if (win != None) 1076 if (win != None)
1044 return True; 1077 return True;
1045 } 1078 }
1046 return False; 1079 return False;
1047} 1080}
1048 1081
1082void
1083rxvt_term::IMSendSpot ()
1084{
1085 XPoint spot;
1086 XVaNestedList preedit_attr;
1087
1088 if (Input_Context == NULL
1089 || !TermWin.focus || !(input_style & XIMPreeditPosition)
1090 || !(event_type == KeyPress
1091 || event_type == Expose
1092 || event_type == NoExpose
1093 || event_type == SelectionNotify
1094 || event_type == ButtonRelease || event_type == FocusIn)
1095 || !IMisRunning ())
1096 return;
1097
1098 set_position (&spot);
1099
1100 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1101 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1102 XFree(preedit_attr);
1103}
1104
1105void
1106rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1107 XRectangle * needed_rect)
1108{
1109 int mbh, vtx = 0;
1110
1111 if (scrollbar_visible () && !(Options & Opt_scrollBar_right))
1112 vtx = scrollbar_TotalWidth();
1113
1114 mbh = menubar_visible () ? menuBar_TotalHeight() : 0;
1115 mbh -= TermWin.lineSpace;
1116
1117 preedit_rect->x = needed_rect->width + vtx;
1118 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1119
1120 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1121 preedit_rect->height = Height2Pixel(1);
1122
1123 status_rect->x = vtx;
1124 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1125
1126 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1127 status_rect->height = Height2Pixel(1);
1128}
1129
1130/* ARGSUSED */
1049/* EXTPROTO */ 1131/* EXTPROTO */
1050void
1051rxvt_IMSendSpot(pR)
1052{
1053 XPoint spot;
1054 XVaNestedList preedit_attr;
1055
1056 if (R->Input_Context == NULL
1057 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition)
1058 || !(R->event_type == KeyPress
1059 || R->event_type == Expose
1060 || R->event_type == NoExpose
1061 || R->event_type == SelectionNotify
1062 || R->event_type == ButtonRelease || R->event_type == FocusIn)
1063 || !rxvt_IMisRunning(aR))
1064 return;
1065
1066 rxvt_setPosition(aR_ & spot);
1067
1068 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1069 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1070 XFree(preedit_attr);
1071}
1072
1073/* INTPROTO */
1074void
1075rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect,
1076 XRectangle * needed_rect)
1077{
1078 int mbh, vtx = 0;
1079
1080 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
1081 vtx = scrollbar_TotalWidth();
1082 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0;
1083 mbh -= R->TermWin.lineSpace;
1084
1085 preedit_rect->x = needed_rect->width + vtx;
1086 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1087
1088 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width
1089 + vtx;
1090 preedit_rect->height = Height2Pixel(1);
1091
1092 status_rect->x = vtx;
1093 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1094
1095 status_rect->width = needed_rect->width ? needed_rect->width
1096 : Width2Pixel(R->TermWin.ncol + 1);
1097 status_rect->height = Height2Pixel(1);
1098}
1099
1100/* ARGSUSED */
1101/* INTPROTO */
1102void 1132void
1103rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1133rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data
1104 __attribute__ ((unused)), XPointer call_data 1134 __attribute__ ((unused)), XPointer call_data
1105 __attribute__ ((unused))) 1135 __attribute__ ((unused)))
1106{ 1136{
1107 dR;
1108
1109 R->Input_Context = NULL; 1137 GET_R->Input_Context = NULL;
1110/* To avoid Segmentation Fault in C locale: Solaris only? */ 1138 /* To avoid Segmentation Fault in C locale: Solaris only? */
1111 if (STRCMP(R->locale, "C")) 1139 if (STRCMP (GET_R->locale, "C"))
1112 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1140 XRegisterIMInstantiateCallback(GET_R->Xdisplay, NULL, NULL, NULL,
1113 rxvt_IMInstantiateCallback, NULL); 1141 rxvt_IMInstantiateCallback, NULL);
1114} 1142}
1115 1143
1116/* 1144/*
1117 * 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
1118 * open a suitable preedit type 1146 * open a suitable preedit type
1119 */ 1147 */
1120static Bool 1148bool
1121rxvt_IM_get_IC (pR) 1149rxvt_term::IM_get_IC ()
1122{ 1150{
1123 int i, j, found; 1151 int i, j, found;
1124 XIM xim; 1152 XIM xim;
1125 XPoint spot; 1153 XPoint spot;
1126 XRectangle rect, status_rect, needed_rect; 1154 XRectangle rect, status_rect, needed_rect;
1127 unsigned long fg, bg; 1155 unsigned long fg, bg;
1128 const char *p; 1156 const char *p;
1129 char **s; 1157 char **s;
1130 XIMStyles *xim_styles; 1158 XIMStyles *xim_styles;
1131 XVaNestedList preedit_attr, status_attr; 1159 XVaNestedList preedit_attr, status_attr;
1132 XIMCallback ximcallback; 1160 XIMCallback ximcallback;
1133 1161
1134 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1162 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1135 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL); 1163 xim = XOpenIM (Xdisplay, NULL, NULL, NULL);
1136 if (xim == NULL) 1164 if (xim == NULL)
1137 return False; 1165 return False;
1138 1166
1139 xim_styles = NULL; 1167 xim_styles = NULL;
1140 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1168 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1141 || !xim_styles || !xim_styles->count_styles) { 1169 || !xim_styles || !xim_styles->count_styles)
1170 {
1142 XCloseIM(xim); 1171 XCloseIM(xim);
1143 return False; 1172 return False;
1144 } 1173 }
1145 1174
1146 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1175 p = rs[Rs_preeditType] ? rs[Rs_preeditType]
1147 : "OverTheSpot,OffTheSpot,Root"; 1176 : "OverTheSpot,OffTheSpot,Root";
1148 s = rxvt_splitcommastring(p); 1177 s = rxvt_splitcommastring(p);
1149 for (i = found = 0; !found && s[i]; i++) { 1178 for (i = found = 0; !found && s[i]; i++)
1179 {
1150 if (!STRCMP(s[i], "OverTheSpot")) 1180 if (!STRCMP(s[i], "OverTheSpot"))
1151 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1181 input_style = (XIMPreeditPosition | XIMStatusNothing);
1152 else if (!STRCMP(s[i], "OffTheSpot")) 1182 else if (!STRCMP(s[i], "OffTheSpot"))
1153 R->input_style = (XIMPreeditArea | XIMStatusArea); 1183 input_style = (XIMPreeditArea | XIMStatusArea);
1154 else if (!STRCMP(s[i], "Root")) 1184 else if (!STRCMP(s[i], "Root"))
1155 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1185 input_style = (XIMPreeditNothing | XIMStatusNothing);
1156 1186
1157 for (j = 0; j < xim_styles->count_styles; j++) 1187 for (j = 0; j < xim_styles->count_styles; j++)
1158 if (R->input_style == xim_styles->supported_styles[j]) { 1188 if (input_style == xim_styles->supported_styles[j])
1189 {
1159 found = 1; 1190 found = 1;
1160 break; 1191 break;
1161 } 1192 }
1162 } 1193 }
1163 for (i = 0; s[i]; i++) 1194 for (i = 0; s[i]; i++)
1164 free(s[i]); 1195 free(s[i]);
1165 free(s); 1196 free(s);
1166 XFree(xim_styles); 1197 XFree(xim_styles);
1167 1198
1168 if (!found) { 1199 if (!found)
1200 {
1169 XCloseIM(xim); 1201 XCloseIM(xim);
1170 return False; 1202 return False;
1171 } 1203 }
1172 1204
1173 ximcallback.callback = rxvt_IMDestroyCallback; 1205 ximcallback.callback = rxvt_IMDestroyCallback;
1174 1206
1175 /* 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) */
1176 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1208 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1177 1209
1178 preedit_attr = status_attr = NULL; 1210 preedit_attr = status_attr = NULL;
1179 1211
1180 if (R->input_style & XIMPreeditPosition) { 1212 if (input_style & XIMPreeditPosition)
1181 rxvt_setSize(aR_ & rect); 1213 {
1214 set_size (&rect);
1182 rxvt_setPosition(aR_ & spot); 1215 set_position (&spot);
1183 rxvt_setColor(aR_ & fg, &bg); 1216 set_color (&fg, &bg);
1184 1217
1185 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1218 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1186 XNSpotLocation, &spot, 1219 XNSpotLocation, &spot,
1187 XNForeground, fg, XNBackground, bg,
1188 //XNFontSet, R->TermWin.fontset,
1189 NULL);
1190 } else if (R->input_style & XIMPreeditArea) {
1191 rxvt_setColor(aR_ & fg, &bg);
1192
1193 /*
1194 * The necessary width of preedit area is unknown
1195 * until create input context.
1196 */
1197 needed_rect.width = 0;
1198
1199 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1200
1201 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1202 XNForeground, fg, XNBackground, bg,
1203 //XNFontSet, R->TermWin.fontset,
1204 NULL);
1205 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1206 XNForeground, fg, XNBackground, bg, 1220 XNForeground, fg, XNBackground, bg,
1207 //XNFontSet, R->TermWin.fontset, 1221 //XNFontSet, TermWin.fontset,
1208 NULL); 1222 NULL);
1223 }
1224 else if (input_style & XIMPreeditArea)
1209 } 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 }
1210 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style, 1245 Input_Context = XCreateIC(xim, XNInputStyle, input_style,
1211 XNClientWindow, R->TermWin.parent[0], 1246 XNClientWindow, TermWin.parent[0],
1212 XNFocusWindow, R->TermWin.parent[0], 1247 XNFocusWindow, TermWin.parent[0],
1213 XNDestroyCallback, &ximcallback, 1248 XNDestroyCallback, &ximcallback,
1214 preedit_attr ? XNPreeditAttributes : NULL, 1249 preedit_attr ? XNPreeditAttributes : NULL,
1215 preedit_attr, 1250 preedit_attr,
1216 status_attr ? XNStatusAttributes : NULL, 1251 status_attr ? XNStatusAttributes : NULL,
1217 status_attr, NULL); 1252 status_attr, NULL);
1218 if (preedit_attr) 1253 if (preedit_attr)
1219 XFree(preedit_attr); 1254 XFree(preedit_attr);
1220 if (status_attr) 1255 if (status_attr)
1221 XFree(status_attr); 1256 XFree(status_attr);
1222 if (R->Input_Context == NULL) { 1257 if (Input_Context == NULL)
1258 {
1223 rxvt_print_error("failed to create input context"); 1259 rxvt_print_error("failed to create input context");
1224 XCloseIM(xim); 1260 XCloseIM(xim);
1225 return False; 1261 return False;
1226 } 1262 }
1227 if (R->input_style & XIMPreeditArea) 1263 if (input_style & XIMPreeditArea)
1228 rxvt_IMSetStatusPosition(aR); 1264 IMSetStatusPosition ();
1229 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1265 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1230 return True; 1266 return True;
1231} 1267}
1232 1268
1233/* 1269/*
1234 * 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:
1235 * 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
1242rxvt_IMInstantiateCallback(Display * unused 1278rxvt_IMInstantiateCallback(Display * unused
1243 __attribute__ ((unused)), XPointer client_data 1279 __attribute__ ((unused)), XPointer client_data
1244 __attribute__ ((unused)), XPointer call_data 1280 __attribute__ ((unused)), XPointer call_data
1245 __attribute__ ((unused))) 1281 __attribute__ ((unused)))
1246{ 1282{
1247 dR;
1248 int i, found, had_im; 1283 int i, found, had_im;
1249 const char *p; 1284 const char *p;
1250 char **s; 1285 char **s;
1251 char buf[IMBUFSIZ]; 1286 char buf[IMBUFSIZ];
1252 1287
1253 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1288 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1254 if (R->Input_Context) 1289 if (GET_R->Input_Context)
1255 return; 1290 return;
1256 1291
1257#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1292#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1258 if (R->rs[Rs_imLocale]) 1293 if (GET_R->rs[Rs_imLocale])
1259 setlocale (LC_CTYPE, R->rs[Rs_imLocale]); 1294 setlocale (LC_CTYPE, GET_R->rs[Rs_imLocale]);
1260#endif 1295#endif
1261 1296
1262 p = R->rs[Rs_inputMethod]; 1297 p = GET_R->rs[Rs_inputMethod];
1263 if (p && *p) 1298 if (p && *p)
1264 { 1299 {
1265 bool found = false; 1300 bool found = false;
1266 1301
1267 s = rxvt_splitcommastring (p); 1302 s = rxvt_splitcommastring (p);
1269 { 1304 {
1270 if (*s[i]) 1305 if (*s[i])
1271 { 1306 {
1272 STRCPY (buf, "@im="); 1307 STRCPY (buf, "@im=");
1273 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1308 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1274 if ((p = XSetLocaleModifiers (buf)) && *p 1309 if ((p = XSetLocaleModifiers (buf)) && *p && GET_R->IM_get_IC ())
1275 && rxvt_IM_get_IC (aR))
1276 { 1310 {
1277 found = true; 1311 found = true;
1278 break; 1312 break;
1279 } 1313 }
1280 } 1314 }
1281 } 1315 }
1282 for (i = 0; s[i]; i++) 1316 for (i = 0; s[i]; i++)
1283 free(s[i]); 1317 free(s[i]);
1284 free(s); 1318 free(s);
1285 1319
1286 if (found) 1320 if (found)
1287 goto done; 1321 goto done;
1288 } 1322 }
1289 1323
1290/* try with XMODIFIERS env. var. */ 1324 /* try with XMODIFIERS env. var. */
1291 if ((p = XSetLocaleModifiers ("")) && *p 1325 if ((p = XSetLocaleModifiers ("")) && *p
1292 && rxvt_IM_get_IC (aR)) 1326 && GET_R->IM_get_IC ())
1293 goto done; 1327 goto done;
1294 1328
1295/* 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 */
1296 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1330 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1297 && rxvt_IM_get_IC (aR) == True) 1331 && GET_R->IM_get_IC () == True)
1298 goto done; 1332 goto done;
1299 1333
1300done: 1334done:
1301#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1335#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1302 if (R->rs[Rs_imLocale]) 1336 if (GET_R->rs[Rs_imLocale])
1303 setlocale (LC_CTYPE, R->locale); 1337 setlocale (LC_CTYPE, GET_R->locale);
1304#endif 1338#endif
1305} 1339}
1306 1340
1307/* EXTPROTO */
1308void 1341void
1309rxvt_IMSetStatusPosition(pR) 1342rxvt_term::IMSetStatusPosition ()
1310{ 1343{
1311 XRectangle preedit_rect, status_rect, *needed_rect; 1344 XRectangle preedit_rect, status_rect, *needed_rect;
1312 XVaNestedList preedit_attr, status_attr; 1345 XVaNestedList preedit_attr, status_attr;
1313 1346
1314 if (R->Input_Context == NULL 1347 if (Input_Context == NULL
1315 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1348 || !TermWin.focus || !(input_style & XIMPreeditArea)
1316 || !rxvt_IMisRunning(aR)) 1349 || !IMisRunning ())
1317 return; 1350 return;
1318 1351
1319/* Getting the necessary width of preedit area */ 1352 /* Getting the necessary width of preedit area */
1320 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1353 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1321 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1354 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL);
1322 XFree(status_attr); 1355 XFree(status_attr);
1323 1356
1324 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1357 set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1325 1358
1326 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1359 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1327 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1360 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1328 1361
1329 XSetICValues(R->Input_Context, 1362 XSetICValues(Input_Context,
1330 XNPreeditAttributes, preedit_attr, 1363 XNPreeditAttributes, preedit_attr,
1331 XNStatusAttributes, status_attr, NULL); 1364 XNStatusAttributes, status_attr, NULL);
1332 1365
1333 XFree(preedit_attr); 1366 XFree(preedit_attr);
1334 XFree(status_attr); 1367 XFree(status_attr);
1335} 1368}
1336#endif /* USE_XIM */ 1369#endif /* USE_XIM */
1337 1370
1338/*----------------------------------------------------------------------*/ 1371/*----------------------------------------------------------------------*/
1339rxvt_t rxvt_current_term; 1372rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines