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.19 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.36 by pcg, Sat Feb 21 20:33:40 2004 UTC

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

Diff Legend

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