Attachment #64314 for bug #143861

View | Details | Raw Unified | Return to bug 143861
Collapse All | Expand All




++ src/wmapp.cc

                                   0, PATH_MAX, False, XA_STRING,
                                   &r_type, &r_format,
                                   &count, &bytes_remain,
                                   (char **) &icewmFontPath) ==
                Success && icewmFontPath) {
                if (r_type == XA_STRING && r_format == 8) {
                    for (int n(ndirs - 1); n > 0; --n) // ---- remove death paths ---
++ src/wmclient.cc


#ifndef NO_MWM_HINTS
void YFrameClient::getMwmHints() {
	char *tmp=NULL;
    if (!prop.mwm_hints)
        return;


    if (XGetWindowProperty(xapp->display(), handle(),
                           _XATOM_MWM_HINTS, 0L, 20L, False, _XATOM_MWM_HINTS,
                           &retType, &retFormat, &retCount,
                           &remain, (char **)&tmp) == Success && tmp){
		memcpy(&fMwmHints,&tmp,sizeof(char *));
        if (retCount >= PROP_MWM_HINTS_ELEMENTS)
            return;
        else
            XFree(fMwmHints);
		}
    fMwmHints = 0;
}


}

void YFrameClient::getWindowRole() {
	char *tmp=NULL;
    if (!prop.window_role)
        return;


                           0, 256, False, XA_STRING,
                           &r_type, &r_format,
                           &count, &bytes_remain,
                           (char **)&tmp) == Success && tmp)
    {
		memcpy(&role,&tmp,sizeof(char *));
        if (r_type == XA_STRING && r_format == 8) {
            MSG(("window_role=%s", role));
        } else {

                           0, 256, False, XA_STRING,
                           &r_type, &r_format,
                           &count, &bytes_remain,
                           (char **)&role) == Success && role)
    {
        if (r_type == XA_STRING && r_format == 8) {
            MSG(("wm_window_role=%s", role));

                           _XA_SM_CLIENT_ID,
                           0, 256, False, XA_STRING,
                           &r_type, &r_format,
                           &count, &bytes_remain, (char **)&cid) == Success && cid)
    {
        if (r_type == XA_STRING && r_format == 8) {
            //msg("cid=%s", cid);
++ src/wmframe.cc

}

void YFrameWindow::configureClient(const XConfigureRequestEvent &configureRequest) {
	char *tmp;
    client()->setBorder((configureRequest.value_mask & CWBorderWidth) ? configureRequest.border_width : client()->getBorder());

    int cx, cy, cw, ch;

            XFindContext(xapp->display(),
                         configureRequest.above,
                         clientContext,
                         (XPointer *)&tmp) == 0){
		 	memcpy(&sibling,&tmp,sizeof(char *));
            xwc.sibling = sibling->handle();
			}
        else
            xwc.sibling = configureRequest.above;

++ src/wmmgr.cc


YFrameWindow *YWindowManager::findFrame(Window win) {
    YFrameWindow *frame;
	char *tmp;

    if (XFindContext(xapp->display(), win,
			frameContext, (XPointer *)&tmp) == 0){
		memcpy(&frame,&tmp,sizeof(char *));
        return frame;
		}
    else
        return 0;
}

YFrameClient *YWindowManager::findClient(Window win) {
    YFrameClient *client;
	char *tmp;
    if (XFindContext(xapp->display(), win,
			clientContext, (XPointer *)&tmp) == 0){
		memcpy(&client,&tmp,sizeof(char *));
        return client;
		}
    else
        return 0;
}
++ src/yinput.cc

                           selection.target, &type, &format,
                           (unsigned long *)&nitems,
                           (unsigned long *)&extra,
                           (char **)&data);

        if (nitems > 0 && data != NULL) {
            replaceSelection(data, nitems);
        }
        if (data != NULL)
            XFree((void *)data);
    }
}

++ src/ywindow.cc

}

void YWindow::handleXdnd(const XClientMessageEvent &message) {
	char *tmp;
    if (message.message_type == XA_XdndEnter) {
        MSG(("XdndEnter source=%lX", message.data.l[0]));
        XdndDragSource = message.data.l[0];

            YWindow *win;

            if (XFindContext(xapp->display(), XdndDropTarget, windowContext,
					(XPointer *)&tmp) == 0){
				memcpy(&win,&tmp,sizeof(char *));
                	win->handleDNDLeave();
					}
            XdndDropTarget = None;
        }
        XdndDragSource = None;

                YWindow *win;

                if (XFindContext(xapp->display(), XdndDropTarget, windowContext,
						(XPointer *)&tmp) == 0){
					memcpy(&win,&tmp,sizeof(char *));
                    	win->handleDNDLeave();
					}
            }
            XdndDropTarget = target;
            if (XdndDropTarget) {
                YWindow *win;

                if (XFindContext(xapp->display(), XdndDropTarget, windowContext,
                                 (XPointer *)&tmp) == 0)
                {
				    memcpy(&win,&tmp,sizeof(char *));
                    win->handleDNDEnter();
                    pwin = win;
                }

        }
        if (pwin == 0 && XdndDropTarget) { // !!! optimize this
            if (XFindContext(xapp->display(), XdndDropTarget, windowContext,
					(XPointer *)&tmp) != 0){
				memcpy(&pwin,&tmp,sizeof(char *));
                pwin = 0;
				}
        }
        if (pwin)
            pwin->handleDNDPosition(nx, ny);
++ src/yxapp.cc


void YXApplication::handleGrabEvent(YWindow *winx, XEvent &xev) {
    YWindow *win = winx;
	char *tmp;
    PRECONDITION(win != 0);
    if (fGrabTree) {
        if (xev.xbutton.subwindow != None) {
            if (XFindContext(display(),
                         xev.xbutton.subwindow,
                         windowContext,
                         (XPointer *)&tmp) != 0);
			memcpy(&win,&tmp,sizeof(char *));
                if (xev.type == EnterNotify || xev.type == LeaveNotify)
                    win = 0;
                else

            if (XFindContext(display(),
                         xev.xbutton.window,
                         windowContext,
                         (XPointer *)&tmp)!= 0)
				memcpy(&win,&tmp,sizeof(char *));
                if (xev.type == EnterNotify || xev.type == LeaveNotify)
                    win = 0;
                else

void YXApplication::handleWindowEvent(Window xwindow, XEvent &xev) {
    int rc = 0;
    YWindow *window = 0;
	char *tmp;
    if ((rc = XFindContext(display(),
                           xwindow,
                           windowContext,
                           (XPointer *)&tmp)) == 0)
	
    {
		memcpy(&window,&tmp,sizeof(char *));
         window->handleEvent(xev);
    } else {
        if (xev.type == MapRequest) {

Return to bug 143861

Line Link Here

(-)file_not_specified_in_diff (-29 / +54 lines)
0	-- src/wmapp.cc	0	++ src/wmapp.cc
Lines 290-296 Link Here
290	0, PATH_MAX, False, XA_STRING,	290	0, PATH_MAX, False, XA_STRING,
291	&r_type, &r_format,	291	&r_type, &r_format,
292	&count, &bytes_remain,	292	&count, &bytes_remain,
293	(unsigned char **) &icewmFontPath) ==	293	(char **) &icewmFontPath) ==
294	Success && icewmFontPath) {	294	Success && icewmFontPath) {
295	if (r_type == XA_STRING && r_format == 8) {	295	if (r_type == XA_STRING && r_format == 8) {
296	for (int n(ndirs - 1); n > 0; --n) // ---- remove death paths ---	296	for (int n(ndirs - 1); n > 0; --n) // ---- remove death paths ---
297	-- src/wmclient.cc	297	++ src/wmclient.cc
Lines 815-820 Link Here
815		815
816	#ifndef NO_MWM_HINTS	816	#ifndef NO_MWM_HINTS
817	void YFrameClient::getMwmHints() {	817	void YFrameClient::getMwmHints() {
		818	char *tmp=NULL;
818	if (!prop.mwm_hints)	819	if (!prop.mwm_hints)
819	return;	820	return;
820		821
Lines 829-839 Link Here
829	if (XGetWindowProperty(xapp->display(), handle(),	830	if (XGetWindowProperty(xapp->display(), handle(),
830	_XATOM_MWM_HINTS, 0L, 20L, False, _XATOM_MWM_HINTS,	831	_XATOM_MWM_HINTS, 0L, 20L, False, _XATOM_MWM_HINTS,
831	&retType, &retFormat, &retCount,	832	&retType, &retFormat, &retCount,
832	&remain, (unsigned char **)&fMwmHints) == Success && fMwmHints)	833	&remain, (char **)&tmp) == Success && tmp){
		834	memcpy(&fMwmHints,&tmp,sizeof(char *));
833	if (retCount >= PROP_MWM_HINTS_ELEMENTS)	835	if (retCount >= PROP_MWM_HINTS_ELEMENTS)
834	return;	836	return;
835	else	837	else
836	XFree(fMwmHints);	838	XFree(fMwmHints);
		839	}
837	fMwmHints = 0;	840	fMwmHints = 0;
838	}	841	}
839		842
Lines 1348-1353 Link Here
1348	}	1351	}
1349		1352
1350	void YFrameClient::getWindowRole() {	1353	void YFrameClient::getWindowRole() {
		1354	char *tmp=NULL;
1351	if (!prop.window_role)	1355	if (!prop.window_role)
1352	return;	1356	return;
1353		1357
Lines 1363-1370 Link Here
1363	0, 256, False, XA_STRING,	1367	0, 256, False, XA_STRING,
1364	&r_type, &r_format,	1368	&r_type, &r_format,
1365	&count, &bytes_remain,	1369	&count, &bytes_remain,
1366	(unsigned char **)&role) == Success && role)	1370	(char **)&tmp) == Success && tmp)
1367	{	1371	{
		1372	memcpy(&role,&tmp,sizeof(char *));
1368	if (r_type == XA_STRING && r_format == 8) {	1373	if (r_type == XA_STRING && r_format == 8) {
1369	MSG(("window_role=%s", role));	1374	MSG(("window_role=%s", role));
1370	} else {	1375	} else {
Lines 1392-1398 Link Here
1392	0, 256, False, XA_STRING,	1397	0, 256, False, XA_STRING,
1393	&r_type, &r_format,	1398	&r_type, &r_format,
1394	&count, &bytes_remain,	1399	&count, &bytes_remain,
1395	(unsigned char **)&role) == Success && role)	1400	(char **)&role) == Success && role)
1396	{	1401	{
1397	if (r_type == XA_STRING && r_format == 8) {	1402	if (r_type == XA_STRING && r_format == 8) {
1398	MSG(("wm_window_role=%s", role));	1403	MSG(("wm_window_role=%s", role));
Lines 1421-1427 Link Here
1421	_XA_SM_CLIENT_ID,	1426	_XA_SM_CLIENT_ID,
1422	0, 256, False, XA_STRING,	1427	0, 256, False, XA_STRING,
1423	&r_type, &r_format,	1428	&r_type, &r_format,
1424	&count, &bytes_remain, (unsigned char **)&cid) == Success && cid)	1429	&count, &bytes_remain, (char **)&cid) == Success && cid)
1425	{	1430	{
1426	if (r_type == XA_STRING && r_format == 8) {	1431	if (r_type == XA_STRING && r_format == 8) {
1427	//msg("cid=%s", cid);	1432	//msg("cid=%s", cid);
1428	-- src/wmframe.cc	1433	++ src/wmframe.cc
Lines 706-711 Link Here
706	}	706	}
707		707
708	void YFrameWindow::configureClient(const XConfigureRequestEvent &configureRequest) {	708	void YFrameWindow::configureClient(const XConfigureRequestEvent &configureRequest) {
		709	char *tmp;
709	client()->setBorder((configureRequest.value_mask & CWBorderWidth) ? configureRequest.border_width : client()->getBorder());	710	client()->setBorder((configureRequest.value_mask & CWBorderWidth) ? configureRequest.border_width : client()->getBorder());
710		711
711	int cx, cy, cw, ch;	712	int cx, cy, cw, ch;
Lines 721-728 Link Here
721	XFindContext(xapp->display(),	722	XFindContext(xapp->display(),
722	configureRequest.above,	723	configureRequest.above,
723	clientContext,	724	clientContext,
724	(XPointer *)&sibling) == 0)	725	(XPointer *)&tmp) == 0){
		726	memcpy(&sibling,&tmp,sizeof(char *));
725	xwc.sibling = sibling->handle();	727	xwc.sibling = sibling->handle();
		728	}
726	else	729	else
727	xwc.sibling = configureRequest.above;	730	xwc.sibling = configureRequest.above;
728		731
729	-- src/wmmgr.cc	732	++ src/wmmgr.cc
Lines 752-771 Link Here
752		752
753	YFrameWindow *YWindowManager::findFrame(Window win) {	753	YFrameWindow *YWindowManager::findFrame(Window win) {
754	YFrameWindow *frame;	754	YFrameWindow *frame;
		755	char *tmp;
755		756
756	if (XFindContext(xapp->display(), win,	757	if (XFindContext(xapp->display(), win,
757	frameContext, (XPointer *)&frame) == 0)	758	frameContext, (XPointer *)&tmp) == 0){
		759	memcpy(&frame,&tmp,sizeof(char *));
758	return frame;	760	return frame;
		761	}
759	else	762	else
760	return 0;	763	return 0;
761	}	764	}
762		765
763	YFrameClient *YWindowManager::findClient(Window win) {	766	YFrameClient *YWindowManager::findClient(Window win) {
764	YFrameClient *client;	767	YFrameClient *client;
765		768	char *tmp;
766	if (XFindContext(xapp->display(), win,	769	if (XFindContext(xapp->display(), win,
767	clientContext, (XPointer *)&client) == 0)	770	clientContext, (XPointer *)&tmp) == 0){
		771	memcpy(&client,&tmp,sizeof(char *));
768	return client;	772	return client;
		773	}
769	else	774	else
770	return 0;	775	return 0;
771	}	776	}
772	-- src/yinput.cc	777	++ src/yinput.cc
Lines 418-430 Link Here
418	selection.target, &type, &format,	418	selection.target, &type, &format,
419	(unsigned long *)&nitems,	419	(unsigned long *)&nitems,
420	(unsigned long *)&extra,	420	(unsigned long *)&extra,
421	(unsigned char **)&data);	421	(char **)&data);
422		422
423	if (nitems > 0 && data != NULL) {	423	if (nitems > 0 && data != NULL) {
424	replaceSelection(data, nitems);	424	replaceSelection(data, nitems);
425	}	425	}
426	if (data != NULL)	426	if (data != NULL)
427	XFree(data);	427	XFree((void *)data);
428	}	428	}
429	}	429	}
430		430
431	-- src/ywindow.cc	431	++ src/ywindow.cc
Lines 1387-1392 Link Here
1387	}	1387	}
1388		1388
1389	void YWindow::handleXdnd(const XClientMessageEvent &message) {	1389	void YWindow::handleXdnd(const XClientMessageEvent &message) {
		1390	char *tmp;
1390	if (message.message_type == XA_XdndEnter) {	1391	if (message.message_type == XA_XdndEnter) {
1391	MSG(("XdndEnter source=%lX", message.data.l[0]));	1392	MSG(("XdndEnter source=%lX", message.data.l[0]));
1392	XdndDragSource = message.data.l[0];	1393	XdndDragSource = message.data.l[0];
Lines 1396-1403 Link Here
1396	YWindow *win;	1397	YWindow *win;
1397		1398
1398	if (XFindContext(xapp->display(), XdndDropTarget, windowContext,	1399	if (XFindContext(xapp->display(), XdndDropTarget, windowContext,
1399	(XPointer *)&win) == 0)	1400	(XPointer *)&tmp) == 0){
1400	win->handleDNDLeave();	1401	memcpy(&win,&tmp,sizeof(char *));
		1402	win->handleDNDLeave();
		1403	}
1401	XdndDropTarget = None;	1404	XdndDropTarget = None;
1402	}	1405	}
1403	XdndDragSource = None;	1406	XdndDragSource = None;
Lines 1440-1455 Link Here
1440	YWindow *win;	1443	YWindow *win;
1441		1444
1442	if (XFindContext(xapp->display(), XdndDropTarget, windowContext,	1445	if (XFindContext(xapp->display(), XdndDropTarget, windowContext,
1443	(XPointer *)&win) == 0)	1446	(XPointer *)&tmp) == 0){
1444	win->handleDNDLeave();	1447	memcpy(&win,&tmp,sizeof(char *));
		1448	win->handleDNDLeave();
		1449	}
1445	}	1450	}
1446	XdndDropTarget = target;	1451	XdndDropTarget = target;
1447	if (XdndDropTarget) {	1452	if (XdndDropTarget) {
1448	YWindow *win;	1453	YWindow *win;
1449		1454
1450	if (XFindContext(xapp->display(), XdndDropTarget, windowContext,	1455	if (XFindContext(xapp->display(), XdndDropTarget, windowContext,
1451	(XPointer *)&win) == 0)	1456	(XPointer *)&tmp) == 0)
1452	{	1457	{
		1458	memcpy(&win,&tmp,sizeof(char *));
1453	win->handleDNDEnter();	1459	win->handleDNDEnter();
1454	pwin = win;	1460	pwin = win;
1455	}	1461	}
Lines 1457-1464 Link Here
1457	}	1463	}
1458	if (pwin == 0 && XdndDropTarget) { // !!! optimize this	1464	if (pwin == 0 && XdndDropTarget) { // !!! optimize this
1459	if (XFindContext(xapp->display(), XdndDropTarget, windowContext,	1465	if (XFindContext(xapp->display(), XdndDropTarget, windowContext,
1460	(XPointer *)&pwin) != 0)	1466	(XPointer *)&tmp) != 0){
		1467	memcpy(&pwin,&tmp,sizeof(char *));
1461	pwin = 0;	1468	pwin = 0;
		1469	}
1462	}	1470	}
1463	if (pwin)	1471	if (pwin)
1464	pwin->handleDNDPosition(nx, ny);	1472	pwin->handleDNDPosition(nx, ny);
1465	-- src/yxapp.cc	1473	++ src/yxapp.cc
Lines 505-518 Link Here
505		505
506	void YXApplication::handleGrabEvent(YWindow *winx, XEvent &xev) {	506	void YXApplication::handleGrabEvent(YWindow *winx, XEvent &xev) {
507	YWindow *win = winx;	507	YWindow *win = winx;
508		508	char *tmp;
509	PRECONDITION(win != 0);	509	PRECONDITION(win != 0);
510	if (fGrabTree) {	510	if (fGrabTree) {
511	if (xev.xbutton.subwindow != None) {	511	if (xev.xbutton.subwindow != None) {
512	if (XFindContext(display(),	512	if (XFindContext(display(),
513	xev.xbutton.subwindow,	513	xev.xbutton.subwindow,
514	windowContext,	514	windowContext,
515	(XPointer *)&win) != 0);	515	(XPointer *)&tmp) != 0);
		516	memcpy(&win,&tmp,sizeof(char *));
516	if (xev.type == EnterNotify \|\| xev.type == LeaveNotify)	517	if (xev.type == EnterNotify \|\| xev.type == LeaveNotify)
517	win = 0;	518	win = 0;
518	else	519	else
Lines 521-527 Link Here
521	if (XFindContext(display(),	522	if (XFindContext(display(),
522	xev.xbutton.window,	523	xev.xbutton.window,
523	windowContext,	524	windowContext,
524	(XPointer *)&win) != 0)	525	(XPointer *)&tmp)!= 0)
		526	memcpy(&win,&tmp,sizeof(char *));
525	if (xev.type == EnterNotify \|\| xev.type == LeaveNotify)	527	if (xev.type == EnterNotify \|\| xev.type == LeaveNotify)
526	win = 0;	528	win = 0;
527	else	529	else
Lines 885-896 Link Here
885	void YXApplication::handleWindowEvent(Window xwindow, XEvent &xev) {	887	void YXApplication::handleWindowEvent(Window xwindow, XEvent &xev) {
886	int rc = 0;	888	int rc = 0;
887	YWindow *window = 0;	889	YWindow *window = 0;
888		890	char *tmp;
889	if ((rc = XFindContext(display(),	891	if ((rc = XFindContext(display(),
890	xwindow,	892	xwindow,
891	windowContext,	893	windowContext,
892	(XPointer *)&window)) == 0)	894	(XPointer *)&tmp)) == 0)
		895
893	{	896	{
		897	memcpy(&window,&tmp,sizeof(char *));
894	window->handleEvent(xev);	898	window->handleEvent(xev);
895	} else {	899	} else {
896	if (xev.type == MapRequest) {	900	if (xev.type == MapRequest) {