Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
28813651
Commit
28813651
authored
Mar 18, 2016
by
Keith Packard
Committed by
Mike Gabriel
May 02, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move mi/miregion.c to dix/region.c
v1: Keith Packard <keithp@keithp.com> v2: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (backported to nx-libs)
parent
d9e7f6ae
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
Imakefile
nx-X11/programs/Xserver/dix/Imakefile
+2
-2
region.c
nx-X11/programs/Xserver/dix/region.c
+3
-1
Imakefile
nx-X11/programs/Xserver/mi/Imakefile
+2
-2
No files found.
nx-X11/programs/Xserver/dix/Imakefile
View file @
28813651
...
...
@@ -17,11 +17,11 @@ FFS_OBJ = ffs.o
SRCS = atom.c colormap.c cursor.c devices.c dispatch.c dixutils.c events.c \
extension.c gc.c globals.c glyphcurs.c grabs.c \
main.c property.c resource.c swaprep.c swapreq.c \
main.c property.c re
gion.c re
source.c swaprep.c swapreq.c \
tables.c window.c initatoms.c dixfonts.c privates.c pixmap.c $(FFS_SRC)
OBJS = atom.o colormap.o cursor.o devices.o dispatch.o dixutils.o events.o \
extension.o gc.o globals.o glyphcurs.o grabs.o \
main.o property.o resource.o swaprep.o swapreq.o \
main.o property.o re
gion.o re
source.o swaprep.o swapreq.o \
tables.o window.o initatoms.o dixfonts.o privates.o pixmap.o $(FFS_OBJ)
INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
...
...
nx-X11/programs/Xserver/
mi/mi
region.c
→
nx-X11/programs/Xserver/
dix/
region.c
View file @
28813651
...
...
@@ -81,6 +81,8 @@ Equipment Corporation.
#include <dix-config.h>
#endif
#include <pixman.h>
#include "regionstr.h"
#include <nx-X11/Xprotostr.h>
#include "gc.h"
...
...
@@ -219,7 +221,7 @@ if (((numRects) < ((reg)->data->size >> 1)) && ((reg)->data->size > 50)) \
}
BoxRec
miEmptyBox
=
{
0
,
0
,
0
,
0
};
pixman_box16_t
miEmptyBox
=
{
0
,
0
,
0
,
0
};
RegDataRec
miEmptyData
=
{
0
,
0
};
RegDataRec
miBrokenData
=
{
0
,
0
};
...
...
nx-X11/programs/Xserver/mi/Imakefile
View file @
28813651
...
...
@@ -44,7 +44,7 @@ SRCS = $(CBRT_SRC) mivaltree.c mipolyseg.c mipolyrect.c \
mipoly.c mipolycon.c mipolygen.c mipolyutil.c \
mifillrct.c miwideline.c mispans.c \
miarc.c mizerarc.c mifillarc.c \
miwindow.c micursor.c
miregion.c
\
miwindow.c micursor.c \
mipolytext.c mibitblt.c mipolypnt.c mipushpxl.c \
miexpose.c miglblt.c mizerline.c mizerclip.c mifpolycon.c \
midash.c mibstore.c mibank.c $(MIINITEXTSRC) mieq.c \
...
...
@@ -55,7 +55,7 @@ OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \
mipoly.o mipolycon.o mipolygen.o mipolyutil.o \
mifillrct.o miwideline.o mispans.o \
miarc.o mizerarc.o mifillarc.o \
miwindow.o micursor.o
miregion.o
\
miwindow.o micursor.o \
mipolytext.o mibitblt.o mipolypnt.o mipushpxl.o \
miexpose.o miglblt.o mizerline.o mizerclip.o mifpolycon.o \
midash.o mibstore.o mibank.o $(MIINITEXTOBJ) mieq.o \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment