ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.26 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.67 by pcg, Sun May 9 18:19:49 2004 UTC

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

Diff Legend

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