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.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.33 by pcg, Fri Feb 13 13:28:17 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines