libufo-commits Mailing List for UFO: Universal Form Objects
Status: Beta
Brought to you by:
schmidtjf
Menu
▾
▴
libufo-commits — commit messages from cvs
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(8) |
Sep
(78) |
Oct
(69) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Johannes S. <sch...@us...> - 2007-05-13 12:18:47
|
Update of /cvsroot/libufo/ufo-0.5 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16915 Modified Files: configure.ac Log Message: Removed libXext dependency. It seems that UFO doesn't need it and it is by default not installed under Ubuntu Feisty Fawn. Index: configure.ac =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/configure.ac,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** configure.ac 21 Jan 2006 17:10:50 -0000 1.36 --- configure.ac 13 May 2007 12:18:41 -0000 1.37 *************** *** 236,240 **** if test x$have_x = xyes; then CFLAGS="$CFLAGS $X_CFLAGS" ! SYSTEM_LIBS="$SYSTEM_LIBS $X_LIBS -lX11 -lXext" AC_DEFINE_UNQUOTED([UFO_HAVE_X11], "1", --- 236,240 ---- if test x$have_x = xyes; then CFLAGS="$CFLAGS $X_CFLAGS" ! SYSTEM_LIBS="$SYSTEM_LIBS $X_LIBS -lX11" # -lXext" AC_DEFINE_UNQUOTED([UFO_HAVE_X11], "1", |
|
From: Johannes S. <sch...@us...> - 2007-05-13 12:15:12
|
Update of /cvsroot/libufo/ufo-0.5/src/xml In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15196/src/xml Modified Files: uxul.cpp Log Message: Added NULL pointer check (thanks Regis). Index: uxul.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/xml/uxul.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** uxul.cpp 24 Oct 2005 16:00:55 -0000 1.9 --- uxul.cpp 13 May 2007 12:15:04 -0000 1.10 *************** *** 616,620 **** do { node = m_doc->IterateChildren(node); ! unknown = node->ToUnknown(); } while (!unknown && node); if (unknown) { --- 616,622 ---- do { node = m_doc->IterateChildren(node); ! if (node != NULL) { ! unknown = node->ToUnknown(); ! } } while (!unknown && node); if (unknown) { |
|
From: Johannes S. <sch...@us...> - 2007-05-08 13:11:25
|
Update of /cvsroot/libufo/ufo-0.5/src/ux In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5746/src/ux Modified Files: uxglxdriver.cpp Log Message: Fixed updating the window decoration when changing the resizable attribute after showing the window frame. Index: uxglxdriver.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ux/uxglxdriver.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** uxglxdriver.cpp 8 May 2007 13:06:58 -0000 1.11 --- uxglxdriver.cpp 8 May 2007 13:10:42 -0000 1.12 *************** *** 1200,1206 **** setSizeHints(); } ! if ((oldStyle & ~FrameResizable) != (frameStyle & ~FrameResizable)) { setDecorations(); ! } } } --- 1200,1206 ---- setSizeHints(); } ! //if ((oldStyle & ~FrameResizable) != (frameStyle & ~FrameResizable)) { setDecorations(); ! //} } } |
|
From: Johannes S. <sch...@us...> - 2007-05-08 13:07:02
|
Update of /cvsroot/libufo/ufo-0.5/src/ux In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4018/src/ux Modified Files: uxglxdriver.cpp Log Message: Fixed changing of frame style after showing the window frame. Index: uxglxdriver.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ux/uxglxdriver.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** uxglxdriver.cpp 17 Oct 2005 16:22:50 -0000 1.10 --- uxglxdriver.cpp 8 May 2007 13:06:58 -0000 1.11 *************** *** 1123,1127 **** if (m_frameState & FrameMinimized) { wmHints->initial_state = IconicState; ! } else { wmHints->initial_state = NormalState; } --- 1123,1127 ---- if (m_frameState & FrameMinimized) { wmHints->initial_state = IconicState; ! } else { wmHints->initial_state = NormalState; } *************** *** 1194,1198 **** --- 1194,1207 ---- void UXGLXDevice::setFrameStyle(uint32_t frameStyle) { + uint32_t oldStyle = m_frameStyle; m_frameStyle = frameStyle; + if (m_isVisible) { + if ((oldStyle & FrameResizable) != (frameStyle & FrameResizable)) { + setSizeHints(); + } + if ((oldStyle & ~FrameResizable) != (frameStyle & ~FrameResizable)) { + setDecorations(); + } + } } uint32_t |
|
From: Johannes S. <sch...@us...> - 2007-05-08 12:57:31
|
Update of /cvsroot/libufo/ufo-0.5/src/ux In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32659/src/ux Modified Files: uxframe.cpp Log Message: Fixed resizable attribute of windows (UXFrame::setResizable). Thanks Andrew for the bug report. Index: uxframe.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ux/uxframe.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** uxframe.cpp 15 Sep 2005 10:13:47 -0000 1.8 --- uxframe.cpp 8 May 2007 12:57:28 -0000 1.9 *************** *** 186,197 **** void UXFrame::setResizable(bool b) { ! if (b == bool(m_videoDevice->getFrameStyle() & FrameResizable)) { return; } ! if (isVisible()) { ! //m_videoDevice->toggleFrameState(FrameFullScreen); } else { ! m_videoDevice->setFrameStyle(m_videoDevice->getFrameStyle() | FrameFullScreen); } } --- 186,199 ---- void UXFrame::setResizable(bool b) { ! if (b == isResizable()) { return; } ! uint32_t style = m_videoDevice->getFrameStyle(); ! if (b) { ! style |= FrameResizable; } else { ! style &= ~FrameResizable; } + m_videoDevice->setFrameStyle(style); } |
|
From: Johannes S. <sch...@us...> - 2006-09-17 14:25:21
|
Update of /cvsroot/libufo/ufo-0.5/src/gl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21924/src/gl Modified Files: ugl_graphics.cpp Log Message: Added workaround for a MESA (6.4.*) bug in glPopClientAttrib. Index: ugl_graphics.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/gl/ugl_graphics.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ugl_graphics.cpp 11 Apr 2006 12:34:36 -0000 1.20 --- ugl_graphics.cpp 17 Sep 2006 14:25:17 -0000 1.21 *************** *** 488,502 **** break; } if (buffer->getType() == UVertexArray::V3F) { ugl_driver->glInterleavedArrays(GL_V3F, 0, buffer->getArray()); ugl_driver->glDrawArrays(glType, 0, buffer->getCount()); } else if (buffer->getType() == UVertexArray::C3F_V3F) { // we use color arrays ... ! ugl_driver->glPushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT); ugl_driver->glShadeModel(GL_SMOOTH); ugl_driver->glInterleavedArrays(GL_C3F_V3F, 0, buffer->getArray()); ugl_driver->glDrawArrays(glType, 0, buffer->getCount()); ugl_driver->glShadeModel(GL_FLAT); ! ugl_driver->glPopClientAttrib(); } ugl_driver->glTranslatef(-ufo_line_add, -ufo_line_add, 0); --- 488,519 ---- break; } + // workaround for buggy glPopClientAttrib in MESA 6.4.* + GLboolean vertexArrayWasEnabled = false; + GLboolean colorArrayWasEnabled = false; + ugl_driver->glGetBooleanv(GL_VERTEX_ARRAY, &vertexArrayWasEnabled); + ugl_driver->glGetBooleanv(GL_COLOR_ARRAY, &colorArrayWasEnabled); if (buffer->getType() == UVertexArray::V3F) { + ugl_driver->glEnableClientState(GL_VERTEX_ARRAY); ugl_driver->glInterleavedArrays(GL_V3F, 0, buffer->getArray()); ugl_driver->glDrawArrays(glType, 0, buffer->getCount()); + if (!vertexArrayWasEnabled) { + ugl_driver->glDisableClientState(GL_VERTEX_ARRAY); + } } else if (buffer->getType() == UVertexArray::C3F_V3F) { // we use color arrays ... ! //ugl_driver->glPushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT); ! ugl_driver->glEnableClientState(GL_VERTEX_ARRAY); ! ugl_driver->glEnableClientState(GL_COLOR_ARRAY); ugl_driver->glShadeModel(GL_SMOOTH); ugl_driver->glInterleavedArrays(GL_C3F_V3F, 0, buffer->getArray()); ugl_driver->glDrawArrays(glType, 0, buffer->getCount()); ugl_driver->glShadeModel(GL_FLAT); ! //ugl_driver->glPopClientAttrib(); ! if (!vertexArrayWasEnabled) { ! ugl_driver->glDisableClientState(GL_VERTEX_ARRAY); ! } ! if (!colorArrayWasEnabled) { ! ugl_driver->glDisableClientState(GL_COLOR_ARRAY); ! } } ugl_driver->glTranslatef(-ufo_line_add, -ufo_line_add, 0); |
|
From: Johannes S. <sch...@us...> - 2006-09-17 14:25:20
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/gl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21924/include/ufo/gl Modified Files: ugl_prototypes.hpp Log Message: Added workaround for a MESA (6.4.*) bug in glPopClientAttrib. Index: ugl_prototypes.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/gl/ugl_prototypes.hpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ugl_prototypes.hpp 11 Oct 2005 19:16:13 -0000 1.9 --- ugl_prototypes.hpp 17 Sep 2006 14:25:16 -0000 1.10 *************** *** 99,103 **** UFO_GL_PROC_UNUSED(void,glDepthRange,(GLclampd zNear, GLclampd zFar)) UFO_GL_PROC(void,glDisable,(GLenum cap)) ! UFO_GL_PROC_UNUSED(void,glDisableClientState,(GLenum array)) UFO_GL_PROC(void,glDrawArrays,(GLenum mode, GLint first, GLsizei count)) UFO_GL_PROC_UNUSED(void,glDrawBuffer,(GLenum mode)) --- 99,103 ---- UFO_GL_PROC_UNUSED(void,glDepthRange,(GLclampd zNear, GLclampd zFar)) UFO_GL_PROC(void,glDisable,(GLenum cap)) ! UFO_GL_PROC(void,glDisableClientState,(GLenum array)) UFO_GL_PROC(void,glDrawArrays,(GLenum mode, GLint first, GLsizei count)) UFO_GL_PROC_UNUSED(void,glDrawBuffer,(GLenum mode)) *************** *** 108,112 **** UFO_GL_PROC_UNUSED(void,glEdgeFlagv,(const GLboolean *flag)) UFO_GL_PROC(void,glEnable,(GLenum cap)) ! UFO_GL_PROC_UNUSED(void,glEnableClientState,(GLenum array)) UFO_GL_PROC(void,glEnd,(void)) UFO_GL_PROC_UNUSED(void,glEndList,(void)) --- 108,112 ---- UFO_GL_PROC_UNUSED(void,glEdgeFlagv,(const GLboolean *flag)) UFO_GL_PROC(void,glEnable,(GLenum cap)) ! UFO_GL_PROC(void,glEnableClientState,(GLenum array)) UFO_GL_PROC(void,glEnd,(void)) UFO_GL_PROC_UNUSED(void,glEndList,(void)) |
|
From: Johannes S. <sch...@us...> - 2006-04-23 16:07:42
|
Update of /cvsroot/libufo/ufo-0.5/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29540 Modified Files: glut.cpp Log Message: Fixed echoing of special keys as chars. Index: glut.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/test/glut.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** glut.cpp 14 Feb 2005 10:45:03 -0000 1.6 --- glut.cpp 23 Apr 2006 16:07:37 -0000 1.7 *************** *** 214,218 **** void specialFunc(int key, int, int) { ! display->pushKeyDown(context, mapGlutSpecialKey(key), key); if (context->needsRepaint()) { glutPostRedisplay(); --- 214,218 ---- void specialFunc(int key, int, int) { ! display->pushKeyDown(context, mapGlutSpecialKey(key), 0); if (context->needsRepaint()) { glutPostRedisplay(); *************** *** 221,225 **** void specialUpFunc(int key, int, int) { ! display->pushKeyUp(context, mapGlutSpecialKey(key), key); if (context->needsRepaint()) { glutPostRedisplay(); --- 221,225 ---- void specialUpFunc(int key, int, int) { ! display->pushKeyUp(context, mapGlutSpecialKey(key), 0); if (context->needsRepaint()) { glutPostRedisplay(); |
|
From: Johannes S. <sch...@us...> - 2006-04-11 12:34:42
|
Update of /cvsroot/libufo/ufo-0.5/src/gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5626/src/gl Modified Files: ugl_graphics.cpp Log Message: Revoked broken patch for y coord in mapToDevice, mapFromDevice Index: ugl_graphics.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/gl/ugl_graphics.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ugl_graphics.cpp 25 Mar 2006 15:51:11 -0000 1.19 --- ugl_graphics.cpp 11 Apr 2006 12:34:36 -0000 1.20 *************** *** 136,148 **** URectangle UGL_Graphics::mapToDevice(const URectangle & rect) { - // FIXME - // this works only when the graphic viewport was set by the graphics object - //const UPoint & pos = w->pointToRootPoint(rect.x, rect.y); - int vport[4]; ugl_driver->glGetIntegerv(GL_VIEWPORT, vport); // y-flip ! return URectangle(vport[0] + rect.x, vport[1] + vport[3] - rect.y - rect.h + 1, rect.w, rect.h); } --- 136,144 ---- URectangle UGL_Graphics::mapToDevice(const URectangle & rect) { int vport[4]; ugl_driver->glGetIntegerv(GL_VIEWPORT, vport); // y-flip ! return URectangle(vport[0] + rect.x, vport[1] + vport[3] - rect.y - rect.h, rect.w, rect.h); } *************** *** 152,159 **** ugl_driver->glGetIntegerv(GL_VIEWPORT, vport); - // FIXME - // this is simply wrong // y-flip ! return URectangle(rect.x - vport[0], - vport[1] - vport[3] + rect.y + rect.h - 1, rect.w, rect.h); } --- 148,153 ---- ugl_driver->glGetIntegerv(GL_VIEWPORT, vport); // y-flip ! return URectangle(rect.x - vport[0], - vport[1] - vport[3] + rect.y + rect.h, rect.w, rect.h); } |
|
From: Johannes S. <sch...@us...> - 2006-03-25 15:51:29
|
Update of /cvsroot/libufo/ufo-0.5/src/gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29796 Modified Files: ugl_graphics.cpp Log Message: Fixed y coordinate in mapToDevice, mapFromDevice (thanks Andreas) Index: ugl_graphics.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/gl/ugl_graphics.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** ugl_graphics.cpp 21 Jan 2006 17:11:53 -0000 1.18 --- ugl_graphics.cpp 25 Mar 2006 15:51:11 -0000 1.19 *************** *** 144,148 **** // y-flip ! return URectangle(vport[0] + rect.x, vport[1] + vport[3] - rect.y - rect.h, rect.w, rect.h); } --- 144,148 ---- // y-flip ! return URectangle(vport[0] + rect.x, vport[1] + vport[3] - rect.y - rect.h + 1, rect.w, rect.h); } *************** *** 155,159 **** // this is simply wrong // y-flip ! return URectangle(rect.x - vport[0], - vport[1] - vport[3] + rect.y + rect.h, rect.w, rect.h); } --- 155,159 ---- // this is simply wrong // y-flip ! return URectangle(rect.x - vport[0], - vport[1] - vport[3] + rect.y + rect.h - 1, rect.w, rect.h); } |
|
From: Johannes S. <sch...@us...> - 2006-01-21 17:12:01
|
Update of /cvsroot/libufo/ufo-0.5/src/gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5599/src/gl Modified Files: ugl_graphics.cpp Log Message: Fixed saving client state (thanks Mobius). Index: ugl_graphics.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/gl/ugl_graphics.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ugl_graphics.cpp 29 Oct 2005 15:20:48 -0000 1.17 --- ugl_graphics.cpp 21 Jan 2006 17:11:53 -0000 1.18 *************** *** 498,505 **** --- 498,508 ---- ugl_driver->glDrawArrays(glType, 0, buffer->getCount()); } else if (buffer->getType() == UVertexArray::C3F_V3F) { + // we use color arrays ... + ugl_driver->glPushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT); ugl_driver->glShadeModel(GL_SMOOTH); ugl_driver->glInterleavedArrays(GL_C3F_V3F, 0, buffer->getArray()); ugl_driver->glDrawArrays(glType, 0, buffer->getCount()); ugl_driver->glShadeModel(GL_FLAT); + ugl_driver->glPopClientAttrib(); } ugl_driver->glTranslatef(-ufo_line_add, -ufo_line_add, 0); |
|
From: Johannes S. <sch...@us...> - 2006-01-21 17:11:34
|
Update of /cvsroot/libufo/ufo-0.5/src/gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5497/src/gl Modified Files: ugl_builtinfontrenderer.cpp Log Message: Fixed range checking (thanks Dmitriy) Index: ugl_builtinfontrenderer.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/gl/ugl_builtinfontrenderer.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ugl_builtinfontrenderer.cpp 5 Jul 2005 11:29:53 -0000 1.8 --- ugl_builtinfontrenderer.cpp 21 Jan 2006 17:11:26 -0000 1.9 *************** *** 220,224 **** int UGL_BuiltinFontMetrics::getCharWidth(const wchar_t chA) const { ! return (m_renderer->m_fontStruct.m_characters[chA])[0]; } --- 220,224 ---- int UGL_BuiltinFontMetrics::getCharWidth(const wchar_t chA) const { ! return (m_renderer->m_fontStruct.m_characters[uint8_t(chA)])[0]; } *************** *** 230,234 **** for (;index < nChar; ++index) { ! advance += (m_renderer->m_fontStruct.m_characters[text[index]])[0]; if (advance > w) { index--; --- 230,234 ---- for (;index < nChar; ++index) { ! advance += (m_renderer->m_fontStruct.m_characters[uint8_t(text[index])])[0]; if (advance > w) { index--; |
|
From: Johannes S. <sch...@us...> - 2006-01-21 17:11:04
|
Update of /cvsroot/libufo/ufo-0.5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5276 Modified Files: configure.ac Log Message: Bumped version info to 0.8.5. Index: configure.ac =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/configure.ac,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** configure.ac 12 Oct 2005 12:02:18 -0000 1.35 --- configure.ac 21 Jan 2006 17:10:50 -0000 1.36 *************** *** 21,25 **** UFO_MAJOR_VERSION=0 UFO_MINOR_VERSION=8 ! UFO_MICRO_VERSION=4 UFO_INTERFACE_AGE=0 UFO_BINARY_AGE=0 --- 21,25 ---- UFO_MAJOR_VERSION=0 UFO_MINOR_VERSION=8 ! UFO_MICRO_VERSION=5 UFO_INTERFACE_AGE=0 UFO_BINARY_AGE=0 |
|
From: Johannes S. <sch...@us...> - 2005-10-29 16:02:44
|
Update of /cvsroot/libufo/ufo-0.5/src/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12042/src/util Modified Files: ufilearchive.cpp Log Message: Fixed isDirectory on Windows. Index: ufilearchive.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/util/ufilearchive.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ufilearchive.cpp 21 Oct 2005 12:06:55 -0000 1.11 --- ufilearchive.cpp 29 Oct 2005 16:02:33 -0000 1.12 *************** *** 151,155 **** return S_ISDIR(statbuf.st_mode); #elif defined(UFO_OS_WIN32) // !UFO_OS_UNIX ! return ((GetFileAttributes(path) & FILE_ATTRIBUTE_DIRECTORY) != 0); #else return false; --- 151,155 ---- return S_ISDIR(statbuf.st_mode); #elif defined(UFO_OS_WIN32) // !UFO_OS_UNIX ! return ((GetFileAttributes(path.c_str()) & FILE_ATTRIBUTE_DIRECTORY) != 0); #else return false; |
|
From: Johannes S. <sch...@us...> - 2005-10-29 15:36:24
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/ux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7102/include/ufo/ux Modified Files: uxwgldriver.hpp Log Message: Fixed texture sharing for WGL target. Index: uxwgldriver.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/ux/uxwgldriver.hpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** uxwgldriver.hpp 17 Oct 2005 16:39:54 -0000 1.7 --- uxwgldriver.hpp 29 Oct 2005 15:36:16 -0000 1.8 *************** *** 75,78 **** --- 75,79 ---- UFO_WGL_PROC(HGLRC,wglCreateContext,(HDC)) UFO_WGL_PROC(BOOL,wglDeleteContext,(HGLRC)) + UFO_WGL_PROC(BOOL,wglShareLists,(HGLRC, HGLRC)) #undef UFO_WGL_PROC |
|
From: Johannes S. <sch...@us...> - 2005-10-29 15:36:24
|
Update of /cvsroot/libufo/ufo-0.5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7102 Modified Files: ChangeLog Log Message: Fixed texture sharing for WGL target. Index: ChangeLog =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/ChangeLog,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** ChangeLog 27 Oct 2005 14:30:52 -0000 1.39 --- ChangeLog 29 Oct 2005 15:36:16 -0000 1.40 *************** *** 917,918 **** --- 917,919 ---- - Implemented XUL elements: groupbox, deck, stack and tabbox - Allow non-radio buttons in button groups to be deselected. + - Fixed texture sharing for WGL target. |
|
From: Johannes S. <sch...@us...> - 2005-10-29 15:36:24
|
Update of /cvsroot/libufo/ufo-0.5/src/ux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7102/src/ux Modified Files: uxwgldriver.cpp Log Message: Fixed texture sharing for WGL target. Index: uxwgldriver.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ux/uxwgldriver.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** uxwgldriver.cpp 21 May 2005 15:19:36 -0000 1.6 --- uxwgldriver.cpp 29 Oct 2005 15:36:16 -0000 1.7 *************** *** 159,162 **** --- 159,163 ---- UFO_WGL_PROC(HGLRC,wglCreateContext,(HDC)) UFO_WGL_PROC(BOOL,wglDeleteContext,(HGLRC)) + UFO_WGL_PROC(BOOL,wglShareLists,(HGLRC, HGLRC)) #undef UFO_WGL_PROC *************** *** 1082,1085 **** --- 1083,1087 ---- } + static HGLRC s_wgl_shared_context = NULL; bool UXWGLDevice::show() { *************** *** 1135,1138 **** --- 1137,1145 ---- m_glContext = m_wglDriver->wglCreateContext(m_dc); makeContextCurrent(); + if (s_wgl_shared_context == NULL) { + s_wgl_shared_context = m_glContext; + } else { + m_wglDriver->wglShareLists(m_glContext, s_wgl_shared_context); + } //setSizeHints(); *************** *** 1155,1158 **** --- 1162,1168 ---- void UXWGLDevice::hide() { + if (s_wgl_shared_context == m_glContext) { + s_wgl_shared_context = NULL; + } m_wglDriver->wglDeleteContext(m_glContext); m_glContext = NULL; |
|
From: Johannes S. <sch...@us...> - 2005-10-29 15:22:06
|
Update of /cvsroot/libufo/ufo-0.5/src/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4907/src/text Modified Files: utextlayout.cpp Log Message: Added check for zero-length texts. Index: utextlayout.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/text/utextlayout.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** utextlayout.cpp 30 Sep 2005 12:37:20 -0000 1.3 --- utextlayout.cpp 29 Oct 2005 15:21:55 -0000 1.4 *************** *** 310,314 **** index++; } ! if (lineStart < m_length || m_text[m_length - 1] == '\n') { UTextLine line(lineStart, m_length - lineStart, lineHeight, pos); m_lines.push_back(line); --- 310,314 ---- index++; } ! if (lineStart < m_length || (m_length && m_text[m_length - 1] == '\n')) { UTextLine line(lineStart, m_length - lineStart, lineHeight, pos); m_lines.push_back(line); |
|
From: Johannes S. <sch...@us...> - 2005-10-29 15:20:57
|
Update of /cvsroot/libufo/ufo-0.5/src/gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4656/src/gl Modified Files: ugl_graphics.cpp Log Message: Yet another pixel rasterization correction. Index: ugl_graphics.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/gl/ugl_graphics.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ugl_graphics.cpp 24 Oct 2005 15:56:06 -0000 1.16 --- ugl_graphics.cpp 29 Oct 2005 15:20:48 -0000 1.17 *************** *** 440,444 **** // basic drawing operations // ! static float ufo_line_add = 0.5f; void UGL_Graphics::drawRect(const URectangle & rect) { --- 440,444 ---- // basic drawing operations // ! static float ufo_line_add = 0.375f; void UGL_Graphics::drawRect(const URectangle & rect) { |
|
From: Johannes S. <sch...@us...> - 2005-10-29 15:20:57
|
Update of /cvsroot/libufo/ufo-0.5/src/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4656/src/ui Modified Files: ubasicstyle.cpp Log Message: Yet another pixel rasterization correction. Index: ubasicstyle.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ui/ubasicstyle.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ubasicstyle.cpp 26 Oct 2005 12:09:07 -0000 1.10 --- ubasicstyle.cpp 29 Oct 2005 15:20:49 -0000 1.11 *************** *** 276,281 **** bg.add(rect.x + rect.w, rect.y + 1); bg.setColor(col); ! bg.add(rect.x + rect.w, rect.y + rect.h - 2); ! bg.add(rect.x + 1, rect.y + rect.h - 2); g->drawVertexArray(UGraphics::TriangleFan, &bg); --- 276,281 ---- bg.add(rect.x + rect.w, rect.y + 1); bg.setColor(col); ! bg.add(rect.x + rect.w, rect.y + rect.h - 1); ! bg.add(rect.x + 1, rect.y + rect.h - 1); g->drawVertexArray(UGraphics::TriangleFan, &bg); |
|
From: Johannes S. <sch...@us...> - 2005-10-29 11:57:52
|
Update of /cvsroot/libufo/ufo-0.5/msvc/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32096 Modified Files: test.dsw Added Files: morewidgets.dsp Removed Files: slider.dsp theme.dsp properties.dsp Log Message: Merged several example files in morewidgets.cpp Index: test.dsw =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/msvc/test/test.dsw,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** test.dsw 3 Sep 2005 10:23:08 -0000 1.4 --- test.dsw 29 Oct 2005 11:57:44 -0000 1.5 *************** *** 100,104 **** ############################################################################### ! Project: "multipleframes"=".\multipleframes.dsp" - Package Owner=<4> Package=<5> --- 100,104 ---- ############################################################################### ! Project: "morewidgets"=".\morewidgets.dsp" - Package Owner=<4> Package=<5> *************** *** 112,116 **** ############################################################################### ! Project: "properties"=".\properties.dsp" - Package Owner=<4> Package=<5> --- 112,116 ---- ############################################################################### ! Project: "multipleframes"=".\multipleframes.dsp" - Package Owner=<4> Package=<5> *************** *** 136,151 **** ############################################################################### - Project: "slider"=".\slider.dsp" - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - }}} - - ############################################################################### - Project: "text"=".\text.dsp" - Package Owner=<4> --- 136,139 ---- *************** *** 160,175 **** ############################################################################### - Project: "theme"=".\theme.dsp" - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ - }}} - - ############################################################################### - Project: "xul"=".\xul.dsp" - Package Owner=<4> --- 148,151 ---- --- NEW FILE: morewidgets.dsp --- # Microsoft Developer Studio Project File - Name="morewidgets" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 CFG=morewidgets - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "morewidgets.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "morewidgets.mak" CFG="morewidgets - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "morewidgets - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "morewidgets - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "morewidgets - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release" # PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 ufo.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"bin/morewidgets.exe" !ELSEIF "$(CFG)" == "morewidgets - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Win32_Debug" # PROP BASE Intermediate_Dir "Win32_Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 ufo_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"bin/morewidgets.exe" /pdbtype:sept !ENDIF # Begin Target # Name "morewidgets - Win32 Release" # Name "morewidgets - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=..\..\test\morewidgets.cpp # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # End Group # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group # End Target # End Project --- properties.dsp DELETED --- --- slider.dsp DELETED --- --- theme.dsp DELETED --- |
|
From: Johannes S. <sch...@us...> - 2005-10-29 11:55:01
|
Update of /cvsroot/libufo/ufo-0.5/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31834 Added Files: morewidgets.cpp Log Message: Merged several example files in morewidgets.cpp --- NEW FILE: morewidgets.cpp --- /*************************************************************************** LibUFO - UI For OpenGL copyright : (C) 2001-2005 by Johannes Schmidt email : schmidtjf at users.sourceforge.net ------------------- file : test/theme.cpp begin : Thu Mar 27 2003 $Id: morewidgets.cpp,v 1.1 2005/10/29 11:54:53 schmidtjf Exp $ ***************************************************************************/ #include <ufo/ufo.hpp> #include <ufo/ux/ux.hpp> // This example shows the use of list boxes, spin boxes, // tab boxes, sliders and progress bars using namespace ufo; void createContent(UWidget * content); int main(int argc, char ** argv) { // creates the toolkit object, initializes UFO UXToolkit tk; // loads the video driver and creates the event queue UXDisplay display; // creates a frame UXFrame * frame = display.createFrame(); frame->setTitle("more widgets"); frame->setBounds(0, 0, 640, 480); frame->setResizable(true); frame->setVisible(true); // Now you have a valid OpenGL context // user created widgets are placed in the content pane // create some widgets and add them to the content pane createContent(frame->getContentPane()); // main event loop bool done = false; while (!done) { // pumps events from the system event queue display.pumpEvents(); // dispatchEvents returns true when a quit event was processed. done = display.dispatchEvents(); if (!done) { // repaint the frame frame->repaint(); // give other processes a chance tk.sleep(1); } } return 0; } void selectionChanged(UListBox * box, int first, int last) { std::cout << "Selected item " << box->getSelectedIndex() << ": " << box->getSelectedItem() << "\n"; } // // selection adjusting widgets // void addListBox(UWidget * parent) { // add a list box UListBox * box = new UListBox(); box->addItem("this is a list box"); box->addItem("item1"); box->addItem("item2"); box->addItem("item3"); box->addItem("item4"); box->addItem("item5"); box->addItem("item6"); // make the list scrollable parent->add(new UScrollPane(box)); box->sigSelectionChanged().connect(slot(&selectionChanged)); } void addTabWidget(UWidget * parent) { UTabWidget * box = new UTabWidget(); box->addTab(new ULabel("tab 1"), "&label"); box->addTab(new UButton("tab 2"), "&button"); box->addTab(new UTextEdit("this is a \nlonger text"), "&text"); parent->add(box); } // // value adjusting widgets // void addSlider(UWidget * parent) { USlider * slider = new USlider(); slider->setRange(0, 100); slider->setValue(20); parent->add(slider); } void addSpinBox(UWidget * parent) { USpinBox * box = new USpinBox(); box->setRange(10, 100); box->setValue(20); parent->add(box); } void addProgressBar(UWidget * parent) { UProgressBar * bar = new UProgressBar(); bar->setRange(0, 100); bar->setValue(20); parent->add(bar); } // creates our widgets void createContent(UWidget * content) { content->setOrientation(Vertical); UWidget * listboxPane = new UWidget(); listboxPane->setOrientation(Horizontal); content->add(listboxPane); // add a label (static text) listboxPane->add(new ULabel("label")); addListBox(listboxPane); addTabWidget(content); addSlider(content); addSpinBox(content); addProgressBar(content); } |
|
From: Johannes S. <sch...@us...> - 2005-10-29 11:54:39
|
Update of /cvsroot/libufo/ufo-0.5/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31798 Modified Files: Makefile.am Removed Files: properties.cpp progressbar.cpp slider.cpp theme.cpp Log Message: Merged several example files in morewidgets.cpp --- slider.cpp DELETED --- --- progressbar.cpp DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/test/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 3 Sep 2005 10:23:49 -0000 1.6 --- Makefile.am 29 Oct 2005 11:54:32 -0000 1.7 *************** *** 13,22 **** menus \ multipleframes \ ! progressbar \ ! properties \ sdl \ - slider \ text \ - theme \ widget3d \ xul --- 13,19 ---- menus \ multipleframes \ ! morewidgets \ sdl \ text \ widget3d \ xul *************** *** 33,42 **** menus_SOURCES = menus.cpp multipleframes_SOURCES = multipleframes.cpp ! progressbar_SOURCES = progressbar.cpp ! properties_SOURCES = properties.cpp sdl_SOURCES = sdl.cpp - slider_SOURCES = slider.cpp text_SOURCES = text.cpp - theme_SOURCES = theme.cpp widget3d_SOURCES = widget3d.cpp xul_SOURCES = xul.cpp --- 30,36 ---- menus_SOURCES = menus.cpp multipleframes_SOURCES = multipleframes.cpp ! morewidgets_SOURCES = morewidgets.cpp sdl_SOURCES = sdl.cpp text_SOURCES = text.cpp widget3d_SOURCES = widget3d.cpp xul_SOURCES = xul.cpp --- properties.cpp DELETED --- --- theme.cpp DELETED --- |
|
From: Johannes S. <sch...@us...> - 2005-10-27 14:31:01
|
Update of /cvsroot/libufo/ufo-0.5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8321 Modified Files: ChangeLog Log Message: Allow non-radio buttons in button groups to be deselected. Index: ChangeLog =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/ChangeLog,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** ChangeLog 26 Oct 2005 13:41:14 -0000 1.38 --- ChangeLog 27 Oct 2005 14:30:52 -0000 1.39 *************** *** 916,917 **** --- 916,918 ---- - Fixed clean-up of ugl_driver in dummy video driver. - Implemented XUL elements: groupbox, deck, stack and tabbox + - Allow non-radio buttons in button groups to be deselected. |
|
From: Johannes S. <sch...@us...> - 2005-10-27 14:31:00
|
Update of /cvsroot/libufo/ufo-0.5/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8321/src Modified Files: ubuttongroup.cpp Log Message: Allow non-radio buttons in button groups to be deselected. Index: ubuttongroup.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ubuttongroup.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ubuttongroup.cpp 6 Jul 2005 11:32:20 -0000 1.6 --- ubuttongroup.cpp 27 Oct 2005 14:30:52 -0000 1.7 *************** *** 29,32 **** --- 29,34 ---- #include "ufo/widgets/ubutton.hpp" + // special case for radio buttons + #include "ufo/widgets/uradiobutton.hpp" using namespace ufo; *************** *** 67,71 **** UButtonGroup::setSelectedButton(UButton * button, bool selected) { if (!selected) { ! if (m_selectedButton) { m_selectedButton->setSelected(false); m_selectedButton = NULL; --- 69,73 ---- UButtonGroup::setSelectedButton(UButton * button, bool selected) { if (!selected) { ! if (button == m_selectedButton && !dynamic_cast<URadioButton*>(button)) { m_selectedButton->setSelected(false); m_selectedButton = NULL; |
