Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GNUstep testplant branch rebase to get headless backend #40

Draft
wants to merge 172 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
2e3bdfb
Create branche for testplant localized changes.
gcasa Jun 20, 2012
999c436
Added Win32 multi-screen support lookup
Jun 27, 2012
598be26
Cairo win32 implementation
Aug 8, 2012
f5c781e
Cairo win32 fixes
Aug 8, 2012
49f971c
Cairo win32 fixes
Aug 8, 2012
1102011
Cairo win32 fixes
Aug 8, 2012
5f7ea64
Cairo win32 fixes
Aug 8, 2012
3aeec4a
Fixes compile warnings
Aug 8, 2012
643bedc
Cairo win32 fixes
Aug 8, 2012
c276a5d
Cairo win32 fixes
Aug 8, 2012
c58a4af
Cairo win32 fixes
Aug 8, 2012
f7d5667
Cairo fixes
Aug 8, 2012
e9391da
Check/add fontconfig to cairo for win32
Aug 8, 2012
946f7e9
Cairo fixes
Aug 8, 2012
7a892f2
Fix outstanding Win32 cairo code and configure issues
Aug 29, 2012
005f0ee
Remove unecessary and invalid win32 include
Aug 29, 2012
001e330
attempt to fix WS_POPUP showing up immediately on Windows 7
Sep 6, 2012
a63d526
TEMPORARY FIX for borderless windows i.e. WS_POPUP types
Sep 7, 2012
0cfb230
Yet another temporary fix for cairo window expose method
Sep 19, 2012
86c6036
Fix for fatal exceptions when a nil mouse event tried to post
JonathanOSX Oct 10, 2012
9b0f83a
TEMPORARY updates for cairo processing on MSWindows
Oct 11, 2012
30941f5
TEMPORARY update for cairo - remove logs
Oct 11, 2012
aa519f5
Additional updates for windows backend
Oct 17, 2012
9c3739a
Fix findWindowAt:windowRef:excluding: to skip windows with the ignore…
sensetalkdoug Oct 25, 2012
41ebb7a
HOPEFULLY - final changes for cairo
Oct 25, 2012
e5e0226
Remove debug log
Oct 25, 2012
2d72a18
Another stray log
Oct 25, 2012
0ebb1b1
Don't release DC's for non-retained surfaces
Oct 25, 2012
f018376
Updates for MSWindows IME keyboard processing
Nov 14, 2012
aae0f77
Merge back with main branch
Nov 21, 2012
25d6855
Merge back with main branch
Nov 21, 2012
ab3f590
Fix copy/cut/paste problems
Jan 3, 2013
2a6477c
Fix a bug that could cause a modal run loop to lock up if the modal w…
sensetalkdoug Jan 11, 2013
57f71da
First pass - in-window IME character composition for MSWindows
Jan 15, 2013
9c1c782
IME composition fix for mis-handling of last character sequence
Jan 15, 2013
809c91a
Allow a non-composing character to terminate the IME composing sequence
Jan 16, 2013
a91ebbd
Add cursor and screen capture functionality to windows backend for co…
Jan 17, 2013
1c5a0d1
Fix cross-hair on magnifier in color panel
Jan 18, 2013
46d6bb5
BETA VERSION - NOT FINISHED - SYSTEM MOUSE CURSOR TRACKING
Jan 29, 2013
3390d6a
Update for handling mouse capture/release and system cursors
Jan 30, 2013
9e3bd1f
Update for windows system cursor processing
Jan 31, 2013
896657c
Fix: use boolForKey instead of objectForKey
Jan 31, 2013
fbb6f12
Fix: restrict keyboard input during global mouse capture
Jan 31, 2013
acf6d13
Window IME generic updates for handling korean, japanese, etc
Feb 1, 2013
612a141
Check for self=nil before processing in init
May 9, 2013
16ef33d
Use device parameter rather than GSWINDEVICE macro in case self destr…
May 9, 2013
5006663
Wrap WIN32 server call to windowEventProc with an autorelease pool to…
May 10, 2013
09301e6
Fix GDI leak in window create
May 19, 2013
95a8e8d
Basic changes for clearer code review
May 19, 2013
7b6690c
Fix monitor frame coordinate calculation and reset monitors on WM_DIS…
Jun 11, 2013
afe4133
Work around fix for non-retained buffered windows not re-displaying c…
Jul 20, 2013
36d045c
Move win32 header files to enclosed section
Jul 21, 2013
1b82d91
Merged Trunk changes from rev 35217 to TestPlant branch.
Aug 9, 2013
45e9f8b
Added files that were mysteriously removed in the last commit after t…
Aug 9, 2013
858f1e7
We're now processing the Windows event WM_SETCURSOR to prevent Window…
Aug 18, 2013
9308410
Commented out last fix on mouse cursors, which was either incomplete …
Aug 20, 2013
b64f7fb
Added bi-directional diagonal mouse cursors to standard cursors
Aug 23, 2013
128d09d
Added/fix handling of WM_SETCURSOR so that Windows doesn't override o…
Oct 3, 2013
b379b7f
Reset the cursors stack when we are on a non-client area of a window.…
Oct 21, 2013
fd6955f
Switch monitor logging to Debug level
JonathanOSX Jan 23, 2014
aaa0a6e
Autorelease on already autorelease'd object - and return NON-mutable …
Feb 27, 2014
447f226
ALTGR key processing fix
Mar 10, 2014
a56731c
Update for HDC processing and cairo
Mar 11, 2014
e9c1502
Fix ordering of screen info and handle display change for window(s)
Apr 2, 2014
0e941b8
Fix 'moldy' application icon image
May 7, 2014
6fe6cb7
Lets try to fix the last fix
May 7, 2014
6796519
fix keys in NSEvent when Ctrl and Shift are used so key equivalents l…
sensetalkdoug Jul 10, 2014
3e1df4d
Add gui/backend support for checking running service - windows only
Mar 26, 2015
6efb80b
Fix configure for mingw update
Jun 3, 2015
c43e467
Merge GNUstep back with main trunk revision 38789
Jul 14, 2015
1ebf02d
Fix bug that caused F11 keypresses to become F12.
adamfox-tp Aug 13, 2015
bc7143d
Allow Escape key to be processed during a capture mouse sequence.
sensetalkdoug Nov 23, 2015
c996515
Add logging to file for GPBS to debug associated gpbs crashes
Dec 1, 2015
2d93656
Change GNUstep directory to gpbs
Dec 1, 2015
32a1f5e
Add backtrace output to logfile if logging to file enabled
Dec 1, 2015
4b2d92d
Add looging at exit statements
Dec 8, 2015
0a23ca1
fix problem with flipped cursors
sensetalkdoug Feb 3, 2016
9160202
fix for #8700
Mar 7, 2016
457ca77
fix for issue #8544
Mar 8, 2016
4cfd709
Add comment regarding the windows bitmap processing
Mar 8, 2016
332c913
Remove extraneous semicolon
Apr 3, 2016
05640cb
Set clipping region on cairo surface HDC to clean up drawing problems
Apr 3, 2016
6e1de7d
Implement dealloc/copyWithZone on Win32CairoGState instance
Apr 4, 2016
e67b355
Fix method definition
Apr 4, 2016
e67d844
Remove _surface is NULL warning
Apr 13, 2016
58ca6b5
Add MSUserNotifications to Source/win32 directory to support notifica…
May 11, 2016
1f2f248
Patch ToastNotifications/GNUmakefile to work for now - need t eventua…
May 11, 2016
1df97fe
Fix MSUserNotifications GNUmakefile processing to adhere to conventions
May 11, 2016
ab73cb7
Add GNUstep license header and a couple of cleanups to MSUserNotifica…
May 11, 2016
4b5a47e
Fix GNUmakefile(s) for proper GNUstep operation on MSUserNotifications
May 12, 2016
af75547
Remove visual studio user options file
May 12, 2016
2347032
Fixed extern C reference on Toast DLL function 'removeNotification'
May 12, 2016
54247ab
Fix clean to remove VS user options file
May 12, 2016
6ab033e
Double check for 0 before divide
May 12, 2016
a33848a
Try to address real problem of unknown crash
May 16, 2016
39e7d68
fix for issue #9500
May 19, 2016
d7a2a65
Add version check in debug for Shell32.dll
May 19, 2016
1852c08
Add version check in debug for Shell32.dll - oops checkin last time
May 19, 2016
5957711
fix for app ID on windows ToastNotifications
May 23, 2016
937e862
Updates for Toast notifications - makefile, DLLs (static), project, s…
May 25, 2016
6712f81
Update Toast DLLs, code cleanup for logging
May 26, 2016
c6a0e4c
Fix test code from last checkin - additional cleanup - added creating…
May 26, 2016
dc7101d
Add default GNUstep image
May 26, 2016
f8ce8e4
Remove debug logs
May 26, 2016
f9303f7
Fix memory leaks in toast notifications
May 29, 2016
0b5756a
Remove references to backtrace library
May 29, 2016
28dfe59
Fix compile warnings in gpbs.m
May 30, 2016
ac3e797
Revert unintentional commit on Source/win32/WIN32Server.m
May 30, 2016
a1e3abb
Fix image name for notification
Jun 1, 2016
c2f3640
Siwtch to using GDI Plus for converting images to icons
Jun 1, 2016
f878112
Remove debug log
Jun 10, 2016
c0c0af0
Fix debug lbuild og log statement
Jul 19, 2016
cec559f
Wrap NSLog with DEBUG
Jul 24, 2016
da5ff64
Don't check nil cursor image for log and/or adding to array
Aug 10, 2016
8b05cec
Add processing for VK_LWIN windows key
Aug 11, 2016
ee64531
DLL library unloaded during sequence causing reference to released ob…
Sep 16, 2016
ca9fe04
Merge with trunk revision 40072
Oct 6, 2016
6686688
Merge with trunk revision 40072
Oct 6, 2016
71864f8
change calls from getWindowLong to getWindowLongPtr for 64bit compati…
p3l6 Oct 12, 2016
50a49fb
Update configure for mingw64 triple check
Oct 18, 2016
422c49b
Enable default interpolation due to pixelated screen drawing
Oct 19, 2016
7d6a4ef
Update for 64 bits
Oct 20, 2016
1e91976
Use _WIN32 rather than __WIN32__ as that's not defined in clang/MINGW64
Oct 25, 2016
296de59
Only log successfull Bonjour if the logging flag is set
JonathanOSX Oct 27, 2016
08bdfb4
Fix window number casting from int to NSInteger
Nov 8, 2016
e8f7691
Complete 64 bit changes for window numbers for X windows
Nov 9, 2016
0c50f56
More window number updates from int to NSInteger
Nov 10, 2016
30973f8
Fix logs for NSInteger window numbers
Nov 10, 2016
76395e0
Fix setParentWindow for NSInteger
Nov 14, 2016
25949d2
More 64 bit updates for use of MSWindows HANDLE/WHnd representation
Nov 25, 2016
2cb655c
More int to NSInteger conversions
Nov 29, 2016
3397273
Misc fixes and float->CGFloat updates
Nov 29, 2016
1bfcb36
Formatting fixes/cleanup
Nov 30, 2016
face0f5
More NSInteger updates
Nov 30, 2016
05a19bd
Fix highlighting difference values
Dec 6, 2016
c1b52ba
Update Set/GetWindowLongPtr offsets for system sizing
Dec 7, 2016
07b36d7
Update toast notifications for 64 bit
Dec 14, 2016
3e1dbae
Update toast notifications GNUmakefile.postamble
Dec 14, 2016
b1805c3
Update compiled files and VS project for toast notifications
Dec 14, 2016
d947c6a
Fix toast notification clean target
Dec 14, 2016
813b638
Fix window reference number for NSInteger usage on 64 bit
Feb 12, 2017
bcd908a
Update more int->NSInteger for window numbers
Feb 17, 2017
d5c3141
Remove unnecessary logs
Mar 4, 2017
d9947de
Seems there is an issue mixing XetWindowLong/LongPtr
Jun 22, 2017
e3a1ac3
Avoid setting the WS_MAXIMIZEBOX on windows with no resizing
Jun 27, 2017
d33e2bc
Missed a GetWindowLong which should be GetWindowLongPtr
Jun 28, 2017
856063d
Set GPBS on an autostop timeout
Sep 1, 2017
8776a2a
Catch and stop propagation of exception from NSPasteBoard
Oct 17, 2017
51ab44c
Fix bad method call.
adamfox-tp Jan 1, 2020
c37e8b3
Use PasteboardServer class directly and avoid gpbs due to windows com…
Dec 11, 2017
df9cbc8
Issue 17312: problems with IME keyboard windows messages for foreign …
Jan 8, 2018
4dc6f34
Do not destroy last clip path until init clip is called
Jan 12, 2018
9901776
Fixing bug when drawing very large images, caused by Win32CairoSurfac…
williameveretteggplant Dec 8, 2018
e7a47cd
Fixing issue where new windows drawing code was using too small NSWin…
williameveretteggplant Dec 13, 2018
82bf9cd
More adjustments to how Windows surface drawing size is calculated. N…
williameveretteggplant Dec 13, 2018
52b5e5b
gui updates for clang 7
p3l6 Apr 2, 2019
168d5d5
Initial code (NOT COMPLETE) for X server headless mode
Mar 4, 2020
8340567
Additional changes and delete files unnecesarily checked in
Mar 4, 2020
535348a
Start renaming classes and files for headless references
Mar 4, 2020
ab5a7d1
Add missing/corrupted files
Mar 5, 2020
ddc7e65
Remove editor backup files
Mar 5, 2020
3b2fc60
More file renames/cleanups for headless mode
Mar 5, 2020
8e43e75
More headless mode renames/cleanups
Mar 5, 2020
edb26b0
Remove unnecesary source files for headless mode
Mar 5, 2020
21a3234
More file renames/removals/cleanups for headless mode
Mar 5, 2020
eb33208
Add missing file plus more removes/renames/cleanups for headless mode
Mar 5, 2020
14fa367
Remove unnecessary files from headless
Mar 6, 2020
d455dc3
Merge pull request #1 from TestPlant/x-headless-server
May 11, 2020
adec4ca
dont use xargs in clean
jcaselman-keysight Nov 1, 2022
a0a2d55
Merge pull request #2 from jcaselman-keysight/gnustep_testplant_justi…
jcaselman-keysight Nov 1, 2022
c71544b
Update code to merge in headless mode
gcasa Aug 7, 2023
ef2772c
Update configure
gcasa Aug 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions Headers/headlesslib/HeadlessContext.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
HeadlessContext.h

Copyright (C) 2003 Free Software Foundation, Inc.

August 31, 2003
Written by Banlu Kemiyatorn <id at project-ile dot net>

This file is part of GNUstep.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; see the file COPYING.LIB.
If not, see <http://www.gnu.org/licenses/> or write to the
Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/

#ifndef HeadlessContext_h
#define HeadlessContext_h

#include "gsc/GSContext.h"

@interface HeadlessContext : GSContext
{
}
@end

#endif
44 changes: 44 additions & 0 deletions Headers/headlesslib/HeadlessFaceInfo.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
CairoFaceInfo.h

Copyright (C) 2003 Free Software Foundation, Inc.

August 31, 2003
Written by Banlu Kemiyatorn <object at gmail dot com>
Base on code by Alexander Malmberg <[email protected]>
Rewrite: Fred Kiefer <[email protected]>
Date: Jan 2006

This file is part of GNUstep.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; see the file COPYING.LIB.
If not, see <http://www.gnu.org/licenses/> or write to the
Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/

#ifndef HEADLESSFACEINFO_H
#define HEADLESSFACEINFO_H

#include <Foundation/NSObject.h>

@interface HeadlessFaceInfo : NSObject
{
void *_fontFace;
}

- (void *)fontFace;

@end
#endif
42 changes: 42 additions & 0 deletions Headers/headlesslib/HeadlessFontEnumerator.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
CairoFontEnumerator.h

Copyright (C) 2003 Free Software Foundation, Inc.
August 31, 2003
Written by Banlu Kemiyatorn <object at gmail dot com>

This file is part of GNUstep.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; see the file COPYING.LIB.
If not, see <http://www.gnu.org/licenses/> or write to the
Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/


#ifndef CairoFontEnumerator_h
#define CairoFontEnumerator_h

#include <GNUstepGUI/GSFontInfo.h>

@class HeadlessFaceInfo;

@interface HeadlessFontEnumerator : GSFontEnumerator
{
}
+ (Class) faceInfoClass;
+ (HeadlessFaceInfo *) fontWithName: (NSString *)name;
@end

#endif
47 changes: 47 additions & 0 deletions Headers/headlesslib/HeadlessFontInfo.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
CairoFontInfo.h

Copyright (C) 2003 Free Software Foundation, Inc.

August 31, 2003
Written by Banlu Kemiyatorn <object at gmail dot com>

This file is part of GNUstep.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; see the file COPYING.LIB.
If not, see <http://www.gnu.org/licenses/> or write to the
Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/

#ifndef HeadlessFontInfo_h
#define HeadlessFontInfo_h

#include <GNUstepGUI/GSFontInfo.h>
#include "headlesslib/HeadlessFaceInfo.h"

typedef void *cairo_t;

@interface HeadlessFontInfo : GSFontInfo
{
@public
void *_scaled;
}

- (void) drawGlyphs: (const NSGlyph*)glyphs
length: (int)length
on: (cairo_t*)ct;
@end

#endif
46 changes: 46 additions & 0 deletions Headers/headlesslib/HeadlessGState.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
Copyright (C) 2004 Free Software Foundation, Inc.

Author: Banlu Kemiyatorn <object at gmail dot com>

This file is part of GNUstep.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; see the file COPYING.LIB.
If not, see <http://www.gnu.org/licenses/> or write to the
Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/

#ifndef HeadlessGState_h
#define HeadlessGState_h

#include "gsc/GSGState.h"


@class HeadlessSurface;

@interface HeadlessGState : GSGState
{
@public
void *_ct;
HeadlessSurface *_surface;
}

- (void) GSCurrentSurface: (HeadlessSurface **)surface : (int *)x : (int *)y;
- (void) GSSetSurface: (HeadlessSurface *)surface : (int)x : (int)y;

- (void) showPage;
@end

#endif
38 changes: 38 additions & 0 deletions Headers/headlesslib/HeadlessModernSurface.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
Copyright (C) 2011 Free Software Foundation, Inc.

Author: Eric Wasylishen <[email protected]>

This file is part of GNUstep.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; see the file COPYING.LIB.
If not, see <http://www.gnu.org/licenses/> or write to the
Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/

#ifndef HeadlessModernSurface_h
#define HeadlessModernSurface_h

#include "headlesslib/HeadlessSurface.h"

@interface HeadlessModernSurface : HeadlessSurface
{
@private
void *_windowSurface;
}
@end

#endif

53 changes: 53 additions & 0 deletions Headers/headlesslib/HeadlessSurface.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
Copyright (C) 2002 Free Software Foundation, Inc.

Author: Banlu Kemiyatorn <object at gmail dot com>

This file is part of GNUstep.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; see the file COPYING.LIB.
If not, see <http://www.gnu.org/licenses/> or write to the
Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/

#ifndef HeadlessSurface_h
#define HeadlessSurface_h

#include <Foundation/Foundation.h>

typedef void *cairo_surface_t;

@interface HeadlessSurface : NSObject
{
@public
void *gsDevice;
void *_surface;
}

- (id) initWithDevice: (void *)device;

- (NSSize) size;
- (void) setSize: (NSSize)newSize;

- (void *) surface;

- (void) handleExposeRect: (NSRect)rect;

- (BOOL) isDrawingToScreen;

@end

#endif

8 changes: 6 additions & 2 deletions Headers/win32/WIN32Server.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,11 @@ typedef struct w32serverFlags

@interface WIN32Server (w32_activate)

- (LRESULT) decodeWM_MOUSEACTIVATEParams: (WPARAM)wParam : (LPARAM)lParam
#if 0
- (LRESULT) decodeWM_MOUSEACTIVATEParams: (WPARAM)wParam : (LPARAM)lParam
: (HWND)hwnd;
- (LRESULT) decodeWM_ACTIVEParams: (WPARAM)wParam : (LPARAM)lParam
#endif
- (LRESULT) decodeWM_ACTIVEParams: (WPARAM)wParam : (LPARAM)lParam
: (HWND)hwnd;
- (LRESULT) decodeWM_ACTIVEAPPParams: (HWND)hwnd : (WPARAM)wParam
: (LPARAM)lParam;
Expand Down Expand Up @@ -191,6 +193,8 @@ typedef struct w32serverFlags
- (void) decodeWM_SYSCOMMANDParams: (WPARAM)wParam : (LPARAM)lParam : (HWND)hwnd;
- (void) decodeWM_COMMANDParams: (WPARAM)wParam : (LPARAM)lParam : (HWND)hwnd;
- (void) decodeWM_THEMECHANGEDParams: (WPARAM)wParam : (LPARAM)lParam : (HWND)hwnd;
- (void) decodeWM_SETCURSORParams: (WPARAM)wParam : (LPARAM)lParam : (HWND)hwnd;
- (void) decodeWM_NCMOUSELEAVEParams: (WPARAM)wParam : (LPARAM)lParam : (HWND)hwnd;

@end

Expand Down
6 changes: 3 additions & 3 deletions Headers/x11/XGServerWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ typedef struct _gswindow_device_t {
@interface XGServer (DPSWindow)
+ (gswindow_device_t *) _windowForXWindow: (Window)xWindow;
+ (gswindow_device_t *) _windowForXParent: (Window)xWindow;
+ (gswindow_device_t *) _windowWithTag: (int)windowNumber;
- (void) _addExposedRectangle: (XRectangle)rectangle : (int)win : (BOOL) ignoreBacking;
- (void) _processExposedRectangles: (int)win;
+ (gswindow_device_t *) _windowWithTag: (NSInteger)windowNumber;
- (void) _addExposedRectangle: (XRectangle)rectangle : (NSInteger)win : (BOOL) ignoreBacking;
- (void) _processExposedRectangles: (NSInteger)win;
- (void) _initializeCursorForXWindow: (Window) win;
- (void) _destroyServerWindows;

Expand Down
Loading