fix display leak

git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@833 b9cfdab3-6d41-4d17-bbe4-086880011989

.clang-format

@@ -1,5 +1,4 @@
 ---
-# $Id$
 Language: Cpp
 UseTab: Always
 TabWidth: 8

.gitignore

@@ -1,5 +1,6 @@
 *.o
 *.so
+*.dll
 examples/*
 examples/*.exe
 examples/*/*

BorMakefile

@@ -1,4 +1,3 @@
-# $Id$
 CC = bcc32 -c
 LD = bcc32
 

CMakeLists.txt

@@ -1,4 +1,3 @@
-# $Id$
 cmake_minimum_required(VERSION 3.25)
 project(
 	milsko

Doxyfile

@@ -1,4 +1,3 @@
-# $Id$
 PROJECT_LOGO = resource/logo/logo64.png
 PROJECT_NAME = Milsko
 PROJECT_BRIEF = "Lightweight and fast GUI toolkit"

Koakumafile

@@ -1,4 +1,3 @@
-# $Id$
 # vim: syntax=tcl
 
 proc run {project_name} {

Makefile.pl

@@ -1,5 +1,4 @@
 #!/usr/bin/env perl
-# $Id$
 our $target = `uname -s`;
 $target =~ s/\r?\n$//;
 

NTMakefile

@@ -1,4 +1,3 @@
-# $Id$
 CC = cl /TC /c /nologo
 LD = link /nologo
 

WatMakefile

@@ -1,4 +1,3 @@
-# $Id$
 CC = wcc386 -bt=nt -q -bd
 LD = wlink option quiet
 

examples/CMakeLists.txt

@@ -1,2 +1 @@
-# $Id$
 add_subdirectory(basic)

examples/basic/CMakeLists.txt

@@ -1,4 +1,3 @@
-# $Id$
 file(
 	GLOB
 	EXAMPLES_BASIC_SOURCES

examples/basic/checkbox.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 int main() {

examples/basic/colorpicker.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 
 #include <Mw/Milsko.h>
 

examples/basic/combobox.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 int main(){

examples/basic/example.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 MwWidget window, menu, button, button2, button3, button4;

examples/basic/image.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 int main() {

examples/basic/listbox.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 #include "../harvard.c"

examples/basic/messagebox.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 void ok(MwWidget handle, void* user, void* call) {

examples/basic/radiobox.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 int main() {

examples/basic/rotate.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 /* this demo does not work well on windows */
 #include <Mw/Milsko.h>
 

examples/basic/scrollbar.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 
 #include <Mw/Milsko.h>
 

examples/basic/viewport.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 MwWidget vp;

examples/gldemos/boing.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #define TITLE "boing"
 #include "glutlayer.c"
 

examples/gldemos/clock.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 #include <Mw/Widget/OpenGL.h>
 

examples/gldemos/cube.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #define TITLE "cube"
 #include "glutlayer.c"
 

examples/gldemos/gears.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #define TITLE "gears"
 #include "glutlayer.c"
 

examples/gldemos/triangle.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 #include <Mw/Widget/OpenGL.h>
 

examples/gldemos/tripaint.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 #include <Mw/Widget/OpenGL.h>
 

examples/vkdemos/vulkan.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /**
  * this example is quite minimal, you may need to modify it if your graphics card is more esoteric

external/stb_ds.c

@@ -1,3 +1,2 @@
-/* $Id$ */
 #define STB_DS_IMPLEMENTATION
 #include "stb_ds.h"

external/stb_image.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #ifdef USE_STB_IMAGE
 #define STB_IMAGE_IMPLEMENTATION
 #include "stb_image.h"

external/stb_truetype.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #ifdef USE_STB_TRUETYPE
 #define STB_TRUETYPE_IMPLEMENTATION
 #include "stb_truetype.h"

include/Mw/Abstract/Directory.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Abstract/Directory.h
  * @brief Directory functions

include/Mw/Abstract/Dynamic.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Abstract/Dynamic.h
  * @brief Dynamic library

include/Mw/Abstract/Time.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Abstract/Time.h
  * @brief Time

include/Mw/BaseTypes.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/BaseTypes.h
  * @brief Base type definitions

include/Mw/Constants.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Constants.h
  * @brief Constants

include/Mw/Core.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Core.h
  * @brief Core

include/Mw/Default.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Default.h
  * @brief Default properties

include/Mw/Dialog/ColorPicker.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Dialog/ColorPicker.h
  * @brief Color picker

include/Mw/Dialog/DirectoryChooser.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Dialog/DirectoryChooser.h
  * @brief Directory chooser

include/Mw/Dialog/FileChooser.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Dialog/FileChooser.h
  * @brief File chooser

include/Mw/Dialog/MessageBox.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Dialog/MessageBox.h
  * @brief Message box

include/Mw/Draw.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Draw.h
  * @brief Common drawing API

include/Mw/Error.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Error.h
  * @brief Error codes

include/Mw/Font.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Font.h
  * @brief Font

include/Mw/LowLevel.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/LowLevel.h
  * @brief Low-level drawing API

include/Mw/LowLevel/GDI.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/LowLevel/GDI.h
  * @brief GDI Backend

include/Mw/LowLevel/X11.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/LowLevel/X11.h
  * @brief X11 Backend
@@ -34,6 +33,7 @@ struct _MwLLX11 {
 	XIC	 xic;
 
 	int top;
+	int toplevel;
 	int grabbed;
 	int force_render;
 

include/Mw/MachDep.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/MachDep.h
  * @brief Machine dependent headers and macros

include/Mw/Milsko.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Milsko.h
  * @brief Includes all headers

include/Mw/Resource/Cursor.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Resource/Cursor.h
  * @brief Cursor externs

include/Mw/Resource/Font.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Resource/Font.h
  * @brief Default font resources

include/Mw/Resource/Icon.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Resource/Icon.h
  * @brief Icon

include/Mw/String.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/String.h
  * @brief String utilities

include/Mw/StringDefs.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/StringDefs.h
  * @brief String definitions for property
@@ -45,22 +44,22 @@
 #define MwNfont "Vfont"
 #define MwNboldFont "VboldFont"
 
-#define MwNactivateHandler "Cactivate"	   /* NULL/int* (MwListBox)/void* (MwTreeView) */
-#define MwNresizeHandler "Cresize"	   /* NULL */
-#define MwNtickHandler "Ctick"		   /* NULL */
-#define MwNmenuHandler "Cmenu"		   /* MwMenu */
-#define MwNmouseDownHandler "CmouseDown"   /* MwLLMouse* */
-#define MwNmouseUpHandler "CmouseUp"	   /* same as MwNmouseDownHandler */
-#define MwNmouseMoveHandler "CmouseMove"   /* MwPoint* */
-#define MwNchangedHandler "Cchanged"	   /* NULL/int* (MwComboBox) */
-#define MwNkeyHandler "Ckey"		   /* int* (MwLLKeyEnum or character code) */
-#define MwNkeyReleaseHandler "CkeyRelease" /* same as MwNkeyHandler */
-#define MwNcloseHandler "Cclose"	   /* NULL */
-#define MwNfocusInHandler "CfocusIn"	   /* NULL */
-#define MwNfocusOutHandler "CfocusOut"	   /* NULL */
-#define MwNfileChosenHandler "CfileChosen" /* char* */
-#define MwNdirectoryChosenHandler MwNfileChosenHandler
-#define MwNcolorChosenHandler "CcolorChosen" /* MwRGB* */
-#define MwNdrawHandler "Cdraw"		     /* NULL */
+#define MwNactivateHandler "Cactivate"		     /* NULL/int* (MwListBox)/void* (MwTreeView) */
+#define MwNresizeHandler "Cresize"		     /* NULL */
+#define MwNtickHandler "Ctick"			     /* NULL */
+#define MwNmenuHandler "Cmenu"			     /* MwMenu */
+#define MwNmouseDownHandler "CmouseDown"	     /* MwLLMouse* */
+#define MwNmouseUpHandler "CmouseUp"		     /* same as MwNmouseDownHandler */
+#define MwNmouseMoveHandler "CmouseMove"	     /* MwPoint* */
+#define MwNchangedHandler "Cchanged"		     /* NULL/int* (MwComboBox) */
+#define MwNkeyHandler "Ckey"			     /* int* (MwLLKeyEnum or character code) */
+#define MwNkeyReleaseHandler "CkeyRelease"	     /* same as MwNkeyHandler */
+#define MwNcloseHandler "Cclose"		     /* NULL */
+#define MwNfocusInHandler "CfocusIn"		     /* NULL */
+#define MwNfocusOutHandler "CfocusOut"		     /* NULL */
+#define MwNfileChosenHandler "CfileChosen"	     /* char* */
+#define MwNdirectoryChosenHandler "CdirectoryChosen" /* char* */
+#define MwNcolorChosenHandler "CcolorChosen"	     /* MwRGB* */
+#define MwNdrawHandler "Cdraw"			     /* NULL */
 
 #endif

include/Mw/TypeDefs.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/TypeDefs.h
  * @brief Type definitions

include/Mw/Unicode.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Unicode.h
  * @brief Handles UTF8 stuff

include/Mw/Version.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Version.h
  * @brief Version informations

include/Mw/Widget/Button.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/Button.h
  * @brief Button widget

include/Mw/Widget/CheckBox.h

@@ -1,4 +1,3 @@
-/* $Id: CheckBox.h 206 2025-10-07 15:10:46Z nishi $ */
 /*!
  * @file Mw/Widget/CheckBox.h
  * @brief CheckBox widget

include/Mw/Widget/ComboBox.h

@@ -1,4 +1,3 @@
-/* $Id: ComboBox.h 206 2025-10-07 15:10:46Z nishi $ */
 /*!
  * @file Mw/Widget/ComboBox.h
  * @brief ComboBox widget

include/Mw/Widget/Entry.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/Entry.h
  * @brief Entry widget

include/Mw/Widget/Frame.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/Frame.h
  * @brief Frame widget

include/Mw/Widget/Image.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/Image.h
  * @brief Image widget

include/Mw/Widget/Label.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/Label.h
  * @brief Label widget

include/Mw/Widget/ListBox.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/ListBox.h
  * @brief ListBox widget

include/Mw/Widget/Menu.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/Menu.h
  * @brief Menu widget

include/Mw/Widget/NumberEntry.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/NumberEntry.h
  * @brief NumberEntry widget

include/Mw/Widget/OpenGL.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/OpenGL.h
  * @brief OpenGL widget

include/Mw/Widget/ProgressBar.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/ProgressBar.h
  * @brief ProgressBar widget

include/Mw/Widget/RadioBox.h

@@ -1,4 +1,3 @@
-/* $Id: RadioBox.h 206 2025-10-07 15:10:46Z nishi $ */
 /*!
  * @file Mw/Widget/RadioBox.h
  * @brief RadioBox widget

include/Mw/Widget/ScrollBar.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/ScrollBar.h
  * @brief ScrollBar widget

include/Mw/Widget/Separator.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/Separator.h
  * @brief Separator widget

include/Mw/Widget/SubMenu.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/SubMenu.h
  * @brief SubMenu widget

include/Mw/Widget/TreeView.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/TreeView.h
  * @brief TreeView widget

include/Mw/Widget/Viewport.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/Viewport.h
  * @brief Viewport widget

include/Mw/Widget/Vulkan.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/Vulkan.h
  * @brief Vulkan widget

include/Mw/Widget/Window.h

@@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
  * @file Mw/Widget/Window.h
  * @brief Window widget

milsko.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!-- $Id$ -->
 <!--
 	Basically, you have to implement 10+n types:
 	 - Integer (int)
@@ -100,6 +99,7 @@
 		<handler name="focusIn" />
 		<handler name="focusOut" />
 		<handler name="fileChosen" />
+		<handler name="directoryChosen" />
 		<handler name="colorChosen" />
 		<handler name="draw" />
 	</properties>

pl/ostype/Linux.pl

@@ -1,4 +1,3 @@
-# $Id$
 use_backend("x11");
 
 1;

pl/ostype/NetBSD.pl

@@ -1,4 +1,3 @@
-# $Id$
 add_incdir("-I/usr/X11R7/include -I/usr/pkg/include");
 add_libdir(
     "-L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib");

pl/ostype/SunOS.pl

@@ -1,4 +1,3 @@
-# $Id$
 use_backend("x11");
 
 1;

pl/ostype/UnixWare.pl

@@ -1,4 +1,3 @@
-# $Id$
 add_libs("-lsocket -lnsl");
 use_backend("x11");
 

pl/ostype/Windows.pl

@@ -1,4 +1,3 @@
-# $Id$
 $library_prefix    = "";
 $library_suffix    = ".dll";
 $executable_suffix = ".exe";

pl/rules.pl

@@ -1,4 +1,3 @@
-# $Id$
 new_object("src/*.c");
 
 my $gl_libs = "";

pl/utils.pl

@@ -1,4 +1,3 @@
-# $Id$
 sub add_incdir {
     my $input = $_[0];
     $input =~ s/\r?\n/ /g;

resource/logo/102x47.pov

@@ -1,4 +1,3 @@
-/* $Id $*/
 #declare FAR = 2.25;
 #declare Y = -0.5;
 

resource/logo/banner.pov

@@ -1,4 +1,3 @@
-/* $Id$ */
 #declare BASE = 1;
 #include "resource/logo/logo.pov"
 

resource/logo/logo.pov

@@ -1,4 +1,3 @@
-// $Id$
 #include "shapes.inc"
 #include "colors.inc"
 #include "textures.inc"

src/abstract/directory.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 #ifdef _WIN32

src/abstract/dynamic.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 #if defined(_WIN32)

src/abstract/time.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 #if defined(_WIN32)

src/backend/call.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 /* This file gets included by backend */
 #define CALL(NAME) \
 	int MwLL##NAME##CallInit(void) { \

src/backend/gdi.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 typedef struct userdata {
@@ -501,7 +500,6 @@ static void MwLLDrawPixmapImpl(MwLL handle, MwRect* rect, MwLLPixmap pixmap) {
 
 static void MwLLSetIconImpl(MwLL handle, MwLLPixmap pixmap) {
 	ICONINFO ii;
-	HICON	 ico;
 
 	memset(&ii, 0, sizeof(ii));
 	ii.fIcon    = TRUE;
@@ -729,6 +727,9 @@ static void MwLLGetCursorCoordImpl(MwLL handle, MwPoint* point) {
 
 static void MwLLGetScreenSizeImpl(MwLL handle, MwRect* rect) {
 	RECT rc;
+
+	(void)handle;
+
 	GetClientRect(GetDesktopWindow(), &rc);
 
 	rect->x = rect->y = 0;

src/backend/x11.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 #include "../../external/stb_ds.h"
@@ -152,10 +151,12 @@ static MwLL MwLLCreateImpl(MwLL parent, int x, int y, int width, int height) {
 		r->x11.display = XOpenDisplay(NULL);
 		p	       = XRootWindow(r->x11.display, XDefaultScreen(r->x11.display));
 		r->x11.top     = 1;
+		r->x11.toplevel = 1;
 	} else {
 		r->x11.display = parent->x11.display;
 		p	       = parent->x11.window;
 		r->x11.top     = 0;
+		r->x11.toplevel = 0;
 	}
 	r->x11.window  = XCreateSimpleWindow(r->x11.display, p, px, py, width, height, 0, 0, WhitePixel(r->x11.display, DefaultScreen(r->x11.display)));
 	sh.flags       = PWinGravity;
@@ -253,6 +254,8 @@ static void MwLLDestroyImpl(MwLL handle) {
 
 	XSync(handle->x11.display, False);
 
+	if(handle->x11.toplevel) XCloseDisplay(handle->x11.display);
+
 	free(handle);
 }
 

src/color.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 MwLLColor MwParseColorName(MwWidget handle, const char* color) {

src/core.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 #include "../external/stb_ds.h"

src/cursor/arrow.c

@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 
 /**