[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.334 by sf-exg, Fri Oct 22 16:49:26 2010 UTC vs.
Revision 1.400 by sf-exg, Tue Jun 28 21:56:17 2016 UTC

…		…
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-2008 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
		17	* Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
17	*	18	*
18	* This program is free software; you can redistribute it and/or modify	19	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	20	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	21	* the Free Software Foundation; either version 3 of the License, or
21	* (at your option) any later version.	22	* (at your option) any later version.
22	*	23	*
23	* This program is distributed in the hope that it will be useful,	24	* This program is distributed in the hope that it will be useful,
24	* but WITHOUT ANY WARRANTY; without even the implied warranty of	25	* but WITHOUT ANY WARRANTY; without even the implied warranty of
25	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	26	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
…		…
36	#include "keyboard.h"	37	#include "keyboard.h"
37	#include "rxvtperl.h"	38	#include "rxvtperl.h"
38		39
39	#include <limits>	40	#include <limits>
40		41
41	#include <cassert>	42	#include <assert.h>
42	#include <csignal>	43	#include <signal.h>
43	#include <cstring>	44	#include <string.h>
44		45
45	#include <termios.h>	46	#include <termios.h>
46		47
47	#ifdef HAVE_XSETLOCALE	48	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	49	# define X_LOCALE
49	# include <X11/Xlocale.h>	50	# include <X11/Xlocale.h>
50	#else	51	#else
51	# ifdef HAVE_SETLOCALE
52	# include <clocale>	52	# include <locale.h>
53	# endif
54	#endif	53	#endif
55		54
56	struct termios rxvt_term::def_tio;	55	struct termios rxvt_term::def_tio;
57	vector<rxvt_term *> rxvt_term::termlist;	56	vector<rxvt_term *> rxvt_term::termlist;
58		57
…		…
96	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	95	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97	{	96	{
98	compose_char *cc;	97	compose_char *cc;
99		98
100	// break compose chains, as stupid readline really likes to duplicate	99	// break compose chains, as stupid readline really likes to duplicate
101	// composing characters for some reason near the end of a line.	100	// composing characters for some reason, near the end of a line.
102	cc = (*this)[c1];	101	cc = (*this)[c1];
103	while (cc)	102	while (cc)
104	{	103	{
105	if (cc->c2 == c2) return c1;	104	if (cc->c2 == c2) return c1;
106	cc = (*this)[cc->c1];	105	cc = (*this)[cc->c1];
107	}	106	}
108		107
109	// check to see whether this combination already exists otherwise	108	// check to see whether this combination already exists otherwise
110	for (cc = v.end (); cc-- > v.begin (); )	109	for (cc = v.begin (); cc < v.end (); cc++)
111	{
112	if (cc->c1 == c1 && cc->c2 == c2)	110	if (cc->c1 == c1 && cc->c2 == c2)
113	return COMPOSE_LO + (cc - v.begin ());	111	return COMPOSE_LO + (cc - v.begin ());
114	}
115		112
116	// allocate a new combination	113	// allocate a new combination
117	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	114	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118	{	115	{
119	static int seen;	116	static int seen;
120		117
121	if (!seen++)	118	if (!seen++)
122	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	119	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123		120
124	return REPLACEMENT_CHAR;	121	return REPLACEMENT_CHAR;
125	}	122	}
126		123
127	v.push_back (compose_char (c1, c2));	124	v.push_back (compose_char (c1, c2));
…		…
172	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
173	#endif	170	#endif
174	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
176	#endif	173	#endif
177	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
178	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179	#endif	176	#endif
180	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181	#ifdef USE_XIM	178	#if USE_XIM
182	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
183	#endif	180	#endif
184	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
185	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
186	#endif	183	#endif
…		…
189	#endif	186	#endif
190	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	191	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	192	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197		193
198	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	194	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199		195
…		…
228	delete fontset[i];	224	delete fontset[i];
229	#endif	225	#endif
230	delete fontset[0];	226	delete fontset[0];
231		227
232	#ifdef HAVE_BG_PIXMAP	228	#ifdef HAVE_BG_PIXMAP
233	bgPixmap.destroy ();	229	bg_destroy ();
234	#endif	230	#endif
235	#ifdef HAVE_AFTERIMAGE	231
236	if (asv)	232	#if HAVE_IMG
237	destroy_asvisual (asv, 0);	233	delete bg_img;
238	if (asimman)
239	destroy_image_manager (asimman, 0);
240	#endif	234	#endif
241		235
242	if (display)	236	if (display)
243	{	237	{
244	selection_clear ();	238	selection_clear ();
245	selection_clear (true);	239	selection_clear (true);
246		240
247	#ifdef USE_XIM	241	#if USE_XIM
248	im_destroy ();	242	im_destroy ();
249	#endif	243	#endif
250	scrollBar.destroy ();	244	scrollBar.destroy ();
		245
		246	if (gc)
251	if (gc) XFreeGC (dpy, gc);	247	XFreeGC (dpy, gc);
252		248
253	delete drawable;	249	delete drawable;
		250
254	// destroy all windows	251	// destroy all windows
255	if (parent[0])	252	if (parent)
256	XDestroyWindow (dpy, parent[0]);	253	XDestroyWindow (dpy, parent);
257		254
258	for (int i = 0; i < TOTAL_COLORS; i++)	255	for (int i = 0; i < TOTAL_COLORS; i++)
259	if (ISSET_PIXCOLOR (i))	256	if (ISSET_PIXCOLOR (i))
260	{	257	{
261	pix_colors_focused [i].free (this);	258	pix_colors_focused [i].free (this);
262	#if OFF_FOCUS_FADING	259	#if OFF_FOCUS_FADING
		260	if (rs[Rs_fade])
263	pix_colors_unfocused [i].free (this);	261	pix_colors_unfocused [i].free (this);
264	#endif	262	#endif
265	}	263	}
266		264
267	clear ();	265	clear ();
268		266
…		…
276	for (int i = 0; i < allocated.size (); i++)	274	for (int i = 0; i < allocated.size (); i++)
277	free (allocated [i]);	275	free (allocated [i]);
278		276
279	free (selection.text);	277	free (selection.text);
280	free (selection.clip_text);	278	free (selection.clip_text);
281	// TODO: manage env vars in child only(!)
282	free (env_display);
283	free (env_term);
284	free (locale);	279	free (locale);
285	free (v_buffer);	280	free (v_buffer);
286	free (incr_buf);	281
		282	delete selection_req;
		283
		284	if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
		285	rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
		286
		287	delete [] env;
287		288
288	delete envv;	289	delete envv;
289	delete argv;	290	delete argv;
290		291
291	#ifdef KEYSYM_RESOURCE	292	#ifdef KEYSYM_RESOURCE
292	delete keyboard;	293	delete keyboard;
293	#endif	294	#endif
294	#ifndef NO_RESOURCES	295	#ifndef NO_RESOURCES
295	XrmDestroyDatabase (option_db);	296	XrmDestroyDatabase (option_db);
296	#endif	297	#endif
		298
		299	SET_R ((rxvt_term *)0);
297	}	300	}
298		301
299	// child has exited, usually destroys	302	// child has exited, usually destroys
300	void	303	void
301	rxvt_term::child_cb (ev::child &w, int status)	304	rxvt_term::child_cb (ev::child &w, int status)
…		…
324	{	327	{
325	#if USE_XIM	328	#if USE_XIM
326	im_ev.stop (display);	329	im_ev.stop (display);
327	#endif	330	#endif
328	scrollbar_ev.stop (display);	331	scrollbar_ev.stop (display);
329	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	332	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
330	rootwin_ev.stop (display);	333	rootwin_ev.stop (display);
331	#endif	334	#endif
332	incr_ev.stop ();
333	termwin_ev.stop (display);	335	termwin_ev.stop (display);
334	vt_ev.stop (display);	336	vt_ev.stop (display);
335	}	337	}
336		338
337	flush_ev.stop ();	339	flush_ev.stop ();
…		…
361	make_current ();	363	make_current ();
362		364
363	delete this;	365	delete this;
364	}	366	}
365		367
		368	void
		369	rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
		370	{
		371	if (!opt)
		372	return;
		373
		374	uint8_t mask = 1 << (opt & 7);
		375	uint8_t &val = options [opt >> 3];
		376
		377	val = val & ~mask \| (set ? mask : 0);
		378	}
		379
366	/----------------------------------------------------------------------/	380	/----------------------------------------------------------------------/
367	/*	381	/*
368	* Exit gracefully, clearing the utmp entry and restoring tty attributes	382	* Exit gracefully, clearing the utmp entry and restoring tty attributes
369	* TODO: if debugging, this should free up any known resources if we can
370	*/	383	*/
371	static XErrorHandler old_xerror_handler;	384	static XErrorHandler old_xerror_handler;
372		385
373	static void	386	static void
374	rxvt_emergency_cleanup ()	387	rxvt_emergency_cleanup ()
…		…
376	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	389	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
377	(*t)->emergency_cleanup ();	390	(*t)->emergency_cleanup ();
378	}	391	}
379		392
380	#if !ENABLE_MINIMAL	393	#if !ENABLE_MINIMAL
381	static void	394	static void ecb_cold
382	print_x_error (Display dpy, XErrorEvent event)	395	print_x_error (Display dpy, XErrorEvent event)
383	{	396	{
384	char buffer[BUFSIZ];	397	char buffer[BUFSIZ];
385	char mesg[BUFSIZ];	398	char mesg[BUFSIZ];
386	char number[32];	399	char number[32];
387	char *mtype = "XlibMessage";	400
388	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390	rxvt_warn ("An X Error occurred, trying to continue after report.\n");	401	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
		402
		403	XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
		404	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
		405
		406	XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
		407	XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
391	rxvt_warn ("%s: %s\n", mesg, buffer);	408	rxvt_warn ("+ %s: %s\n", mesg, buffer);
		409
392	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	410	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	411	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
		412
		413	if (event->request_code >= 128)
		414	{
		415	#if 0
		416	/* XListExtensions and probably query extensions hangs when there are multiple queues errors */
		417	int nexts;
		418	char **exts = XListExtensions (dpy, &nexts);
		419
		420	while (nexts)
		421	{
		422	char *extname = exts [nexts - 1];
		423	int major, first_event, first_error;
		424
		425	if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
		426	{
		427	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		428	rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
		429
		430	snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
		431	XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
		432	rxvt_warn ("+ (which is %s)\n", buffer);
		433
		434	break;
		435	}
		436
		437	printf ("nextss %d %s\n", nexts, extname);//D
		438	--nexts;
		439	++exts;
		440	}
		441	#else
		442	int nexts = 0;
		443	char **exts = 0;
		444	#endif
		445
		446	if (!nexts)
		447	{
		448	rxvt_warn ("+ (which is an unknown extension)\n", buffer);
		449
		450	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		451	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
		452
		453	#if 0
		454	sprintf (number, "RENDER.%d", event->minor_code);
		455	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
		456	rxvt_warn ("+ (which is %s)\n", buffer);
		457	#endif
		458	}
		459
		460	XFreeExtensionList (exts);
		461	}
		462	else
		463	{
394	sprintf(number, "%d", event->request_code);	464	sprintf (number, "%d", event->request_code);
395	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	465	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
396	rxvt_warn ("(which is %s)\n", buffer);	466	rxvt_warn ("+ (which is %s)\n", buffer);
397	if (event->request_code >= 128) {
398	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
399	mesg, BUFSIZ);
400	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
401	}	467	}
		468
402	if ((event->error_code == BadWindow) \|\|	469	if (event->error_code == BadWindow
403	(event->error_code == BadPixmap) \|\|	470	\|\| event->error_code == BadPixmap
404	(event->error_code == BadCursor) \|\|	471	\|\| event->error_code == BadCursor
405	(event->error_code == BadFont) \|\|	472	\|\| event->error_code == BadFont
406	(event->error_code == BadDrawable) \|\|	473	\|\| event->error_code == BadDrawable
407	(event->error_code == BadColor) \|\|	474	\|\| event->error_code == BadColor
408	(event->error_code == BadGC) \|\|	475	\|\| event->error_code == BadGC
409	(event->error_code == BadIDChoice) \|\|	476	\|\| event->error_code == BadIDChoice
410	(event->error_code == BadValue) \|\|	477	\|\| event->error_code == BadValue
411	(event->error_code == BadAtom)) {	478	\|\| event->error_code == BadAtom)
		479	{
412	if (event->error_code == BadValue)	480	if (event->error_code == BadValue)
413	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	481	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414	mesg, BUFSIZ);
415	else if (event->error_code == BadAtom)	482	else if (event->error_code == BadAtom)
416	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	483	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417	mesg, BUFSIZ);
418	else	484	else
419	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	485	XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420	mesg, BUFSIZ);
421	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422	}
423	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
424	mesg, BUFSIZ);
425	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426	}
427	#endif
428		486
429	int	487	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
		488	}
		489	}
		490	#endif
		491
		492	int ecb_cold
430	rxvt_xerror_handler (Display display, XErrorEvent event)	493	rxvt_xerror_handler (Display display, XErrorEvent event)
431	{	494	{
432	if (GET_R->allowedxerror == -1)	495	if (GET_R && GET_R->allowedxerror == -1)
433	GET_R->allowedxerror = event->error_code;	496	GET_R->allowedxerror = event->error_code;
434	else	497	else
435	{	498	{
436	// GET_R is most likely not the terminal which caused the error,	499	// GET_R is most likely not the terminal which caused the error,
437	// so just output the error and continue	500	// so just output the error and continue
…		…
443	}	506	}
444		507
445	return 0;	508	return 0;
446	}	509	}
447		510
448	int	511	int ecb_cold
449	rxvt_xioerror_handler (Display *display)	512	rxvt_xioerror_handler (Display *display)
450	{	513	{
451	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",	514	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452	DisplayString (display));	515	DisplayString (display));
453	rxvt_emergency_cleanup ();	516	rxvt_emergency_cleanup ();
…		…
511	tio->c_cc[VWERSE] = CWERASE;	574	tio->c_cc[VWERSE] = CWERASE;
512	# endif	575	# endif
513	# ifdef VLNEXT	576	# ifdef VLNEXT
514	tio->c_cc[VLNEXT] = CLNEXT;	577	tio->c_cc[VLNEXT] = CLNEXT;
515	# endif	578	# endif
		579	# ifdef VSTATUS
		580	tio->c_cc[VSTATUS] = CSTATUS;
		581	# endif
516		582
517	# if VMIN != VEOF	583	# if VMIN != VEOF
518	tio->c_cc[VMIN] = 1;	584	tio->c_cc[VMIN] = 1;
519	# endif	585	# endif
520	# if VTIME != VEOL	586	# if VTIME != VEOL
…		…
554		620
555	// get rid of stdin/stdout as we don't need them, to free resources	621	// get rid of stdin/stdout as we don't need them, to free resources
556	dup2 (STDERR_FILENO, STDIN_FILENO);	622	dup2 (STDERR_FILENO, STDIN_FILENO);
557	dup2 (STDERR_FILENO, STDOUT_FILENO);	623	dup2 (STDERR_FILENO, STDOUT_FILENO);
558		624
559	ptytty::init ();
560
561	if (!ev_default_loop ())	625	if (!ev_default_loop ())
562	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	626	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
563		627
564	rxvt_environ = environ;	628	rxvt_environ = environ;
565		629
…		…
572	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	636	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
573	// TODO: handle this with exceptions and tolerate the memory loss	637	// TODO: handle this with exceptions and tolerate the memory loss
574	XSetIOErrorHandler (rxvt_xioerror_handler);	638	XSetIOErrorHandler (rxvt_xioerror_handler);
575		639
576	XrmInitialize ();	640	XrmInitialize ();
		641
		642	#if HAVE_PIXBUF
		643	g_type_init ();
		644	#endif
577	}	645	}
578		646
579	/----------------------------------------------------------------------/	647	/----------------------------------------------------------------------/
580	/*	648	/*
581	* window size/position calculations for XSizeHint and other storage.	649	* window size/position calculations for XSizeHint and other storage.
…		…
702	if (recalc_y)	770	if (recalc_y)
703	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	771	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
704		772
705	ncol = width / fwidth;	773	ncol = width / fwidth;
706	nrow = height / fheight;	774	nrow = height / fheight;
		775
		776	// When the size of the vt window is not a multiple of the cell
		777	// size, i.e., when the wm does not honour our size hints, there are
		778	// extra areas not covered by the terminal screen. Such gaps, when a
		779	// bg pixmap is set, would have to be cleared manually to properly
		780	// refresh the background. We take the simpler route and shrink the
		781	// vt window so as to avoid creating gaps.
		782	vt_width = ncol * fwidth;
		783	vt_height = nrow * fheight;
707	}	784	}
708		785
709	/----------------------------------------------------------------------/	786	/----------------------------------------------------------------------/
710	/*	787	/*
711	* Tell the teletype handler what size the window is.	788	* Tell the teletype handler what size the window is.
…		…
719		796
720	struct winsize ws;	797	struct winsize ws;
721		798
722	ws.ws_col = ncol;	799	ws.ws_col = ncol;
723	ws.ws_row = nrow;	800	ws.ws_row = nrow;
724	ws.ws_xpixel = width;	801	ws.ws_xpixel = vt_width;
725	ws.ws_ypixel = height;	802	ws.ws_ypixel = vt_height;
726	ioctl (pty->pty, TIOCSWINSZ, &ws);	803	ioctl (pty->pty, TIOCSWINSZ, &ws);
727		804
728	#if 0	805	#if 0
729	// TIOCSWINSZ is supposed to do this automatically and correctly	806	// TIOCSWINSZ is supposed to do this automatically and correctly
730	if (cmd_pid) /* force through to the command */	807	if (cmd_pid) /* force through to the command */
731	kill (-cmd_pid, SIGWINCH);	808	kill (-cmd_pid, SIGWINCH);
732	#endif	809	#endif
733	}	810	}
734		811
735	/----------------------------------------------------------------------/	812	/----------------------------------------------------------------------/
736	/* set_fonts () - load and set the various fonts	813	/* load and set the various fonts */
737	*
738	* init = 1 - initialize
739	*
740	* fontname == FONT_UP - switch to bigger font
741	* fontname == FONT_DN - switch to smaller font
742	*/
743	bool	814	bool
744	rxvt_term::set_fonts ()	815	rxvt_term::set_fonts ()
745	{	816	{
746	rxvt_fontset *fs = new rxvt_fontset (this);	817	rxvt_fontset *fs = new rxvt_fontset (this);
747	rxvt_fontprop prop;	818	rxvt_fontprop prop;
…		…
762		833
763	delete fontset[0];	834	delete fontset[0];
764	fontset[0] = fs;	835	fontset[0] = fs;
765		836
766	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	837	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
767	prop.height += lineSpace;	838	prop.width = max (prop.width + letterSpace, 1);
768	prop.width += letterSpace;
769		839
770	fs->set_prop (prop, false);	840	fs->set_prop (prop, false);
771		841
772	fwidth = prop.width;	842	fwidth = prop.width;
773	fheight = prop.height;	843	fheight = prop.height + lineSpace;
774	fbase = prop.ascent;	844	fbase = prop.ascent;
775		845
776	for (int style = 1; style < 4; style++)	846	for (int style = 1; style < 4; style++)
777	{	847	{
778	#if ENABLE_STYLES	848	#if ENABLE_STYLES
…		…
804	#else	874	#else
805	fontset[style] = fontset[0];	875	fontset[style] = fontset[0];
806	#endif	876	#endif
807	}	877	}
808		878
809	if (parent[0])	879	if (parent)
810	{	880	{
811	resize_all_windows (0, 0, 0);	881	resize_all_windows (0, 0, 0);
812	scr_remap_chars ();	882	scr_remap_chars ();
813	scr_touch (true);	883	scr_touch (true);
814	}	884	}
…		…
817	}	887	}
818		888
819	void	889	void
820	rxvt_term::set_string_property (Atom prop, const char *str, int len)	890	rxvt_term::set_string_property (Atom prop, const char *str, int len)
821	{	891	{
822	XChangeProperty (dpy, parent[0],	892	XChangeProperty (dpy, parent,
823	prop, XA_STRING, 8, PropModeReplace,	893	prop, XA_STRING, 8, PropModeReplace,
824	(const unsigned char *)str, len >= 0 ? len : strlen (str));	894	(const unsigned char *)str, len >= 0 ? len : strlen (str));
825	}	895	}
826		896
827	void	897	void
…		…
829	{	899	{
830	XTextProperty ct;	900	XTextProperty ct;
831		901
832	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)	902	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
833	{	903	{
834	XSetTextProperty (dpy, parent[0], &ct, prop);	904	XSetTextProperty (dpy, parent, &ct, prop);
835	XFree (ct.value);	905	XFree (ct.value);
836	}	906	}
837	}	907	}
838		908
839	void	909	void
840	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	910	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
841	{	911	{
842	wchar_t *ws = rxvt_mbstowcs (str, len);	912	wchar_t *ws = rxvt_mbstowcs (str, len);
843	char *s = rxvt_wcstoutf8 (ws);	913	char *s = rxvt_wcstoutf8 (ws);
844		914
845	XChangeProperty (dpy, parent[0],	915	XChangeProperty (dpy, parent,
846	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	916	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
847	(const unsigned char *)s, strlen (s));	917	(const unsigned char *)s, strlen (s));
848		918
849	free (s);	919	free (s);
850	free (ws);	920	free (ws);
…		…
873		943
874	void	944	void
875	rxvt_term::set_window_color (int idx, const char *color)	945	rxvt_term::set_window_color (int idx, const char *color)
876	{	946	{
877	#ifdef XTERM_COLOR_CHANGE	947	#ifdef XTERM_COLOR_CHANGE
878	rxvt_color xcol;
879
880	if (color == NULL \|\| *color == '\0')	948	if (color == NULL \|\| *color == '\0')
881	return;	949	return;
882		950
883	color = strdup (color);	951	color = strdup (color);
884	allocated.push_back ((void *)color);	952	allocated.push_back ((void *)color);
…		…
890	int i = atoi (color);	958	int i = atoi (color);
891		959
892	if (i >= 8 && i <= 15)	960	if (i >= 8 && i <= 15)
893	{	961	{
894	/* bright colors */	962	/* bright colors */
895	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	963	alias_color (idx, minBrightCOLOR + i - 8);
896	goto done;	964	goto done;
897	}	965	}
898		966
899	if (i >= 0 && i <= 7)	967	if (i >= 0 && i <= 7)
900	{	968	{
901	/* normal colors */	969	/* normal colors */
902	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	970	alias_color (idx, minCOLOR + i);
903	goto done;	971	goto done;
904	}	972	}
905	}	973	}
906		974
907	set_color (xcol, color);	975	pix_colors_focused[idx].free (this);
908		976	set_color (pix_colors_focused[idx], color);
909	/*
910	* FIXME: should free colors here, but no idea how to do it so instead,
911	* so just keep gobbling up the colormap
912	*/
913
914	pix_colors_focused[idx] = xcol;
915		977
916	done:	978	done:
917	/TODO: handle Color_BD, scrollbar background, etc. /	979	/TODO: handle Color_BD, scrollbar background, etc. /
918		980
919	update_fade_color (idx);	981	update_fade_color (idx);
920	recolour_cursor ();	982	recolor_cursor ();
921	scr_recolour ();	983	scr_recolor ();
922	#endif /* XTERM_COLOR_CHANGE */	984	#endif /* XTERM_COLOR_CHANGE */
923	}	985	}
924		986
925	void	987	void
926	rxvt_term::recolour_cursor ()	988	rxvt_term::recolor_cursor ()
927	{	989	{
928	XColor fg, bg;	990	XColor fg, bg;
929		991
930	(ISSET_PIXCOLOR (Color_pointer_fg)	992	(ISSET_PIXCOLOR (Color_pointer_fg)
931	? pix_colors_focused[Color_pointer_fg]	993	? pix_colors_focused[Color_pointer_fg]
…		…
940		1002
941	/----------------------------------------------------------------------/	1003	/----------------------------------------------------------------------/
942	/*	1004	/*
943	* find if fg/bg matches any of the normal (low-intensity) colors	1005	* find if fg/bg matches any of the normal (low-intensity) colors
944	*/	1006	*/
945	void	1007	char *
946	rxvt_term::set_colorfgbg ()	1008	rxvt_term::get_colorfgbg ()
947	{	1009	{
948	unsigned int i;	1010	unsigned int i;
949	const char *xpmb = "";	1011	const char *xpmb = "";
950	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1012	char fstr[] = "default";
		1013	char bstr[] = "default";
		1014	char *env_colorfgbg;
951		1015
952	strcpy (fstr, "default");
953	strcpy (bstr, "default");
954	for (i = Color_Black; i <= Color_White; i++)	1016	for (i = Color_Black; i <= Color_White; i++)
955	if (pix_colors[Color_fg] == pix_colors[i])	1017	if (pix_colors[Color_fg] == pix_colors[i])
956	{	1018	{
957	sprintf (fstr, "%d", (i - Color_Black));	1019	sprintf (fstr, "%d", i - Color_Black);
958	break;	1020	break;
959	}	1021	}
960		1022
961	for (i = Color_Black; i <= Color_White; i++)	1023	for (i = Color_Black; i <= Color_White; i++)
962	if (pix_colors[Color_bg] == pix_colors[i])	1024	if (pix_colors[Color_bg] == pix_colors[i])
963	{	1025	{
964	sprintf (bstr, "%d", (i - Color_Black));	1026	sprintf (bstr, "%d", i - Color_Black);
965	#ifdef BG_IMAGE_FROM_FILE	1027	#if BG_IMAGE_FROM_FILE
966	xpmb = "default;";	1028	xpmb = "default;";
967	#endif	1029	#endif
968	break;	1030	break;
969	}	1031	}
970		1032
		1033	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
971	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1034	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
		1035	return env_colorfgbg;
972	}	1036	}
973		1037
974	/----------------------------------------------------------------------/	1038	/----------------------------------------------------------------------/
975		1039
976	bool	1040	bool
…		…
984	}	1048	}
985		1049
986	void	1050	void
987	rxvt_term::alias_color (int dst, int src)	1051	rxvt_term::alias_color (int dst, int src)
988	{	1052	{
		1053	pix_colors[dst].free (this);
989	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);	1054	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
990	}	1055	}
		1056
		1057	#ifdef SMART_RESIZE
		1058	static unsigned int
		1059	get_parent_bw (Display *dpy, Window w)
		1060	{
		1061	int idummy;
		1062	unsigned int udummy;
		1063	Window wdummy, parent;
		1064	Window *children;
		1065	unsigned int nchildren, border_width;
		1066
		1067	XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
		1068	XFree (children);
		1069	XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
		1070	&udummy, &udummy, &border_width, &udummy);
		1071
		1072	return border_width;
		1073	}
		1074	#endif
991		1075
992	/* -------------------------------------------------------------------- *	1076	/* -------------------------------------------------------------------- *
993	* - WINDOW RESIZING - *	1077	* - WINDOW RESIZING - *
994	* -------------------------------------------------------------------- */	1078	* -------------------------------------------------------------------- */
995	void	1079	void
…		…
1005		1089
1006	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow	1090	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1007	if (set_hint)	1091	if (set_hint)
1008	{	1092	{
1009	szHint.flags &= ~(PBaseSize \| PResizeInc);	1093	szHint.flags &= ~(PBaseSize \| PResizeInc);
1010	XSetWMNormalHints (dpy, parent[0], &szHint);	1094	XSetWMNormalHints (dpy, parent, &szHint);
1011	szHint.flags \|= PBaseSize \| PResizeInc;	1095	szHint.flags \|= PBaseSize \| PResizeInc;
1012	}	1096	}
1013		1097
1014	if (!ignoreparent)	1098	if (!ignoreparent)
1015	{	1099	{
…		…
1021	int x, y, x1, y1;	1105	int x, y, x1, y1;
1022	int dx, dy;	1106	int dx, dy;
1023	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1107	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1024	Window unused_cr;	1108	Window unused_cr;
1025		1109
1026	XTranslateCoordinates (dpy, parent[0], display->root,	1110	XTranslateCoordinates (dpy, parent, display->root,
1027	0, 0, &x, &y, &unused_cr);	1111	0, 0, &x, &y, &unused_cr);
1028	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1112	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1029	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1113	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1030	/*	1114	/*
1031	* if display->root isn't the parent window, a WM will probably have offset	1115	* if display->root isn't the parent window, a WM will probably have offset
1032	* our position for handles and decorations. Counter it	1116	* our position for handles and decorations. Counter it
1033	*/	1117	*/
1034	if (x1 != x \|\| y1 != y)	1118	if (x1 != x \|\| y1 != y)
1035	{	1119	{
1036	x -= x1;	1120	unsigned int border_width = get_parent_bw (dpy, parent);
1037	y -= y1;	1121
		1122	x -= x1 + border_width;
		1123	y -= y1 + border_width;
1038	}	1124	}
1039		1125
1040	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;	1126	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1041	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;	1127	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1042	dx = old_width - szHint.width;	1128	dx = old_width - szHint.width;
…		…
1050	if (y < y1) /* top half */	1136	if (y < y1) /* top half */
1051	dy = 0;	1137	dy = 0;
1052	else if (y == y1) /* exact center */	1138	else if (y == y1) /* exact center */
1053	dy /= 2;	1139	dy /= 2;
1054		1140
1055	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1141	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1056	szHint.width, szHint.height);	1142	szHint.width, szHint.height);
1057	#else	1143	#else
1058	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1144	XResizeWindow (dpy, parent, szHint.width, szHint.height);
1059	#endif	1145	#endif
1060	}	1146	}
1061		1147
1062	if (set_hint)	1148	if (set_hint)
1063	XSetWMNormalHints (dpy, parent[0], &szHint);	1149	XSetWMNormalHints (dpy, parent, &szHint);
1064		1150
1065	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1151	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1066		1152
1067	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1153	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1068	{	1154	{
1069	if (scrollBar.state)	1155	if (scrollBar.state)
1070	scrollBar.resize ();	1156	scrollBar.resize ();
1071		1157
1072	XMoveResizeWindow (dpy, vt,	1158	XMoveResizeWindow (dpy, vt,
1073	window_vt_x, window_vt_y,	1159	window_vt_x, window_vt_y,
1074	width, height);	1160	vt_width, vt_height);
		1161
		1162	HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1075		1163
1076	#ifdef HAVE_BG_PIXMAP	1164	#ifdef HAVE_BG_PIXMAP
1077	if (bgPixmap.window_size_sensitive ())	1165	if (bg_window_size_sensitive ())
1078	update_background ();	1166	update_background ();
1079	#endif	1167	#endif
1080	}	1168	}
1081		1169
1082	if (fix_screen \|\| old_height == 0)	1170	if (fix_screen \|\| old_height == 0)
1083	scr_reset ();	1171	scr_reset ();
1084		1172
1085	#ifdef HAVE_BG_PIXMAP
1086	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1087	// if (bgPixmap.pixmap)
1088	// scr_touch (false);
1089	#endif
1090
1091	#ifdef USE_XIM	1173	#if USE_XIM
1092	IMSetPosition ();	1174	im_set_position ();
1093	#endif	1175	#endif
1094	}	1176	}
1095		1177
1096	/*	1178	/*
1097	* Set the width/height of the vt window in characters. Units are pixels.	1179	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1110	newwidth = wattr.width - szHint.base_width;	1192	newwidth = wattr.width - szHint.base_width;
1111	if (newheight == 0)	1193	if (newheight == 0)
1112	newheight = wattr.height - szHint.base_height;	1194	newheight = wattr.height - szHint.base_height;
1113	}	1195	}
1114		1196
1115	if (newwidth != width \|\| newheight != height)	1197	if (newwidth != vt_width \|\| newheight != vt_height)
1116	{	1198	{
1117	newwidth += szHint.base_width;	1199	newwidth += szHint.base_width;
1118	newheight += szHint.base_height;	1200	newheight += szHint.base_height;
1119	resize_all_windows (newwidth, newheight, 0);	1201	resize_all_windows (newwidth, newheight, 0);
1120	}	1202	}
1121	}	1203	}
1122		1204
1123	/* -------------------------------------------------------------------- *	1205	/* -------------------------------------------------------------------- *
1124	* - X INPUT METHOD ROUTINES - *	1206	* - X INPUT METHOD ROUTINES - *
1125	* -------------------------------------------------------------------- */	1207	* -------------------------------------------------------------------- */
1126	#ifdef USE_XIM	1208	#if USE_XIM
1127		1209
1128	void	1210	void
1129	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1211	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130	{	1212	{
1131	fg = pix_colors [Color_fg];	1213	fg = pix_colors [Color_fg];
…		…
1158	status_rect.height = fheight;	1240	status_rect.height = fheight;
1159	}	1241	}
1160		1242
1161	/* Checking whether input method is running. */	1243	/* Checking whether input method is running. */
1162	bool	1244	bool
1163	rxvt_term::IMisRunning ()	1245	rxvt_term::im_is_running ()
1164	{	1246	{
1165	Atom atom;	1247	Atom atom;
1166	Window win;	1248	Window win;
1167	char server[IMBUFSIZ];	1249	char server[IMBUFSIZ];
1168		1250
…		…
1177		1259
1178	atom = XInternAtom (dpy, server, False);	1260	atom = XInternAtom (dpy, server, False);
1179	win = XGetSelectionOwner (dpy, atom);	1261	win = XGetSelectionOwner (dpy, atom);
1180		1262
1181	if (win != None)	1263	if (win != None)
1182	return True;	1264	return true;
1183	}	1265	}
1184		1266
1185	return False;	1267	return false;
1186	}	1268	}
1187		1269
1188	void	1270	void
1189	rxvt_term::IMSendSpot ()	1271	rxvt_term::im_send_spot ()
1190	{	1272	{
1191	XPoint nspot;	1273	XPoint nspot;
1192	XVaNestedList preedit_attr;	1274	XVaNestedList preedit_attr;
1193		1275
1194	if (!Input_Context	1276	if (!Input_Context
…		…
1300	/*	1382	/*
1301	* Try to open a XIM with the current modifiers, then see if we can	1383	* Try to open a XIM with the current modifiers, then see if we can
1302	* open a suitable preedit type	1384	* open a suitable preedit type
1303	*/	1385	*/
1304	bool	1386	bool
1305	rxvt_term::IM_get_IC (const char *modifiers)	1387	rxvt_term::im_get_ic (const char *modifiers)
1306	{	1388	{
1307	int i, j, found;	1389	int i, j, found;
1308	XIM xim;	1390	XIM xim;
1309	XPoint spot;	1391	XPoint spot;
1310	XRectangle rect, status_rect, needed_rect;	1392	XRectangle rect, status_rect, needed_rect;
1311	unsigned long fg, bg;	1393	unsigned long fg, bg;
1312	const char *p;	1394	const char *p;
1313	char **s;	1395	char **s;
1314	XIMStyles *xim_styles;	1396	XIMStyles *xim_styles;
1315	#ifdef ENABLE_XIM_ONTHESPOT
1316	XIMCallback xcb[4];
1317	#endif
1318		1397
1319	set_environ (envv);	1398	set_environ (env);
1320		1399
1321	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1400	if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1322	return false;	1401	return false;
1323		1402
1324	input_method = display->get_xim (locale, modifiers);	1403	input_method = display->get_xim (locale, modifiers);
1325	if (input_method == NULL)	1404	if (input_method == NULL)
1326	return false;	1405	return false;
…		…
1343	p = pet[pi];	1422	p = pet[pi];
1344		1423
1345	if (!p)	1424	if (!p)
1346	continue;	1425	continue;
1347		1426
1348	s = rxvt_splitcommastring (p);	1427	s = rxvt_strsplit (',', p);
1349		1428
1350	for (i = found = 0; !found && s[i]; i++)	1429	for (i = found = 0; !found && s[i]; i++)
1351	{	1430	{
1352	if (!strcmp (s[i], "OverTheSpot"))	1431	if (!strcmp (s[i], "OverTheSpot"))
1353	input_style = XIMPreeditPosition \| XIMStatusNothing;	1432	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1365	input_style = XIMPreeditNothing \| XIMStatusNothing;	1444	input_style = XIMPreeditNothing \| XIMStatusNothing;
1366		1445
1367	for (j = 0; j < xim_styles->count_styles; j++)	1446	for (j = 0; j < xim_styles->count_styles; j++)
1368	if (input_style == xim_styles->supported_styles[j])	1447	if (input_style == xim_styles->supported_styles[j])
1369	{	1448	{
1370	rxvt_freecommastring (s);	1449	rxvt_free_strsplit (s);
1371		1450
1372	found = 1;	1451	found = 1;
1373	goto foundpet;	1452	goto foundpet;
1374	}	1453	}
1375		1454
1376	}	1455	}
1377		1456
1378	rxvt_freecommastring (s);	1457	rxvt_free_strsplit (s);
1379	}	1458	}
1380		1459
1381	foundpet:	1460	foundpet:
1382		1461
1383	XFree (xim_styles);	1462	XFree (xim_styles);
…		…
1462	NULL);	1541	NULL);
1463	}	1542	}
1464	#if ENABLE_XIM_ONTHESPOT	1543	#if ENABLE_XIM_ONTHESPOT
1465	else if (input_style & XIMPreeditCallbacks)	1544	else if (input_style & XIMPreeditCallbacks)
1466	{	1545	{
		1546	XIMCallback xcb[4];
		1547
1467	im_set_position (spot);	1548	im_set_position (spot);
1468		1549
1469	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1550	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1470	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1551	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1471	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1552	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1486	#endif	1567	#endif
1487		1568
1488	Input_Context = XCreateIC (xim,	1569	Input_Context = XCreateIC (xim,
1489	XNInputStyle, input_style,	1570	XNInputStyle, input_style,
1490	XNClientWindow, vt,	1571	XNClientWindow, vt,
1491	XNFocusWindow, parent[0],	1572	XNFocusWindow, parent,
1492	preedit_attr ? XNPreeditAttributes : NULL,	1573	preedit_attr ? XNPreeditAttributes : NULL,
1493	preedit_attr,	1574	preedit_attr,
1494	status_attr ? XNStatusAttributes : NULL,	1575	status_attr ? XNStatusAttributes : NULL,
1495	status_attr, NULL);	1576	status_attr, NULL);
1496		1577
…		…
1509	// unfortunately, only the focus window is used by XIM, hard to fix	1590	// unfortunately, only the focus window is used by XIM, hard to fix
1510	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1591	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1511	vt_select_input ();	1592	vt_select_input ();
1512	#endif	1593	#endif
1513		1594
1514	IMSetPosition ();	1595	im_set_position ();
1515		1596
1516	return true;	1597	return true;
1517	}	1598	}
1518		1599
1519	void	1600	void
…		…
1529	im_destroy ();	1610	im_destroy ();
1530		1611
1531	if (Input_Context)	1612	if (Input_Context)
1532	return;	1613	return;
1533		1614
1534	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1535	if (rs[Rs_imLocale])	1615	if (rs[Rs_imLocale])
1536	SET_LOCALE (rs[Rs_imLocale]);	1616	SET_LOCALE (rs[Rs_imLocale]);
1537	#endif
1538		1617
1539	p = rs[Rs_inputMethod];	1618	p = rs[Rs_inputMethod];
1540	if (p && *p)	1619	if (p && *p)
1541	{	1620	{
1542	bool found = false;	1621	bool found = false;
1543		1622
1544	s = rxvt_splitcommastring (p);	1623	s = rxvt_strsplit (',', p);
1545		1624
1546	for (i = 0; s[i]; i++)	1625	for (i = 0; s[i]; i++)
1547	{	1626	{
1548	if (*s[i])	1627	if (*s[i])
1549	{	1628	{
1550	strcpy (buf, "@im=");	1629	strcpy (buf, "@im=");
1551	strncat (buf, s[i], IMBUFSIZ - 5);	1630	strncat (buf, s[i], IMBUFSIZ - 5);
1552	if (IM_get_IC (buf))	1631	if (im_get_ic (buf))
1553	{	1632	{
1554	found = true;	1633	found = true;
1555	break;	1634	break;
1556	}	1635	}
1557	}	1636	}
1558	}	1637	}
1559		1638
1560	rxvt_freecommastring (s);	1639	rxvt_free_strsplit (s);
1561		1640
1562	if (found)	1641	if (found)
1563	goto done;	1642	goto done;
1564	}	1643	}
1565		1644
1566	/* try with XMODIFIERS env. var. */	1645	/* try with XMODIFIERS env. var. */
1567	if (IM_get_IC (""))	1646	if (im_get_ic (""))
1568	goto done;	1647	goto done;
1569		1648
1570	/* try with no modifiers base IF the user didn't specify an IM */	1649	/* try with no modifiers base IF the user didn't specify an IM */
1571	if (IM_get_IC ("@im=none"))	1650	if (im_get_ic ("@im=none"))
1572	goto done;	1651	goto done;
1573		1652
1574	done:	1653	done:
1575	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1576	if (rs[Rs_imLocale])	1654	if (rs[Rs_imLocale])
1577	SET_LOCALE (locale);	1655	SET_LOCALE (locale);
1578	#endif
1579	}	1656	}
1580		1657
1581	void	1658	void
1582	rxvt_term::IMSetPosition ()	1659	rxvt_term::im_set_position ()
1583	{	1660	{
1584	XRectangle preedit_rect, status_rect, *needed_rect;	1661	XRectangle preedit_rect, status_rect, *needed_rect;
1585	XVaNestedList preedit_attr, status_attr;	1662	XVaNestedList preedit_attr, status_attr;
1586		1663
1587	if (!Input_Context	1664	if (!Input_Context
1588	\|\| !focus	1665	\|\| !focus
1589	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))	1666	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1590	\|\| !IMisRunning ())	1667	\|\| !im_is_running ())
1591	return;	1668	return;
1592		1669
1593	if (input_style & XIMPreeditPosition)	1670	if (input_style & XIMPreeditPosition)
1594	{	1671	{
1595	im_set_size (preedit_rect);	1672	im_set_size (preedit_rect);
…		…
1625		1702
1626	void	1703	void
1627	rxvt_term::get_window_origin (int &x, int &y)	1704	rxvt_term::get_window_origin (int &x, int &y)
1628	{	1705	{
1629	Window cr;	1706	Window cr;
1630	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1707	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1631	}
1632
1633	Pixmap
1634	rxvt_term::get_pixmap_property (int prop_id)
1635	{
1636	if (prop_id > 0 && prop_id < NUM_XA)
1637	if (xa[prop_id])
1638	{
1639	int aformat;
1640	unsigned long nitems, bytes_after;
1641	Atom atype;
1642	unsigned char *prop = NULL;
1643	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1644	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1645	&nitems, &bytes_after, &prop);
1646	if (result == Success && prop && atype == XA_PIXMAP)
1647	return (Pixmap )prop;
1648	}
1649
1650	return None;
1651	}	1708	}
1652		1709
1653	#ifdef HAVE_BG_PIXMAP	1710	#ifdef HAVE_BG_PIXMAP
1654		1711
1655	void	1712	void
1656	rxvt_term::update_background ()	1713	rxvt_term::update_background ()
1657	{	1714	{
1658	if (update_background_ev.is_active ())	1715	if (update_background_ev.is_active ())
1659	return;	1716	return;
1660		1717
1661	bgPixmap.invalidate ();
1662
1663	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1718	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1664		1719
1665	if (to_wait <= 0.)	1720	if (to_wait <= 0.)
1666	bgPixmap.render ();	1721	bg_render ();
1667	else	1722	else
1668	update_background_ev.start (to_wait);	1723	update_background_ev.start (to_wait);
1669	}	1724	}
1670		1725
1671	void	1726	void
1672	rxvt_term::update_background_cb (ev::timer &w, int revents)	1727	rxvt_term::update_background_cb (ev::timer &w, int revents)
1673	{	1728	{
1674	make_current ();	1729	make_current ();
1675		1730
1676	update_background_ev.stop ();	1731	update_background_ev.stop ();
1677	bgPixmap.render ();	1732	bg_render ();
1678	refresh_check ();	1733	refresh_check ();
1679	}	1734	}
1680		1735
1681	#endif /* HAVE_BG_PIXMAP */	1736	#endif /* HAVE_BG_PIXMAP */
1682		1737

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.334 by sf-exg, Fri Oct 22 16:49:26 2010 UTC vs. Revision 1.400 by sf-exg, Tue Jun 28 21:56:17 2016 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.334 by sf-exg, Fri Oct 22 16:49:26 2010 UTC vs.
Revision 1.400 by sf-exg, Tue Jun 28 21:56:17 2016 UTC