Attachment #98209 for bug #149276

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

Lines 1721-1727 Link Here

(-)./centericq-4.21.0-r2/work/centericq-4.21.0/kkconsui-0.1/src/texteditor.cc (-2 / +2 lines)
1721	else f = strstr(p+plus, needle);	1721	else f = strstr(p+plus, needle);
1722		1722
1723	if(f) {	1723	if(f) {
1724	*col = (int) (f-p);	1724	*col = (intptr_t) (f-p);
1725	*line = i;	1725	*line = i;
1726	return true;	1726	return true;
1727	}	1727	}
Lines 1940-1946 Link Here
1940	}	1940	}
1941		1941
1942	int texteditor::findint(void p1, void p2) {	1942	int texteditor::findint(void p1, void p2) {
1943	return (int ) p1 != (int) p2;	1943	return (int ) p1 != (intptr_t) p2;
1944	}	1944	}
1945		1945
1946	int texteditor::findhighline(void p1, void p2) {	1946	int texteditor::findhighline(void p1, void p2) {

Lines 431-437 Link Here

(-)./centericq-4.21.0-r2/work/centericq-4.21.0/kkstrtext-0.1/kkstrtext.cc (-2 / +2 lines)
431	}	431	}
432		432
433	int intcompare(void s1, void s2) {	433	int intcompare(void s1, void s2) {
434	return (int) s1 != (int) s2;	434	return (intptr_t) s1 != (intptr_t) s2;
435	}	435	}
436		436
437	string i2str(int i) {	437	string i2str(int i) {
Lines 885-891 Link Here
885	#ifdef HAVE_ICONV	885	#ifdef HAVE_ICONV
886	iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str());	886	iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str());
887		887
888	if(((int) cd) != -1) {	888	if(((intptr_t) cd) != -1) {
889	string r, text(atext);	889	string r, text(atext);
890	size_t inleft, outleft, soutleft;	890	size_t inleft, outleft, soutleft;
891	char inbuf, outbuf, sinbuf, soutbuf;	891	char inbuf, outbuf, sinbuf, soutbuf;




    dx = (COLS-sizeDlg.width)/2+sizeDlg.width;
    dy = (LINES-sizeDlg.height)/2+sizeDlg.height;

    db.setwindow(new textwindow(dx-(intptr_t) (sizeDlg.width*0.6), dy-(intptr_t) (sizeDlg.height*0.6),
	dx, dy, conf.getcolor(cp_dialog_frame), 0, conf.getcolor(cp_dialog_highlight),
	_(" Search profiles ")));


    m.idle = &menuidle;

    for(i = 0; i < abstracthook::Country_table_size; i++) {
	m.additem(0, (intptr_t) abstracthook::Country_table[i].code,
	    (string) " " + abstracthook::Country_table[i].name);

	if(abstracthook::Country_table[i].code == f) {

    i = m.open();
    m.close();

    if(i) f = (unsigned short) ((intptr_t) m.getref(i-1));
}

void icqface::selectlanguage(unsigned short &f) {


    m.additemf(" %s", _("none"));

    for(i = 1; i <= ((intptr_t) ICQ2000::GROUP_SEEKINGMEN); i++) {
	m.additemf(" %s", strrandomgroup(i));
    }


    m.idle = &menuidle;

    for(imgender i = genderUnspec; i != imgender_size; i++) {
	m.additemf(0, (intptr_t) i, " %s", strgender(i));
	if(i == f) m.setpos(m.getcount()-1);
    }

    int i = m.open();
    m.close();

    if(i) f = (imgender) ((intptr_t) m.getref(i-1));
}

void icqface::selectagerange(ICQ2000::AgeRange &r) {

	if(i == ICQ2000::RANGE_NORANGE)
	    p = _("none");

	m.additemf(0, (intptr_t) i, " %s", p);
	if(i == r) m.setpos(m.getcount()-1);
    }

    int i = m.open();
    m.close();

    if(i) r = (ICQ2000::AgeRange) ((intptr_t) m.getref(i-1));
}

bool icqface::edit(string &txt, const string &header) {


	void *p;
	finished = !db.open(n, b, &p);
	i = (intptr_t) p;

	if(!finished)
	switch(b) {

	    it = transfers.end();

	    if(!db.gettree()->isnode(db.gettree()->getid(np-1)))
		it = transfers.begin() + (intptr_t) db.getmenu()->getref(n-1);

	    switch(b) {
		case 0:

}

void icqface::invokelist(string &s, vector<string> &v, const string &def, textwindow *w) {
    int delems = (intptr_t) ((w->y2-w->y1)/2);
    int vmax = v.size() > delems ? delems : v.size();
    if(vmax < 2) return;
    vmax++;




    sizeBigDlg.width = COLS-10;
    sizeBigDlg.height = LINES-7;

    sizeWArea.x1 = (intptr_t) (COLS*0.32);
    if(sizeWArea.x1 < 25)
	sizeWArea.x1 = 25;

    sizeWArea.x2 = COLS-1;
    sizeWArea.y1 = 1;

    sizeWArea.y2 = LINES - ((intptr_t) (LINES/4));
    if(sizeWArea.y2 > LINES-6)
	sizeWArea.y2 = LINES-6;



    m.scale();
    m.idle = &menuidle;
    i = (intptr_t) m.getref(m.open()-1);
    m.close();

    if(i) lastr = i;


    if(i) {
	lastitem = i-1;
	r = (intptr_t) m.getref(lastitem);
    }

    return r;

	    g = 0;
	}
	
	if((unsigned intptr_t) c < 100) c = 0;

	if(i) {
	    switch(action = extk) {

    } else if(c->getdesc() != contactroot) {
	int days, hours, minutes, tdiff = timer_current-ls;

	days = (intptr_t) (tdiff/86400);
	hours = (intptr_t) ((tdiff-days*86400)/3600);
	minutes = (intptr_t) ((tdiff-days*8600-hours*3600)/60);

	if(days) buf = i2str(days) + " " + _("days");


	m.scale();

	i = m.open();
	choice = (intptr_t) m.getref(i-1);

	m.close();
    }

	m.close();

	if(r = i) {
	    st = (imstatus) ((intptr_t) m.getref(i-1));
	}
    }


			    c = (icqcontact *) cm->getref(i);
			}

			if((unsigned intptr_t) c > 100) {
			    string current = c->getdispnick();
			    len = current.size();
			    if(len > nick.size()) len = nick.size();

    muins.clear();
    muins.push_back(passinfo);

    chatlines = (intptr_t) ((sizeWArea.y2-sizeWArea.y1)*0.75);
//    workarealine(sizeWArea.y1+chatlines+1);

    editor.addscheme(cp_main_text, cp_main_text, 0, 0);

Return to bug 149276

Lines 93-99 Link Here

(-)./centericq-4.21.0-r2/work/centericq-4.21.0/src/icqdialogs.cc (-11 / +11 lines)
93	dx = (COLS-sizeDlg.width)/2+sizeDlg.width;	93	dx = (COLS-sizeDlg.width)/2+sizeDlg.width;
94	dy = (LINES-sizeDlg.height)/2+sizeDlg.height;	94	dy = (LINES-sizeDlg.height)/2+sizeDlg.height;
95		95
96	db.setwindow(new textwindow(dx-(int) (sizeDlg.width0.6), dy-(int) (sizeDlg.height0.6),	96	db.setwindow(new textwindow(dx-(intptr_t) (sizeDlg.width0.6), dy-(intptr_t) (sizeDlg.height0.6),
97	dx, dy, conf.getcolor(cp_dialog_frame), 0, conf.getcolor(cp_dialog_highlight),	97	dx, dy, conf.getcolor(cp_dialog_frame), 0, conf.getcolor(cp_dialog_highlight),
98	_(" Search profiles ")));	98	_(" Search profiles ")));
99		99
Lines 883-889 Link Here
883	m.idle = &menuidle;	883	m.idle = &menuidle;
884		884
885	for(i = 0; i < abstracthook::Country_table_size; i++) {	885	for(i = 0; i < abstracthook::Country_table_size; i++) {
886	m.additem(0, (int) abstracthook::Country_table[i].code,	886	m.additem(0, (intptr_t) abstracthook::Country_table[i].code,
887	(string) " " + abstracthook::Country_table[i].name);	887	(string) " " + abstracthook::Country_table[i].name);
888		888
889	if(abstracthook::Country_table[i].code == f) {	889	if(abstracthook::Country_table[i].code == f) {
Lines 894-900 Link Here
894	i = m.open();	894	i = m.open();
895	m.close();	895	m.close();
896		896
897	if(i) f = (unsigned short) ((int) m.getref(i-1));	897	if(i) f = (unsigned short) ((intptr_t) m.getref(i-1));
898	}	898	}
899		899
900	void icqface::selectlanguage(unsigned short &f) {	900	void icqface::selectlanguage(unsigned short &f) {
Lines 922-928 Link Here
922		922
923	m.additemf(" %s", _("none"));	923	m.additemf(" %s", _("none"));
924		924
925	for(i = 1; i <= ((int) ICQ2000::GROUP_SEEKINGMEN); i++) {	925	for(i = 1; i <= ((intptr_t) ICQ2000::GROUP_SEEKINGMEN); i++) {
926	m.additemf(" %s", strrandomgroup(i));	926	m.additemf(" %s", strrandomgroup(i));
927	}	927	}
928		928
Lines 939-952 Link Here
939	m.idle = &menuidle;	939	m.idle = &menuidle;
940		940
941	for(imgender i = genderUnspec; i != imgender_size; i++) {	941	for(imgender i = genderUnspec; i != imgender_size; i++) {
942	m.additemf(0, (int) i, " %s", strgender(i));	942	m.additemf(0, (intptr_t) i, " %s", strgender(i));
943	if(i == f) m.setpos(m.getcount()-1);	943	if(i == f) m.setpos(m.getcount()-1);
944	}	944	}
945		945
946	int i = m.open();	946	int i = m.open();
947	m.close();	947	m.close();
948		948
949	if(i) f = (imgender) ((int) m.getref(i-1));	949	if(i) f = (imgender) ((intptr_t) m.getref(i-1));
950	}	950	}
951		951
952	void icqface::selectagerange(ICQ2000::AgeRange &r) {	952	void icqface::selectagerange(ICQ2000::AgeRange &r) {
Lines 960-973 Link Here
960	if(i == ICQ2000::RANGE_NORANGE)	960	if(i == ICQ2000::RANGE_NORANGE)
961	p = _("none");	961	p = _("none");
962		962
963	m.additemf(0, (int) i, " %s", p);	963	m.additemf(0, (intptr_t) i, " %s", p);
964	if(i == r) m.setpos(m.getcount()-1);	964	if(i == r) m.setpos(m.getcount()-1);
965	}	965	}
966		966
967	int i = m.open();	967	int i = m.open();
968	m.close();	968	m.close();
969		969
970	if(i) r = (ICQ2000::AgeRange) ((int) m.getref(i-1));	970	if(i) r = (ICQ2000::AgeRange) ((intptr_t) m.getref(i-1));
971	}	971	}
972		972
973	bool icqface::edit(string &txt, const string &header) {	973	bool icqface::edit(string &txt, const string &header) {
Lines 1256-1262 Link Here
1256		1256
1257	void *p;	1257	void *p;
1258	finished = !db.open(n, b, &p);	1258	finished = !db.open(n, b, &p);
1259	i = (int) p;	1259	i = (intptr_t) p;
1260		1260
1261	if(!finished)	1261	if(!finished)
1262	switch(b) {	1262	switch(b) {
Lines 1750-1756 Link Here
1750	it = transfers.end();	1750	it = transfers.end();
1751		1751
1752	if(!db.gettree()->isnode(db.gettree()->getid(np-1)))	1752	if(!db.gettree()->isnode(db.gettree()->getid(np-1)))
1753	it = transfers.begin() + (int) db.getmenu()->getref(n-1);	1753	it = transfers.begin() + (intptr_t) db.getmenu()->getref(n-1);
1754		1754
1755	switch(b) {	1755	switch(b) {
1756	case 0:	1756	case 0:
Lines 1806-1812 Link Here
1806	}	1806	}
1807		1807
1808	void icqface::invokelist(string &s, vector<string> &v, const string &def, textwindow *w) {	1808	void icqface::invokelist(string &s, vector<string> &v, const string &def, textwindow *w) {
1809	int delems = (int) ((w->y2-w->y1)/2);	1809	int delems = (intptr_t) ((w->y2-w->y1)/2);
1810	int vmax = v.size() > delems ? delems : v.size();	1810	int vmax = v.size() > delems ? delems : v.size();
1811	if(vmax < 2) return;	1811	if(vmax < 2) return;
1812	vmax++;	1812	vmax++;

Lines 153-166 Link Here

(-)./centericq-4.21.0-r2/work/centericq-4.21.0/src/icqface.cc (-12 / +12 lines)
153	sizeBigDlg.width = COLS-10;	153	sizeBigDlg.width = COLS-10;
154	sizeBigDlg.height = LINES-7;	154	sizeBigDlg.height = LINES-7;
155		155
156	sizeWArea.x1 = (int) (COLS*0.32);	156	sizeWArea.x1 = (intptr_t) (COLS*0.32);
157	if(sizeWArea.x1 < 25)	157	if(sizeWArea.x1 < 25)
158	sizeWArea.x1 = 25;	158	sizeWArea.x1 = 25;
159		159
160	sizeWArea.x2 = COLS-1;	160	sizeWArea.x2 = COLS-1;
161	sizeWArea.y1 = 1;	161	sizeWArea.y1 = 1;
162		162
163	sizeWArea.y2 = LINES - ((int) (LINES/4));	163	sizeWArea.y2 = LINES - ((intptr_t) (LINES/4));
164	if(sizeWArea.y2 > LINES-6)	164	if(sizeWArea.y2 > LINES-6)
165	sizeWArea.y2 = LINES-6;	165	sizeWArea.y2 = LINES-6;
166		166
Lines 401-407 Link Here
401		401
402	m.scale();	402	m.scale();
403	m.idle = &menuidle;	403	m.idle = &menuidle;
404	i = (int) m.getref(m.open()-1);	404	i = (intptr_t) m.getref(m.open()-1);
405	m.close();	405	m.close();
406		406
407	if(i) lastr = i;	407	if(i) lastr = i;
Lines 450-456 Link Here
450		450
451	if(i) {	451	if(i) {
452	lastitem = i-1;	452	lastitem = i-1;
453	r = (int) m.getref(lastitem);	453	r = (intptr_t) m.getref(lastitem);
454	}	454	}
455		455
456	return r;	456	return r;
Lines 513-519 Link Here
513	g = 0;	513	g = 0;
514	}	514	}
515		515
516	if((unsigned int) c < 100) c = 0;	516	if((unsigned intptr_t) c < 100) c = 0;
517		517
518	if(i) {	518	if(i) {
519	switch(action = extk) {	519	switch(action = extk) {
Lines 1075-1083 Link Here
1075	} else if(c->getdesc() != contactroot) {	1075	} else if(c->getdesc() != contactroot) {
1076	int days, hours, minutes, tdiff = timer_current-ls;	1076	int days, hours, minutes, tdiff = timer_current-ls;
1077		1077
1078	days = (int) (tdiff/86400);	1078	days = (intptr_t) (tdiff/86400);
1079	hours = (int) ((tdiff-days*86400)/3600);	1079	hours = (intptr_t) ((tdiff-days*86400)/3600);
1080	minutes = (int) ((tdiff-days8600-hours3600)/60);	1080	minutes = (intptr_t) ((tdiff-days8600-hours3600)/60);
1081		1081
1082	if(days) buf = i2str(days) + " " + _("days");	1082	if(days) buf = i2str(days) + " " + _("days");
1083		1083
Lines 1484-1490 Link Here
1484	m.scale();	1484	m.scale();
1485		1485
1486	i = m.open();	1486	i = m.open();
1487	choice = (int) m.getref(i-1);	1487	choice = (intptr_t) m.getref(i-1);
1488		1488
1489	m.close();	1489	m.close();
1490	}	1490	}
Lines 1539-1545 Link Here
1539	m.close();	1539	m.close();
1540		1540
1541	if(r = i) {	1541	if(r = i) {
1542	st = (imstatus) ((int) m.getref(i-1));	1542	st = (imstatus) ((intptr_t) m.getref(i-1));
1543	}	1543	}
1544	}	1544	}
1545		1545
Lines 2132-2138 Link Here
2132	c = (icqcontact *) cm->getref(i);	2132	c = (icqcontact *) cm->getref(i);
2133	}	2133	}
2134		2134
2135	if((unsigned int) c > 100) {	2135	if((unsigned intptr_t) c > 100) {
2136	string current = c->getdispnick();	2136	string current = c->getdispnick();
2137	len = current.size();	2137	len = current.size();
2138	if(len > nick.size()) len = nick.size();	2138	if(len > nick.size()) len = nick.size();
Lines 2680-2686 Link Here
2680	muins.clear();	2680	muins.clear();
2681	muins.push_back(passinfo);	2681	muins.push_back(passinfo);
2682		2682
2683	chatlines = (int) ((sizeWArea.y2-sizeWArea.y1)*0.75);	2683	chatlines = (intptr_t) ((sizeWArea.y2-sizeWArea.y1)*0.75);
2684	// workarealine(sizeWArea.y1+chatlines+1);	2684	// workarealine(sizeWArea.y1+chatlines+1);
2685		2685
2686	editor.addscheme(cp_main_text, cp_main_text, 0, 0);	2686	editor.addscheme(cp_main_text, cp_main_text, 0, 0);