gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 15:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update headless backend so that all headers are named properly...

Browse source
This commit is contained in:
Gregory John Casamento 2023-08-08 07:35:26 -04:00 committed by Gregory Casamento
parent 5e030e7505
commit 8e6a546d05
11 changed files with 80 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Headers/xheadless/XGGeneric.h → Headers/xheadless/HeadlessGeneric.h
View file

@ -24,8 +24,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef INCLUDED_XGGENERIC_H
#define INCLUDED_XGGENERIC_H
#ifndef INCLUDED_HeadlessGENERIC_H
#define INCLUDED_HeadlessGENERIC_H
#include "XHeadless.h"
/*
@ -89,7 +89,7 @@ typedef struct {
/*
* Structure containing ivars that are common to all X backend contexts.
*/
struct XGGeneric {
struct HeadlessGeneric {
int wm;
struct {
unsigned useWindowMakerIcons:1;

8
Headers/xheadless/XGInputServer.h → Headers/xheadless/HeadlessInputServer.h
View file

@ -1,4 +1,4 @@
/* XGInputServer - Keyboard input handling
/* HeadlessInputServer - Keyboard input handling
Copyright (C) 2002 Free Software Foundation, Inc.
@ -24,11 +24,11 @@
Boston, MA 02110-1301, USA.
*/
#ifndef _GNUstep_H_XGInputServer
#define _GNUstep_H_XGInputServer
#ifndef _GNUstep_H_HeadlessInputServer
#define _GNUstep_H_HeadlessInputServer
#include <AppKit/NSInputServer.h>
#include <xheadless/XGServerWindow.h>
#include <xheadless/HeadlessServerWindow.h>
@protocol XInputFiltering
- (BOOL) filterEvent: (XEvent *)event;

20
Headers/xheadless/XGOpenGL.h → Headers/xheadless/HeadlessOpenGL.h
View file

@ -1,5 +1,5 @@
/* -*-ObjC-*- */
/* XGOpenGL - openGL management using glX
/* HeadlessOpenGL - openGL management using glX
Copyright (C) 2002 Free Software Foundation, Inc.
@ -25,8 +25,8 @@
Boston, MA 02110-1301, USA.
*/
#ifndef _GNUstep_H_XGOpenGL_
#define _GNUstep_H_XGOpenGL_
#ifndef _GNUstep_H_HeadlessOpenGL_
#define _GNUstep_H_HeadlessOpenGL_
#include <AppKit/NSOpenGL.h>
@ -37,16 +37,16 @@
#undef BOOL
@class NSView;
@class XGXSubWindow;
@class XGGLPixelFormat;
@class HeadlessXSubWindow;
@class HeadlessGLPixelFormat;
@interface XGGLContext : NSOpenGLContext
@interface HeadlessGLContext : NSOpenGLContext
{
int glxminorversion;
GLXContext glx_context;
GLXWindow glx_drawable;
XGXSubWindow *xSubWindow;
XGGLPixelFormat *pixelFormat;
HeadlessXSubWindow *xSubWindow;
HeadlessGLPixelFormat *pixelFormat;
BOOL saved_ignores_backing;
}
@ -54,7 +54,7 @@
@end
@interface XGGLPixelFormat : NSOpenGLPixelFormat
@interface HeadlessGLPixelFormat : NSOpenGLPixelFormat
{
Display * display;
int glxminorversion;
@ -71,7 +71,7 @@
+ (int) glxMinorVersion;
- (Display *) display;
- (XVisualInfo *) visualinfo;
- (GLXContext) createGLXContext: (XGGLContext *)share;
- (GLXContext) createGLXContext: (HeadlessGLContext *)share;
- (GLXWindow) drawableForWindow: (Window)xwindowid;
@end

22
Headers/xheadless/XGServer.h → Headers/xheadless/HeadlessServer.h
View file

@ -1,4 +1,4 @@
/* <title>XGServer</title>
/* <title>HeadlessServer</title>
<abstract>Backend server using the X11.</abstract>
@ -26,14 +26,14 @@
Boston, MA 02110-1301, USA.
*/
#ifndef _XGServer_h_INCLUDE
#define _XGServer_h_INCLUDE
#ifndef _HeadlessServer_h_INCLUDE
#define _HeadlessServer_h_INCLUDE
#include "config.h"
#include <GNUstepGUI/GSDisplayServer.h>
#include "XHeadless.h"
#include "XGGeneric.h"
#include "HeadlessGeneric.h"
/*
* Enumerated type to say how we should draw pixels to the X display - used
@ -48,13 +48,13 @@ typedef enum {
XGDM_PORTABLE
} XGDrawMechanism;
@interface XGServer : GSDisplayServer
@interface HeadlessServer : GSDisplayServer
{
Display *dpy;
int defScreen;
NSMapTable *screenList;
Window grabWindow;
struct XGGeneric generic;
struct HeadlessGeneric generic;
id inputServer;
}
@ -79,11 +79,11 @@ typedef enum {
* Synchronize with X event queue - soak up events.
* Waits for up to 1 second for event.
*/
@interface XGServer (XSync)
@interface HeadlessServer (XSync)
- (BOOL) xSyncMap: (void*)window;
@end
@interface XGServer (XGGeneric)
@interface HeadlessServer (HeadlessGeneric)
- (NSRect) _OSFrameToXFrame: (NSRect)o for: (void*)window;
- (NSRect) _OSFrameToXHints: (NSRect)o for: (void*)window;
- (NSRect) _XFrameToOSFrame: (NSRect)x for: (void*)window;
@ -91,7 +91,7 @@ typedef enum {
@end
// Public interface for the input methods.
@interface XGServer (InputMethod)
@interface HeadlessServer (InputMethod)
- (NSString *) inputMethodStyle;
- (NSString *) fontSize: (int *)size;
- (BOOL) clientWindowRect: (NSRect *)rect;
@ -105,9 +105,9 @@ typedef enum {
- (BOOL) setPreeditSpot: (NSPoint *)p;
@end
@interface XGServer (TimeKeeping)
@interface HeadlessServer (TimeKeeping)
- (void) setLastTime: (Time)last;
- (Time) lastTime;
@end
#endif /* _XGServer_h_INCLUDE */
#endif /* _HeadlessServer_h_INCLUDE */

8
Headers/xheadless/XGServerWindow.h → Headers/xheadless/HeadlessServerWindow.h
View file

@ -24,10 +24,10 @@
Boston, MA 02110-1301, USA.
*/
#ifndef _XGServerWindow_h_INCLUDE
#define _XGServerWindow_h_INCLUDE
#ifndef _HeadlessServerWindow_h_INCLUDE
#define _HeadlessServerWindow_h_INCLUDE
#include <xheadless/XGServer.h>
#include <xheadless/HeadlessServer.h>
/*
* WindowMaker window manager interaction
@ -123,7 +123,7 @@ typedef struct _gswindow_device_t {
#define GET_XDRAWABLE(win) ((win)->buffer ? (win)->buffer: (win)->ident)
@interface XGServer (DPSWindow)
@interface HeadlessServer (DPSWindow)
+ (gswindow_device_t *) _windowForXWindow: (Window)xWindow;
+ (gswindow_device_t *) _windowForXParent: (Window)xWindow;
+ (gswindow_device_t *) _windowWithTag: (NSInteger)windowNumber;

9
Source/GSBackend.m
View file

@ -35,7 +35,7 @@
+ (void) initializeBackend;
@end
#if (BUILD_SERVER == SERVER_x11) || (BUILD_SERVER == SERVER_xheadless)
#if BUILD_SERVER == SERVER_x11
#include <x11/XGServer.h>
@interface XGServer (Initialize)
+ (void) initializeBackend;
@ -50,6 +50,11 @@
@interface WaylandServer (Initialize)
+ (void) initializeBackend;
@end
#elif BUILD_SERVER == SERVER_xheadless
#include <xheadless/HeadlessServer.h>
@interface HeadlessServer (Initialize)
+ (void) initializeBackend;
@end
#endif
/* Call the correct initalization routines for the choosen
@ -71,7 +76,7 @@
#elif BUILD_SERVER == SERVER_wayland
[WaylandServer initializeBackend];
#elif BUILD_SERVER == SERVER_xheadless
[XGServer initializeBackend];
[HeadlessServer initializeBackend];
#else
[NSException raise: NSInternalInconsistencyException
format: @"No Window Server configured in backend"];

4
Source/headlesslib/HeadlessModernSurface.m
View file

@ -23,8 +23,8 @@
*/
#include "config.h"
#include "xheadless/XGServer.h"
#include "xheadless/XGServerWindow.h"
#include "xheadless/HeadlessServer.h"
#include "xheadless/HeadlessServerWindow.h"
#include "headlesslib/HeadlessModernSurface.h"
#define GSWINDEVICE ((gswindow_device_t *)gsDevice)

6
Source/xheadless/GNUmakefile
View file

@ -34,9 +34,9 @@ SUBPROJECT_NAME=xheadless
# The Objective-C source files to be compiled
xheadless_OBJC_FILES = \
XGServer.m \
XGServerEvent.m \
XGServerWindow.m \
HeadlessServer.m \
HeadlessServerEvent.m \
HeadlessServerWindow.m \
-include GNUmakefile.preamble

28
Source/xheadless/XGServer.m → Source/xheadless/HeadlessServer.m
View file

@ -1,5 +1,5 @@
/* -*- mode:ObjC -*-
XGServer - X11 Server Class
HeadlessServer - X11 Server Class
Copyright (C) 1998,2002 Free Software Foundation, Inc.
@ -56,20 +56,20 @@ terminate(int sig)
}
}
#include "xheadless/XGServer.h"
#include "xheadless/XGInputServer.h"
#include "xheadless/HeadlessServer.h"
#include "xheadless/HeadlessInputServer.h"
extern int XGErrorHandler(Display *display, XErrorEvent *err);
@interface XGServer (Window)
@interface HeadlessServer (Window)
- (void) _setupRootWindow;
@end
@interface XGServer (Private)
@interface HeadlessServer (Private)
- (void) setupRunLoopInputSourcesForMode: (NSString*)mode;
@end
@interface XGScreenContext : NSObject
@interface HeadlessScreenContext : NSObject
{
RContext *rcontext;
XGDrawMechanism drawMechanism;
@ -80,7 +80,7 @@ extern int XGErrorHandler(Display *display, XErrorEvent *err);
- (RContext *) context;
@end
@implementation XGScreenContext
@implementation HeadlessScreenContext
- (RContextAttributes *) _getXDefaults
{
@ -112,9 +112,9 @@ extern int XGErrorHandler(Display *display, XErrorEvent *err);
/**
<unit>
<heading>XGServer</heading>
<heading>HeadlessServer</heading>
<p> XGServer is a concrete subclass of GSDisplayServer that handles
<p> HeadlessServer is a concrete subclass of GSDisplayServer that handles
X-Window client communications. The class is broken into four sections.
The main class handles setting up and closing down the display, as well
as providing wrapper methods to access display and screen pointers. The
@ -125,13 +125,13 @@ extern int XGErrorHandler(Display *display, XErrorEvent *err);
GSDisplayServer(EventOps) category. The last section
</unit>
*/
@implementation XGServer
@implementation HeadlessServer
/* Initialize AppKit backend */
+ (void) initializeBackend
{
NSDebugLog(@"Initializing GNUstep x11 backend.\n");
[GSDisplayServer setDefaultServerClass: [XGServer class]];
[GSDisplayServer setDefaultServerClass: [HeadlessServer class]];
signal(SIGTERM, terminate);
signal(SIGINT, terminate);
}
@ -142,7 +142,7 @@ extern int XGErrorHandler(Display *display, XErrorEvent *err);
*/
+ (Display*) currentXDisplay
{
return [(XGServer*)GSCurrentServer() xDisplay];
return [(HeadlessServer*)GSCurrentServer() xDisplay];
}
- (id) _initXContext
@ -237,7 +237,7 @@ extern int XGErrorHandler(Display *display, XErrorEvent *err);
return dpy;
}
- (XGScreenContext *) _screenContextForScreen: (int)screen_number
- (HeadlessScreenContext *) _screenContextForScreen: (int)screen_number
{
return nil;
}
@ -333,7 +333,7 @@ extern int XGErrorHandler(Display *display, XErrorEvent *err);
@end
@implementation XGServer (InputMethod)
@implementation HeadlessServer (InputMethod)
- (NSString *) inputMethodStyle
{
return nil;

34
Source/xheadless/XGServerEvent.m → Source/xheadless/HeadlessServerEvent.m
View file

@ -1,5 +1,5 @@
/*
XGServerEvent - Window/Event code for X11 backends.
HeadlessServerEvent - Window/Event code for X11 backends.
Copyright (C) 1998,1999 Free Software Foundation, Inc.
@ -44,9 +44,9 @@
#include <Foundation/NSDebug.h>
#include "xheadless/XHeadless.h"
#include "xheadless/XGServerWindow.h"
#include "xheadless/XGInputServer.h"
#include "xheadless/XGGeneric.h"
#include "xheadless/HeadlessServerWindow.h"
#include "xheadless/HeadlessInputServer.h"
#include "xheadless/HeadlessGeneric.h"
#include "math.h"
@ -97,7 +97,7 @@ void __objc_xgcontextevent_linking (void)
@end
#endif
@interface XGServer (Private)
@interface HeadlessServer (Private)
- (void) receivedEvent: (void*)data
type: (RunLoopEventType)type
extra: (void*)extra
@ -106,7 +106,7 @@ void __objc_xgcontextevent_linking (void)
- (NSDate*) timedOutEvent: (void*)data
type: (RunLoopEventType)type
forMode: (NSString*)mode;
- (int) XGErrorHandler: (Display*)display : (XErrorEvent*)err;
- (int) HeadlessErrorHandler: (Display*)display : (XErrorEvent*)err;
- (void) processEvent: (XEvent *) event;
- (NSEvent *)_handleTakeFocusAtom: (XEvent)xEvent
forContext: (NSGraphicsContext *)gcontext;
@ -114,15 +114,15 @@ void __objc_xgcontextevent_linking (void)
int
XGErrorHandler(Display *display, XErrorEvent *err)
HeadlessErrorHandler(Display *display, XErrorEvent *err)
{
XGServer *ctxt = (XGServer*)GSCurrentServer();
HeadlessServer *ctxt = (HeadlessServer*)GSCurrentServer();
return [ctxt XGErrorHandler: display : err];
return [ctxt HeadlessErrorHandler: display : err];
}
#if 0
static NSEvent*process_key_event (XEvent* xEvent, XGServer* ctxt,
static NSEvent*process_key_event (XEvent* xEvent, HeadlessServer* ctxt,
NSEventType eventType, NSMutableArray *event_queue);
static unichar process_char (KeySym keysym, unsigned *eventModifierFlags);
@ -152,15 +152,15 @@ static int check_modifier (XEvent *xEvent, KeySym key_sym)
}
#endif
@interface XGServer (WindowOps)
@interface HeadlessServer (WindowOps)
- (void) styleoffsets: (float *) l : (float *) r : (float *) t : (float *) b
: (unsigned int) style : (Window) win;
- (NSRect) _XWinRectToOSWinRect: (NSRect)r for: (void*)windowNumber;
@end
@implementation XGServer (EventOps)
@implementation HeadlessServer (EventOps)
- (int) XGErrorHandler: (Display*)display : (XErrorEvent*)err
- (int) HeadlessErrorHandler: (Display*)display : (XErrorEvent*)err
{
return 0;
}
@ -248,7 +248,7 @@ static BOOL keysym_is_X_modifier (KeySym keysym)
return NO;
}
static NSEvent* process_key_event (XEvent* xEvent, XGServer* context, NSEventType eventType, NSMutableArray *event_queue)
static NSEvent* process_key_event (XEvent* xEvent, HeadlessServer* context, NSEventType eventType, NSMutableArray *event_queue)
{
return nil;
}
@ -281,14 +281,14 @@ static unsigned int process_modifier_flags(unsigned int state)
@end
@implementation XGServer (XSync)
@implementation HeadlessServer (XSync)
- (BOOL) xSyncMap: (void*)windowHandle
{
return NO;
}
@end
@implementation XGServer (X11Ops)
@implementation HeadlessServer (X11Ops)
/*
* Return mouse location in base coords ignoring the event loop
@ -325,7 +325,7 @@ static unsigned int process_modifier_flags(unsigned int state)
@end
@implementation XGServer (TimeKeeping)
@implementation HeadlessServer (TimeKeeping)
// Sync time with X server every 10 seconds
#define MAX_TIME_DIFF 10
// Regard an X time stamp as valid for half a second

10
Source/xheadless/XGServerWindow.m → Source/xheadless/HeadlessServerWindow.m
View file

@ -49,10 +49,10 @@
#include <unistd.h>
#endif
#include <xheadless/XGServerWindow.h>
#include <xheadless/XGGeneric.h>
#include <xheadless/HeadlessServerWindow.h>
#include <xheadless/HeadlessGeneric.h>
#include <xheadless/XWindowBuffer.h>
#include <xheadless/XGServer.h>
#include <xheadless/HeadlessServer.h>
#define ROOT generic.appRootWindow
@ -166,14 +166,14 @@ typedef struct {
}
@end
@interface XGServer (WindowOps)
@interface HeadlessServer (WindowOps)
- (gswindow_device_t *) _rootWindowForScreen: (int)screen;
- (void) styleoffsets: (float *) l : (float *) r : (float *) t : (float *) b
: (unsigned int) style : (Window) win;
- (void) _setSupportedWMProtocols: (gswindow_device_t *) window;
@end
@implementation XGServer (WindowOps)
@implementation HeadlessServer (WindowOps)
- (BOOL) handlesWindowDecorations
{