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.7 by pcg, Wed Nov 26 10:42:34 2003 UTC vs.
Revision 1.31 by pcg, Fri Feb 13 12:11:05 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines