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

Diff Legend

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