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.26 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.33 by pcg, Fri Feb 13 13:28:17 2004 UTC

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

Diff Legend

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