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.25 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.35 by pcg, Fri Feb 20 23:01:45 2004 UTC

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

Diff Legend

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