github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

MT issues X11 fix

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1507 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-08-13 16:08:34 +00:00
parent 1205935960
commit 57a34eb230
4 changed files with 228 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/CtrlCore/CtrlCore.h
View file

@ -580,8 +580,10 @@ private:
static Callback CtrlCall;
static bool DoCall();
static bool PeekMsg(MSG& msg);
#ifdef PLATFORM_WIN32
static bool PeekMsg(MSG& msg);
#endif
// System window interface...
void WndShow0(bool b);
@ -693,8 +695,6 @@ protected:
friend void sSetCursor(Ctrl *ctrl, const Image& m);
typedef Ctrl CLASSNAME;
public:
virtual void NcCreate(HWND hwnd);
virtual void NcDestroy();
@ -707,6 +707,8 @@ public:
static Ctrl *CtrlFromHWND(HWND hwnd);
#endif
typedef Ctrl CLASSNAME;
#ifdef PLATFORM_X11
protected:
struct XWindow {

2
uppsrc/CtrlCore/CtrlMt.cpp
View file

@ -131,10 +131,12 @@ void Ctrl::WndDestroy()
ICall(callback(this, &Ctrl::WndDestroy0));
}
#ifdef PLATFORM_WIN32
void Ctrl::WndCreateCaret(const Rect& cr)
{
ICall(THISBACK1(WndCreateCaret0, cr));
}
#endif
void Ctrl::WndShow(bool b)
{

49
uppsrc/CtrlCore/X11Wnd.cpp
View file

@ -70,7 +70,7 @@ void Ctrl::DoPaint(const Vector<Rect>& invalid)
}
}
void Ctrl::WndScrollView(const Rect& r, int dx, int dy)
void Ctrl::WndScrollView0(const Rect& r, int dx, int dy)
{
GuiLock __;
if(r.IsEmpty() || !GetWindow()) return;
@ -314,9 +314,12 @@ void Ctrl::GuiSleep0(int ms)
timeout.tv_sec = ms / 1000;
timeout.tv_usec = ms % 1000 * 1000;
XFlush(Xdisplay);
int level = LeaveGuiMutexAll();
select(Xconnection + 1, &fdset, NULL, NULL, &timeout);
PerformCall();
do {
int level = LeaveGMutexAll();
select(Xconnection + 1, &fdset, NULL, NULL, &timeout);
EnterGMutex(level);
}
while(DoCall());
}
static int granularity = 10;
@ -350,9 +353,12 @@ void Ctrl::EventLoop0(Ctrl *ctrl)
timeout.tv_sec = 0;
timeout.tv_usec = 1000 * granularity;
XFlush(Xdisplay);
int level = LeaveGuiMutexAll();
select(Xconnection + 1, &fdset, NULL, NULL, &timeout);
PerformCall();
do {
int level = LeaveGMutexAll();
select(Xconnection + 1, &fdset, NULL, NULL, &timeout);
EnterGMutex(level);
}
while(DoCall());
// GuiSleep()(granularity);
SyncMousePos();
while(IsWaitingEvent()) {
@ -606,7 +612,7 @@ Ctrl *Ctrl::GetOwner()
return q >= 0 ? Xwindow()[q].owner : NULL;
}
void Ctrl::WndShow(bool b)
void Ctrl::WndShow0(bool b)
{
GuiLock __;
LLOG("WndShow " << b);
@ -624,7 +630,7 @@ void Ctrl::WndShow(bool b)
}
}
void Ctrl::WndUpdate()
void Ctrl::WndUpdate0()
{
GuiLock __;
LTIMING("WndUpdate");
@ -641,7 +647,7 @@ void Ctrl::WndUpdate()
}
}
void Ctrl::WndUpdate(const Rect& r)
void Ctrl::WndUpdate0r(const Rect& r)
{
GuiLock __;
LTIMING("WndUpdate Rect");
@ -657,7 +663,7 @@ void Ctrl::WndUpdate(const Rect& r)
xw.invalid = Subtract(xw.invalid, r, dummy);
}
void Ctrl::WndSetPos(const Rect& r)
void Ctrl::WndSetPos0(const Rect& r)
{
GuiLock __;
if(!top) return;
@ -798,10 +804,11 @@ void Ctrl::KillFocus(Window window)
w.ctrl->KillFocusWnd();
}
bool Ctrl::SetWndFocus()
void Ctrl::SetWndFocus0(bool *b)
{
GuiLock __;
LLOG("SetWndFocus " << Name());
*b = false;
if(top && top->window != focusWindow && IsEnabled() && IsVisible()) {
LLOG("Setting focus... ");
LTIMING("XSetInfputFocus");
@ -809,9 +816,8 @@ bool Ctrl::SetWndFocus()
XSetInputFocus(Xdisplay, top->window, RevertToParent, CurrentTime);
focusWindow = top->window;
SetFocusWnd();
return true;
*b = true;
}
return false;
}
bool Ctrl::HasWndFocus() const
@ -934,7 +940,7 @@ void Ctrl::AddGlobalRepaint()
}
}
void Ctrl::WndInvalidateRect(const Rect& r)
void Ctrl::WndInvalidateRect0(const Rect& r)
{
GuiLock __;
if(!top) return;
@ -942,7 +948,7 @@ void Ctrl::WndInvalidateRect(const Rect& r)
Invalidate(Xwindow().Get(top->window), r);
}
void Ctrl::SetWndForeground()
void Ctrl::SetWndForeground0()
{
GuiLock __;
LLOG("SetWndForeground " << Name());
@ -967,17 +973,20 @@ bool Ctrl::IsWndForeground() const
return ~focusCtrlWnd == (q ? q : GetTopCtrl());
}
bool Ctrl::WndEnable(bool b)
void Ctrl::WndEnable0(bool *b)
{
GuiLock __;
LLOG("WndEnable");
if(!top) return false;
if(!b) {
if(!top) {
*b = false;
return;
}
if(!*b) {
ReleaseCapture();
if(HasWndFocus())
XSetInputFocus(Xdisplay, None, RevertToPointerRoot, CurrentTime);
}
return true;
*b = true;
}
// 01/12/2007 - mdelfede

6
uppsrc/CtrlLib/ChGtk.cpp
View file

@ -560,13 +560,7 @@ bool IsEmptyImage(const Image& m)
Image GtkThemeIcon(const char *name, int size)
{
<<<<<<< .mine
Image m = GetGTK(gtk__parent(), size, 0, name, GTK_THEMEICON, 0, 0);
=======
Image m = GetGTK(gtk__parent(), size ? GTK_ICON_SIZE_LARGE_TOOLBAR
: GTK_ICON_SIZE_SMALL_TOOLBAR,
0, name, GTK_THEMEICON, 0, 0);
>>>>>>> .r1505
Size sz = m.GetSize();
int rsz = size ? 48 : 16;
if(sz.cx > rsz || sz.cy > rsz)