mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2026-05-24 01:58:18 +02:00
8aa27ae821
I created a small patch for XWin that adds correct grouping of taskbar icons when 'Always combine, hide labels' is set in the taskbar properties. It uses the new taskbar APIs introduced in Windows 7 to set an application id for each window. The id is based on the X11 class hints. v2: Add file to _SOURCES to fix distcheck v3 : Fix compilation with mingw-w64 w32api headers Include propkey.h, propsys.h rather than defining necessary stuff ourselves v4: Fix up names taskbar->propertystore, AppID->AppUserModelID, etc. Link directly with ole32 for PropVariantClear(), prototyping it if neccessary. v5: Put winSetAppUserModelID()-related code in a separate file. Drop a superfluous assign to hr of ignored HRESULT of SetValue() Signed-off-by: Tobias Häußler <tobias.haeussler@gmx.de> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
191 lines
3.8 KiB
Makefile
191 lines
3.8 KiB
Makefile
bin_PROGRAMS = XWin
|
|
|
|
if XWIN_CLIPBOARD
|
|
SRCS_CLIPBOARD = \
|
|
winclipboardinit.c \
|
|
winclipboardtextconv.c \
|
|
winclipboardthread.c \
|
|
winclipboardwndproc.c \
|
|
winclipboardwrappers.c \
|
|
winclipboardxevents.c
|
|
DEFS_CLIPBOARD = -DXWIN_CLIPBOARD
|
|
endif
|
|
|
|
if XWIN_GLX_WINDOWS
|
|
GLX_DIR = glx
|
|
DEFS_GLX_WINDOWS = -DXWIN_GLX_WINDOWS
|
|
XWIN_GLX_LIBS = $(top_builddir)/hw/xwin/glx/libXwinGLX.la
|
|
XWIN_GLX_LINK_FLAGS = -lopengl32
|
|
endif
|
|
|
|
if XWIN_MULTIWINDOW
|
|
SRCS_MULTIWINDOW = \
|
|
winmultiwindowshape.c \
|
|
winmultiwindowwindow.c \
|
|
winmultiwindowwm.c \
|
|
winmultiwindowwndproc.c \
|
|
propertystore.h \
|
|
winSetAppUserModelID.c
|
|
DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW
|
|
MULTIWINDOW_LIBS = -lshlwapi -lole32
|
|
endif
|
|
|
|
if XWIN_MULTIWINDOWEXTWM
|
|
SRCS_MULTIWINDOWEXTWM = \
|
|
winwin32rootless.c \
|
|
winwin32rootlesswindow.c \
|
|
winwin32rootlesswndproc.c \
|
|
winwindowswm.c
|
|
DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM
|
|
MULTIWINDOWEXTWM_LIBS = $(top_builddir)/miext/rootless/librootless.la
|
|
endif
|
|
|
|
if XWIN_NATIVEGDI
|
|
SRCS_NATIVEGDI = \
|
|
winclip.c \
|
|
winfillsp.c \
|
|
winfont.c \
|
|
wingc.c \
|
|
wingetsp.c \
|
|
winnativegdi.c \
|
|
winpixmap.c \
|
|
winpolyline.c \
|
|
winrop.c \
|
|
winsetsp.c
|
|
DEFS_NATIVEGDI = -DXWIN_NATIVEGDI
|
|
endif
|
|
|
|
if XWIN_PRIMARYFB
|
|
SRCS_PRIMARYFB = \
|
|
winpfbdd.c
|
|
DEFS_PRIMARYFB = -DXWIN_PRIMARYFB
|
|
endif
|
|
|
|
if XWIN_RANDR
|
|
SRCS_RANDR = \
|
|
winrandr.c
|
|
DEFS_RANDR = -DXWIN_RANDR
|
|
endif
|
|
|
|
if XWIN_XV
|
|
SRCS_XV = \
|
|
winvideo.c
|
|
DEFS_XV = -DXWIN_XV
|
|
endif
|
|
|
|
SRCS = InitInput.c \
|
|
InitOutput.c \
|
|
winallpriv.c \
|
|
winauth.c \
|
|
winblock.c \
|
|
wincmap.c \
|
|
winconfig.c \
|
|
wincreatewnd.c \
|
|
wincursor.c \
|
|
windialogs.c \
|
|
winengine.c \
|
|
winerror.c \
|
|
winglobals.c \
|
|
winkeybd.c \
|
|
winkeyhook.c \
|
|
winmisc.c \
|
|
winmonitors.c \
|
|
winmouse.c \
|
|
winmsg.c \
|
|
winmultiwindowclass.c \
|
|
winmultiwindowicons.c \
|
|
winprefs.c \
|
|
winprefsyacc.y \
|
|
winprefslex.l \
|
|
winprocarg.c \
|
|
winscrinit.c \
|
|
winshaddd.c \
|
|
winshadddnl.c \
|
|
winshadgdi.c \
|
|
wintrayicon.c \
|
|
winvalargs.c \
|
|
winwakeup.c \
|
|
winwindow.c \
|
|
winwndproc.c \
|
|
ddraw.h \
|
|
winclipboard.h \
|
|
winconfig.h \
|
|
win.h \
|
|
winglobals.h \
|
|
winkeybd.h \
|
|
winkeynames.h \
|
|
winlayouts.h \
|
|
winmessages.h \
|
|
winmonitors.h \
|
|
winmsg.h \
|
|
winms.h \
|
|
winmultiwindowclass.h \
|
|
winmultiwindowicons.h \
|
|
winprefs.h \
|
|
winresource.h \
|
|
winwindow.h \
|
|
XWin.rc \
|
|
$(top_srcdir)/Xext/dpmsstubs.c \
|
|
$(top_srcdir)/Xi/stubs.c \
|
|
$(top_srcdir)/mi/miinitext.c \
|
|
$(top_srcdir)/fb/fbcmap_mi.c \
|
|
$(SRCS_CLIPBOARD) \
|
|
$(SRCS_MULTIWINDOW) \
|
|
$(SRCS_MULTIWINDOWEXTWM) \
|
|
$(SRCS_NATIVEGDI) \
|
|
$(SRCS_PRIMARYFB) \
|
|
$(SRCS_RANDR) \
|
|
$(SRCS_XV)
|
|
|
|
DEFS = $(DEFS_CLIPBOARD) \
|
|
$(DEFS_GLX_WINDOWS) \
|
|
$(DEFS_MULTIWINDOW) \
|
|
$(DEFS_MULTIWINDOWEXTWM) \
|
|
$(DEFS_NATIVEGDI) \
|
|
$(DEFS_PRIMARYFB) \
|
|
$(DEFS_RANDR) \
|
|
$(DEFS_XV)
|
|
|
|
XWin_SOURCES = $(SRCS)
|
|
|
|
INCLUDES = -I$(top_srcdir)/miext/rootless
|
|
|
|
XWIN_SYS_LIBS += -ldxguid
|
|
|
|
XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS)
|
|
XWin_LDADD = $(MULTIWINDOW_LIBS) $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
|
|
XWin_LDFLAGS = -mwindows -static
|
|
|
|
.rc.o:
|
|
$(AM_V_GEN)$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include
|
|
|
|
winprefsyacc.h: winprefsyacc.c
|
|
winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h
|
|
|
|
BUILT_SOURCES = winprefsyacc.h winprefsyacc.c winprefslex.c
|
|
CLEANFILES = $(BUILT_SOURCES)
|
|
|
|
AM_YFLAGS = -d
|
|
AM_LFLAGS = -i
|
|
AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
|
|
$(XWINMODULES_CFLAGS) \
|
|
-I$(top_srcdir) \
|
|
-Wno-bad-function-cast
|
|
|
|
xwinconfigdir = $(sysconfdir)/X11
|
|
xwinconfig_DATA = system.XWinrc
|
|
|
|
install-exec-hook:
|
|
(cd $(DESTDIR)$(bindir) && rm -f X && $(LN_S) XWin$(EXEEXT) X)
|
|
|
|
EXTRA_DIST = \
|
|
$(xwinconfig_DATA) \
|
|
X.ico \
|
|
XWin.rc \
|
|
XWin.exe.manifest
|
|
|
|
relink:
|
|
$(AM_V_at)rm -f XWin$(EXEEXT) && $(MAKE) XWin$(EXEEXT)
|
|
|
|
SUBDIRS = man $(GLX_DIR) .
|
|
DIST_SUBDIRS = man glx .
|