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.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.27 by pcg, Mon Feb 9 07:11:49 2004 UTC

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

Diff Legend

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