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

Diff Legend

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