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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC vs.
Revision 1.308 by root, Mon Feb 20 19:42:55 2006 UTC

…		…
298		298
299	return -1;	299	return -1;
300	}	300	}
301	#endif	301	#endif
302		302
303	/{{{ Convert the keypress event into a string /
304	void	303	void
305	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
306	{	305	{
307	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
308	unsigned int newlen;	307	unsigned int newlen;
309	KeySym keysym;	308	KeySym keysym;
310	int valid_keysym;	309	int valid_keysym;
311	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
312		316
313	/*	317	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	318	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
316	*	320	*
…		…
907	tt_write (&ch, 1);	911	tt_write (&ch, 1);
908	}	912	}
909		913
910	tt_write (kbuf, (unsigned int)len);	914	tt_write (kbuf, (unsigned int)len);
911	}	915	}
912	/}}} /	916
		917	void
		918	rxvt_term::key_release (XKeyEvent &ev)
		919	{
		920	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
		921	KeySym keysym;
		922
		923	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		924	#endif
		925
		926	#if ENABLE_FRILLS \|\| ISO_14755
		927	// ISO 14755 support
		928	if (iso14755buf)
		929	if (iso14755buf & ISO_14755_52)
		930	{
		931	# if ENABLE_OVERLAY
		932	scr_overlay_off ();
		933	# endif
		934	# if ISO_14755
		935	// iso14755 part 5.2 handling: release time
		936	// first: controls
		937	if ((ev.state & ControlMask)
		938	&& ((keysym >= 0x40 && keysym <= 0x5f)
		939	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
		940	{
		941	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
		942	commit_iso14755 ();
		943
		944	return;
		945	}
		946
		947	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
		948	if (i[0] == keysym)
		949	{
		950	iso14755buf = ISO_14755_51 \| i[1];
		951	commit_iso14755 ();
		952
		953	return;
		954	}
		955
		956	scr_bell ();
		957	# endif
		958	iso14755buf = 0;
		959
		960	return;
		961	}
		962	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
		963	{
		964	# if ENABLE_OVERLAY
		965	scr_overlay_off ();
		966	# endif
		967	if (iso14755buf & ISO_14755_51)
		968	commit_iso14755 ();
		969	#if ISO_14755
		970	else if (iso14755buf & ISO_14755_STARTED)
		971	{
		972	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
		973
		974	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
		975	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
		976	}
		977	# endif
		978	else
		979	iso14755buf = 0;
		980	}
		981	#endif
		982
		983	if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		984	return;
		985
		986	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		987	if (!(ev.state & ControlMask))
		988	slip_wheel_ev.stop ();
		989	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
		990	mouse_slip_wheel_speed = 0;
		991	#endif
		992	}
913		993
914	#if defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
915	unsigned int	995	unsigned int
916	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
917	{	997	{
…		…
1103		1183
1104	void yield_cb (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1105	{	1185	{
1106	// this should really be sched_yield(), but the linux guys thought	1186	// this should really be sched_yield(), but the linux guys thought
1107	// that giving a process calling sched_yield () less cpu time than	1187	// that giving a process calling sched_yield () less cpu time than
1108	// ones with high nice levels.	1188	// ones with high nice levels is a useful thing to do. It surely is is
		1189	// allowed by the sus... as is returning ENOSYS.
1109		1190
1110	struct timespec ts = { 0, 0 };	1191	struct timespec ts = { 0, 0 };
1111	nanosleep (&ts, 0);	1192	nanosleep (&ts, 0);
1112		1193
1113	w.stop ();	1194	w.stop ();
…		…
1176	}	1257	}
1177		1258
1178	void	1259	void
1179	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1180	{	1261	{
1181	XDefineCursor (xdisp, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1182	recolour_cursor ();	1263	recolour_cursor ();
1183		1264
1184	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1185	hidden_pointer = 0;	1266	hidden_pointer = 0;
1186		1267
…		…
1194	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1195	{	1276	{
1196	if (!OPTION (Opt_pointerBlank))	1277	if (!OPTION (Opt_pointerBlank))
1197	return;	1278	return;
1198		1279
1199	XDefineCursor (xdisp, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1200	XFlush (xdisp);	1281	XFlush (dpy);
1201		1282
1202	hidden_pointer = 1;	1283	hidden_pointer = 1;
1203	}	1284	}
1204		1285
1205	void	1286	void
…		…
1284	void	1365	void
1285	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1286	{	1367	{
1287	make_current ();	1368	make_current ();
1288		1369
1289	dLocal (Display *, xdisp);	1370	dLocal (Display *, dpy);
1290		1371
1291	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1292	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1293	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1294	return;	1375	return;
…		…
1299	unsigned int unused_mask;	1380	unsigned int unused_mask;
1300		1381
1301	switch (ev.type)	1382	switch (ev.type)
1302	{	1383	{
1303	case KeyPress:	1384	case KeyPress:
1304	#if ISO_14755	1385	key_press (ev.xkey);
1305	if (!(iso14755buf & ISO_14755_52))
1306	#endif
1307	lookup_key (ev.xkey);
1308
1309	break;	1386	break;
1310		1387
1311	case KeyRelease:	1388	case KeyRelease:
1312	{	1389	key_release (ev.xkey);
1313	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1314	KeySym keysym;
1315
1316	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1317	#endif
1318
1319	#if ENABLE_FRILLS \|\| ISO_14755
1320	// ISO 14755 support
1321	if (iso14755buf)
1322	if (iso14755buf & ISO_14755_52)
1323	{
1324	# if ENABLE_OVERLAY
1325	scr_overlay_off ();
1326	# endif
1327	# if ISO_14755
1328	// iso14755 part 5.2 handling: release time
1329	// first: controls
1330	if ((ev.xkey.state & ControlMask)
1331	&& ((keysym >= 0x40 && keysym <= 0x5f)
1332	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1333	{
1334	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1335	commit_iso14755 ();
1336	goto skip_switch;
1337	}
1338
1339	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1340	if (i[0] == keysym)
1341	{
1342	iso14755buf = ISO_14755_51 \| i[1];
1343	commit_iso14755 ();
1344	goto skip_switch;
1345	}
1346
1347	scr_bell ();
1348	# endif
1349	iso14755buf = 0;
1350	break;
1351	}
1352	else if ((ev.xkey.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
1353	{
1354	# if ENABLE_OVERLAY
1355	scr_overlay_off ();
1356	# endif
1357	if (iso14755buf & ISO_14755_51)
1358	commit_iso14755 ();
1359	#if ISO_14755
1360	else if (iso14755buf & ISO_14755_STARTED)
1361	{
1362	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1363
1364	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1365	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1366	}
1367	# endif
1368	else
1369	iso14755buf = 0;
1370	}
1371	#endif
1372
1373	if (ev.xany.window == vt
1374	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1375	break;
1376
1377	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378	if (!(ev.xkey.state & ControlMask))
1379	slip_wheel_ev.stop ();
1380	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1381	mouse_slip_wheel_speed = 0;
1382	#endif
1383	break;	1390	break;
1384	}
1385		1391
1386	case ButtonPress:	1392	case ButtonPress:
1387	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1388	break;	1394	break;
1389		1395
…		…
1404	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))	1410	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1405	destroy ();	1411	destroy ();
1406	}	1412	}
1407	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1408	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1414	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1409	XSendEvent (xdisp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1410	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1416	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1411	&ev);	1417	&ev);
1412	#endif	1418	#endif
1413	}	1419	}
1414	}	1420	}
…		…
1462	break;	1468	break;
1463		1469
1464	case ConfigureNotify:	1470	case ConfigureNotify:
1465	if (ev.xconfigure.window == parent[0])	1471	if (ev.xconfigure.window == parent[0])
1466	{	1472	{
1467	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))	1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468	;	1474	;
1469		1475
1470	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1476	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1471	{	1477	{
1472	seen_resize = 1;	1478	seen_resize = 1;
…		…
1530	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1531	{	1537	{
1532	do	1538	do
1533	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1534	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1535	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536		1542
1537	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538		1544
1539	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1541	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1542		1548
1543	want_refresh = 1;	1549	want_refresh = 1;
1544	}	1550	}
1545	else	1551	else
1546	{	1552	{
1547	XEvent unused_event;	1553	XEvent unused_event;
1548		1554
1549	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1550	;	1556	;
1551	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1552	;	1558	;
1553		1559
1554	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1555	{	1561	{
1556	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1557	scrollbar_show (0);	1563	scrollbar_show (0);
1558	}	1564	}
1559		1565
1560	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1561	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1562	XClearWindow (xdisp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1563	#endif	1569	#endif
1564	}	1570	}
1565	break;	1571	break;
1566		1572
1567	case MotionNotify:	1573	case MotionNotify:
…		…
1577	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579	; // nop	1585	; // nop
1580	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1581	{	1587	{
1582	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1583	;	1589	;
1584		1590
1585	XQueryPointer (xdisp, vt,	1591	XQueryPointer (dpy, vt,
1586	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1587	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1588	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1589	&ev.xbutton.state);	1595	&ev.xbutton.state);
1590	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1654	#endif	1660	#endif
1655	}	1661	}
1656	}	1662	}
1657	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1658	{	1664	{
1659	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1660	MotionNotify, &ev))	1666	MotionNotify, &ev))
1661	;	1667	;
1662		1668
1663	XQueryPointer (xdisp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1664	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1665	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1666	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1667	&unused_mask);	1673	&unused_mask);
1668	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1672	scrollbar_show (1);	1678	scrollbar_show (1);
1673	}	1679	}
1674	break;	1680	break;
1675	}	1681	}
1676		1682
1677	skip_switch: ;
1678
1679	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1680	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1681	{	1685	{
1682	if (hidden_cursor)	1686	if (hidden_cursor)
1683	{	1687	{
…		…
1710	if (!focus)	1714	if (!focus)
1711	{	1715	{
1712	focus = 1;	1716	focus = 1;
1713	want_refresh = 1;	1717	want_refresh = 1;
1714		1718
1715	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1719	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1716		1720
1717	#if USE_XIM	1721	#if USE_XIM
1718	if (Input_Context != NULL)	1722	if (Input_Context != NULL)
1719	{	1723	{
1720	IMSetStatusPosition ();	1724	IMSetPosition ();
1721	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1722	}	1726	}
1723	#endif	1727	#endif
1724	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1725	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
…		…
2429	pchanged = 0;	2433	pchanged = 0;
2430		2434
2431	if (!OPTION (Opt_transparent))	2435	if (!OPTION (Opt_transparent))
2432	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2433		2437
2434	XGetWindowAttributes (xdisp, display->root, &wrootattr);	2438	XGetWindowAttributes (dpy, display->root, &wrootattr);
2435	rootdepth = wrootattr.depth;	2439	rootdepth = wrootattr.depth;
2436		2440
2437	XGetWindowAttributes (xdisp, parent[0], &wattr);	2441	XGetWindowAttributes (dpy, parent[0], &wattr);
2438		2442
2439	if (rootdepth != wattr.depth)	2443	if (rootdepth != wattr.depth)
2440	{	2444	{
2441	if (am_transparent)	2445	if (am_transparent)
2442	{	2446	{
2443	pchanged = 1;	2447	pchanged = 1;
2444	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);	2448	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2445	am_transparent = am_pixmap_trans = 0;	2449	am_transparent = am_pixmap_trans = 0;
2446	}	2450	}
2447		2451
2448	return pchanged; /* Don't try any more */	2452	return pchanged; /* Don't try any more */
2449	}	2453	}
2450		2454
2451	/* Get all X ops out of the queue so that our information is up-to-date. */	2455	/* Get all X ops out of the queue so that our information is up-to-date. */
2452	XSync (xdisp, False);	2456	XSync (dpy, False);
2453		2457
2454	/*	2458	/*
2455	* Make the frame window set by the window manager have	2459	* Make the frame window set by the window manager have
2456	* the root background. Some window managers put multiple nested frame	2460	* the root background. Some window managers put multiple nested frame
2457	* windows for each client, so we have to take care about that.	2461	* windows for each client, so we have to take care about that.
2458	*/	2462	*/
2459	i = (xa[XA_XROOTPMAP_ID]	2463	i = (xa[XA_XROOTPMAP_ID]
2460	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],	2464	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2461	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2462	&nitems, &bytes_after, &prop) == Success);	2466	&nitems, &bytes_after, &prop) == Success);
2463		2467
2464	if (!i \|\| prop == NULL)	2468	if (!i \|\| prop == NULL)
2465	i = (xa[XA_ESETROOT_PMAP_ID]	2469	i = (xa[XA_ESETROOT_PMAP_ID]
2466	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],	2470	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2467	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468	&nitems, &bytes_after, &prop) == Success);	2472	&nitems, &bytes_after, &prop) == Success);
2469		2473
2470	if (!i \|\| prop == NULL	2474	if (!i \|\| prop == NULL
2471	#if TINTING	2475	#if TINTING
…		…
2490	Window cr;	2494	Window cr;
2491	XImage *image;	2495	XImage *image;
2492	GC gc;	2496	GC gc;
2493	XGCValues gcvalue;	2497	XGCValues gcvalue;
2494		2498
2495	XTranslateCoordinates (xdisp, parent[0], display->root,	2499	XTranslateCoordinates (dpy, parent[0], display->root,
2496	0, 0, &sx, &sy, &cr);	2500	0, 0, &sx, &sy, &cr);
2497	nw = (unsigned int)szHint.width;	2501	nw = (unsigned int)szHint.width;
2498	nh = (unsigned int)szHint.height;	2502	nh = (unsigned int)szHint.height;
2499	nx = ny = 0;	2503	nx = ny = 0;
2500		2504
…		…
2513	}	2517	}
2514		2518
2515	min_it (nw, (unsigned int) (wrootattr.width - sx));	2519	min_it (nw, (unsigned int) (wrootattr.width - sx));
2516	min_it (nh, (unsigned int) (wrootattr.height - sy));	2520	min_it (nh, (unsigned int) (wrootattr.height - sy));
2517		2521
2518	XSync (xdisp, False);	2522	XSync (dpy, False);
2519	allowedxerror = -1;	2523	allowedxerror = -1;
2520	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2524	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2521		2525
2522	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2523	/* XXX: may need a delay here? */	2527	/* XXX: may need a delay here? */
2524	allowedxerror = 0;	2528	allowedxerror = 0;
2525		2529
…		…
2528	if (am_transparent && am_pixmap_trans)	2532	if (am_transparent && am_pixmap_trans)
2529	{	2533	{
2530	pchanged = 1;	2534	pchanged = 1;
2531	if (pixmap != None)	2535	if (pixmap != None)
2532	{	2536	{
2533	XFreePixmap (xdisp, pixmap);	2537	XFreePixmap (dpy, pixmap);
2534	pixmap = None;	2538	pixmap = None;
2535	}	2539	}
2536	}	2540	}
2537		2541
2538	am_pixmap_trans = 0;	2542	am_pixmap_trans = 0;
2539	}	2543	}
2540	else	2544	else
2541	{	2545	{
2542	if (pixmap != None)	2546	if (pixmap != None)
2543	XFreePixmap (xdisp, pixmap);	2547	XFreePixmap (dpy, pixmap);
2544		2548
2545	#if TINTING	2549	#if TINTING
2546	if (ISSET_PIXCOLOR (Color_tint))	2550	if (ISSET_PIXCOLOR (Color_tint))
2547	{	2551	{
2548	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2552	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
…		…
2552		2556
2553	ShadeXImage (this, image, shade, c.r, c.g, c.b);	2557	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2554	}	2558	}
2555	#endif	2559	#endif
2556		2560
2557	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);	2561	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2558	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);	2562	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2559	XPutImage (xdisp, pixmap, gc, image, 0, 0,	2563	XPutImage (dpy, pixmap, gc, image, 0, 0,
2560	nx, ny, image->width, image->height);	2564	nx, ny, image->width, image->height);
2561	XFreeGC (xdisp, gc);	2565	XFreeGC (dpy, gc);
2562	XDestroyImage (image);	2566	XDestroyImage (image);
2563	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);	2567	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2564	XClearWindow (xdisp, parent[0]);	2568	XClearWindow (dpy, parent[0]);
2565		2569
2566	if (!am_transparent \|\| !am_pixmap_trans)	2570	if (!am_transparent \|\| !am_pixmap_trans)
2567	pchanged = 1;	2571	pchanged = 1;
2568		2572
2569	am_transparent = am_pixmap_trans = 1;	2573	am_transparent = am_pixmap_trans = 1;
2570	}	2574	}
2571	}	2575	}
2572		2576
2573	if (am_pixmap_trans)	2577	if (am_pixmap_trans)
2574	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2575	else	2579	else
2576	{	2580	{
2577	unsigned int n;	2581	unsigned int n;
2578	/*	2582	/*
2579	* InheritPixmap transparency	2583	* InheritPixmap transparency
2580	*/	2584	*/
2581	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2585	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582	{	2586	{
2583	oldp = parent[i];	2587	oldp = parent[i];
2584	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);	2588	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2585	XFree (list);	2589	XFree (list);
2586		2590
2587	if (parent[i] == display->root)	2591	if (parent[i] == display->root)
2588	{	2592	{
2589	if (oldp != None)	2593	if (oldp != None)
…		…
2599	n = 0;	2603	n = 0;
2600		2604
2601	if (pchanged)	2605	if (pchanged)
2602	for (; n < (unsigned int)i; n++)	2606	for (; n < (unsigned int)i; n++)
2603	{	2607	{
2604	XGetWindowAttributes (xdisp, parent[n], &wattr);	2608	XGetWindowAttributes (dpy, parent[n], &wattr);
2605		2609
2606	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2610	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2607	{	2611	{
2608	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2612	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2609	break;	2613	break;
2610	}	2614	}
2611	}	2615	}
2612		2616
2613	if (n > (sizeof (parent) / sizeof (parent[0])))	2617	if (n > (sizeof (parent) / sizeof (parent[0])))
2614	{	2618	{
2615	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);	2619	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2616	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);	2620	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2617	am_transparent = 0;	2621	am_transparent = 0;
2618	/* XXX: also turn off Opt_transparent? */	2622	/* XXX: also turn off Opt_transparent? */
2619	}	2623	}
2620	else	2624	else
2621	{	2625	{
2622	for (n = 0; n < (unsigned int)i; n++)	2626	for (n = 0; n < (unsigned int)i; n++)
2623	{	2627	{
2624	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);	2628	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2625	XClearWindow (xdisp, parent[n]);	2629	XClearWindow (dpy, parent[n]);
2626	}	2630	}
2627		2631
2628	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);	2632	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2629	am_transparent = 1;	2633	am_transparent = 1;
2630	}	2634	}
2631		2635
2632	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2636	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2633	parent[i] = None;	2637	parent[i] = None;
2634	}	2638	}
2635		2639
2636	if (scrollBar.win)	2640	if (scrollBar.win)
2637	{	2641	{
2638	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);	2642	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2639	scrollBar.setIdle ();	2643	scrollBar.setIdle ();
2640	scrollbar_show (0);	2644	scrollbar_show (0);
2641	}	2645	}
2642		2646
2643	if (am_transparent)	2647	if (am_transparent)
…		…
3534	{	3538	{
3535	int x, y;	3539	int x, y;
3536	XWindowAttributes wattr;	3540	XWindowAttributes wattr;
3537	Window wdummy;	3541	Window wdummy;
3538		3542
3539	dLocal (Display *, xdisp);	3543	dLocal (Display *, dpy);
3540		3544
3541	if (nargs == 0)	3545	if (nargs == 0)
3542	return;	3546	return;
3543		3547
3544	switch (args[0])	3548	switch (args[0])
3545	{	3549	{
3546	/*	3550	/*
3547	* commands	3551	* commands
3548	*/	3552	*/
3549	case 1: /* deiconify window */	3553	case 1: /* deiconify window */
3550	XMapWindow (xdisp, parent[0]);	3554	XMapWindow (dpy, parent[0]);
3551	break;	3555	break;
3552	case 2: /* iconify window */	3556	case 2: /* iconify window */
3553	XIconifyWindow (xdisp, parent[0], display->screen);	3557	XIconifyWindow (dpy, parent[0], display->screen);
3554	break;	3558	break;
3555	case 3: /* set position (pixels) */	3559	case 3: /* set position (pixels) */
3556	XMoveWindow (xdisp, parent[0], args[1], args[2]);	3560	XMoveWindow (dpy, parent[0], args[1], args[2]);
3557	break;	3561	break;
3558	case 4: /* set size (pixels) */	3562	case 4: /* set size (pixels) */
3559	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3563	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3560	break;	3564	break;
3561	case 5: /* raise window */	3565	case 5: /* raise window */
3562	XRaiseWindow (xdisp, parent[0]);	3566	XRaiseWindow (dpy, parent[0]);
3563	break;	3567	break;
3564	case 6: /* lower window */	3568	case 6: /* lower window */
3565	XLowerWindow (xdisp, parent[0]);	3569	XLowerWindow (dpy, parent[0]);
3566	break;	3570	break;
3567	case 7: /* refresh window */	3571	case 7: /* refresh window */
3568	scr_touch (true);	3572	scr_touch (true);
3569	break;	3573	break;
3570	case 8: /* set size (chars) */	3574	case 8: /* set size (chars) */
…		…
3581		3585
3582	/*	3586	/*
3583	* reports - some output format copied from XTerm	3587	* reports - some output format copied from XTerm
3584	*/	3588	*/
3585	case 11: /* report window state */	3589	case 11: /* report window state */
3586	XGetWindowAttributes (xdisp, parent[0], &wattr);	3590	XGetWindowAttributes (dpy, parent[0], &wattr);
3587	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3591	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3588	break;	3592	break;
3589	case 13: /* report window position */	3593	case 13: /* report window position */
3590	XGetWindowAttributes (xdisp, parent[0], &wattr);	3594	XGetWindowAttributes (dpy, parent[0], &wattr);
3591	XTranslateCoordinates (xdisp, parent[0], wattr.root,	3595	XTranslateCoordinates (dpy, parent[0], wattr.root,
3592	-wattr.border_width, -wattr.border_width,	3596	-wattr.border_width, -wattr.border_width,
3593	&x, &y, &wdummy);	3597	&x, &y, &wdummy);
3594	tt_printf ("\033[3;%d;%dt", x, y);	3598	tt_printf ("\033[3;%d;%dt", x, y);
3595	break;	3599	break;
3596	case 14: /* report window size (pixels) */	3600	case 14: /* report window size (pixels) */
3597	XGetWindowAttributes (xdisp, parent[0], &wattr);	3601	XGetWindowAttributes (dpy, parent[0], &wattr);
3598	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3602	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3599	break;	3603	break;
3600	case 18: /* report text area size (chars) */	3604	case 18: /* report text area size (chars) */
3601	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3605	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3602	break;	3606	break;
…		…
3604	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3608	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3605	break;	3609	break;
3606	case 20: /* report icon label */	3610	case 20: /* report icon label */
3607	{	3611	{
3608	char *s;	3612	char *s;
3609	XGetIconName (xdisp, parent[0], &s);	3613	XGetIconName (dpy, parent[0], &s);
3610	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3614	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3611	XFree (s);	3615	XFree (s);
3612	}	3616	}
3613	break;	3617	break;
3614	case 21: /* report window title */	3618	case 21: /* report window title */
3615	{	3619	{
3616	char *s;	3620	char *s;
3617	XFetchName (xdisp, parent[0], &s);	3621	XFetchName (dpy, parent[0], &s);
3618	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3622	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3619	XFree (s);	3623	XFree (s);
3620	}	3624	}
3621	break;	3625	break;
3622	}	3626	}
…		…
3748	int color;	3752	int color;
3749	char buf, name;	3753	char buf, name;
3750	bool query = str[0] == '?' && !str[1];	3754	bool query = str[0] == '?' && !str[1];
3751	int saveop = op;	3755	int saveop = op;
3752		3756
3753	dLocal (Display *, xdisp);	3757	dLocal (Display *, dpy);
3754		3758
3755	assert (str != NULL);	3759	assert (str != NULL);
3756	switch (op)	3760	switch (op)
3757	{	3761	{
3758	case XTerm_name:	3762	case XTerm_name:
…		…
3774	unsigned long bytes_after;	3778	unsigned long bytes_after;
3775	unsigned char *value = 0;	3779	unsigned char *value = 0;
3776	const char *str = "";	3780	const char *str = "";
3777		3781
3778	if (prop	3782	if (prop
3779	&& XGetWindowProperty (xdisp, parent[0],	3783	&& XGetWindowProperty (dpy, parent[0],
3780	prop, 0, 1<<16, 0, AnyPropertyType,	3784	prop, 0, 1<<16, 0, AnyPropertyType,
3781	&actual_type, &actual_format,	3785	&actual_type, &actual_format,
3782	&nitems, &bytes_after, &value) == Success	3786	&nitems, &bytes_after, &value) == Success
3783	&& actual_type != None	3787	&& actual_type != None
3784	&& actual_format == 8)	3788	&& actual_format == 8)
…		…
3796	{	3800	{
3797	*eq = 0;	3801	*eq = 0;
3798	set_utf8_property (display->atom (str), eq + 1);	3802	set_utf8_property (display->atom (str), eq + 1);
3799	}	3803	}
3800	else	3804	else
3801	XDeleteProperty (xdisp, parent[0],	3805	XDeleteProperty (dpy, parent[0],
3802	display->atom (str));	3806	display->atom (str));
3803	}	3807	}
3804	break;	3808	break;
3805		3809
3806	case XTerm_Color:	3810	case XTerm_Color:

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC vs. Revision 1.308 by root, Mon Feb 20 19:42:55 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC vs.
Revision 1.308 by root, Mon Feb 20 19:42:55 2006 UTC