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.5 by pcg, Tue Nov 25 15:44:38 2003 UTC vs.
Revision 1.28 by pcg, Mon Feb 9 22:45:29 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines