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.16 by pcg, Thu Dec 18 07:31:19 2003 UTC vs.
Revision 1.33 by pcg, Fri Feb 13 13:28:17 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines