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.6 by pcg, Tue Nov 25 17:11:33 2003 UTC vs.
Revision 1.29 by pcg, Wed Feb 11 08:13:45 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines