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.22 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.33 by pcg, Fri Feb 13 13:28:17 2004 UTC

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

Diff Legend

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