VirtualBox

Changeset 16091 in vbox for trunk/src/VBox/Additions


Ignore:
Timestamp:
Jan 20, 2009 4:53:58 PM (16 years ago)
Author:
vboxsync
Message:

Additions/x11 and Linux: added support for X.Org server 1.6

Location:
trunk/src/VBox/Additions
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/linux/Makefile.kmk

    r15816 r16091  
    9797                $(PATH_BIN)/additions/vboxmouse_drv_14.so \
    9898                $(PATH_BIN)/additions/vboxmouse_drv_15.so \
     99                $(PATH_BIN)/additions/vboxmouse_drv_16.so \
    99100                $(PATH_BIN)/additions/vboxvideo_drv.o \
    100101                $(PATH_BIN)/additions/vboxvideo_drv_70.so \
    … …  
    103104                $(PATH_BIN)/additions/vboxvideo_drv_14.so \
    104105                $(PATH_BIN)/additions/vboxvideo_drv_15.so \
     106                $(PATH_BIN)/additions/vboxvideo_drv_16.so \
    105107                $(PATH_BIN)/additions/mountvboxsf \
    106108                $(VBOX_SELINUX_CMPLD) \
    … …  
    147149        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_14.so
    148150        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_15.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_15.so
     151        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_16.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_16.so
    149152        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxvideo_drv.o       $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv.o
    150153        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_70.so
    … …  
    153156        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_14.so
    154157        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_15.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_15.so
     158        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_16.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_16.so
    155159        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/mountvboxsf                   $(VBOX_LNX_ADD_INS_OUT_DIR)/mount.vboxsf
    156160ifdef VBOX_SELINUX_CMPLD

  • trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk

    r12446 r16091  
    191191vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
    192192vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    193 vboxvideo_drv_15_DEFS := $(vboxvideo_drv_70_DEFS) NO_ANSIC PCIACCESS
     193vboxvideo_drv_15_DEFS := $(vboxvideo_drv_70_DEFS) NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR
    194194vboxvideo_drv_15_INCS = \
    195195        $(VBOX_PATH_X11_XORG_1_5) \
    … …  
    201201
    202202
     203#
     204# vboxvideo_drv_16
     205#
     206DLLS += vboxvideo_drv_16
     207vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
     208vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
     209vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
     210vboxvideo_drv_16_INCS = \
     211        $(VBOX_PATH_X11_XORG_1_6) \
     212        $(VBOX_PATH_X11_XORG_1_6)/X11 \
     213        $(VBOX_PATH_X11_XORG_1_6)/xorg
     214vboxvideo_drv_16_SOURCES  = \
     215        vboxvideo_15.c \
     216        vboxutils.c
     217
     218
    203219include $(KBUILD_PATH)/subfooter.kmk
    204220

  • trunk/src/VBox/Additions/x11/xgraphics/vboxvideo.h

    r9811 r16091  
    8282/* VBE/DDC support */
    8383#include "vbe.h"
    84 #include "vbeModes.h"
    8584
    8685/* ShadowFB support */
    87 #include "shadow.h"
    88 
    8986#include "shadowfb.h"
    9087
    … …  
    105102#define VBE_DISPI_LFB_ENABLED           0x40
    106103
    107 /* Int 10 support */
    108 #include "xf86int10.h"
    109 
    110 /* bank switching */
    111 #include "mibank.h"
    112 
    113104/* Dga definitions */
    114105#include "dgaproc.h"
    115106
    116 #include "xf86Resources.h"
    117107#include "xf86RAC.h"
    118108
    119 #include "xf1bpp.h"
    120 #include "xf4bpp.h"
    121109#include "fb.h"
    122 #include "afb.h"
    123 #include "mfb.h"
    124110
    125111#define VBOX_VERSION            4000

  • trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_15.c

    r9929 r16091  
    8484#define BOOL_STR(a) ((a) ? "TRUE" : "FALSE")
    8585
    86 #ifdef XFree86LOADER
    87 # include "xorg-server.h"
    88 #else
    89 # ifdef HAVE_CONFIG_H
    90 #  include "config.h"
    91 # endif
    92 #endif
     86#include "xorg-server.h"
    9387#include "vboxvideo.h"
    9488#include "version-generated.h"

  • trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk

    r12446 r16091  
    126126        $(PATH_SUB_CURRENT)
    127127vboxmouse_drv_15_SOURCES = \
    128         xorg15/vboxmouse.c
     128        vboxmouse_15.c
     129
     130
     131#
     132# vboxmouse_drv_16
     133#
     134DLLS += vboxmouse_drv_16
     135vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
     136vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
     137vboxmouse_drv_16_INCS := \
     138        $(VBOX_PATH_X11_XORG_1_6) \
     139        $(VBOX_PATH_X11_XORG_1_6)/X11 \
     140        $(VBOX_PATH_X11_XORG_1_6)/xorg \
     141        $(PATH_SUB_CURRENT)
     142vboxmouse_drv_16_SOURCES = \
     143        vboxmouse_15.c
    129144
    130145

  • trunk/src/VBox/Additions/x11/xmouse/vboxmouse_15.c

    r16042 r16091  
    4848 */
    4949
    50 #ifdef HAVE_CONFIG_H
    51 #include "config.h"
    52 #endif
    53 
    5450#include <VBox/VBoxGuest.h>
    5551#include <xf86.h>
    … …  
    7874VBoxInit(DeviceIntPtr device)
    7975{
     76    CARD8 map[2] = { 0, 1 };
    8077    InputInfoPtr pInfo;
    8178
    8279    pInfo = device->public.devicePrivate;
    8380
    84     if (!InitValuatorClassDeviceStruct(device, 2, GetMotionHistory,
    85                                        GetMotionHistorySize(), Absolute)) {
    86         xf86Msg(X_ERROR, "%s: InitValuatorClassDeviceStruct failed\n",
    87                 pInfo->name);
    88         return BadAlloc;
    89     }
     81    if (!InitValuatorClassDeviceStruct(device, 2,
     82#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
     83                                       GetMotionHistory,
     84#endif
     85                                       GetMotionHistorySize(), Absolute))
     86        return !Success;
     87
     88    /* Pretend we have buttons so the server accepts us as a pointing device. */
     89    if (!InitButtonClassDeviceStruct(device, 2 /* number of buttons */, map))
     90        return !Success;
    9091
    9192    /* Tell the server about the range of axis values we report */
    … …  
    185186    pInfo->type_name = XI_MOUSE;
    186187    pInfo->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS |
    187             XI86_ALWAYS_CORE | XI86_OPEN_ON_INIT;
     188            XI86_ALWAYS_CORE;
    188189
    189190    xf86CollectInputOptions(pInfo, NULL, NULL);
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette