projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: rename xmlpool.h to driconf.h
[mesa.git]
/
src
/
glx
/
xfont.c
diff --git
a/src/glx/xfont.c
b/src/glx/xfont.c
index db3a57011005be40734667b88f448d0e690e202d..fdf8f992139cf785d09c6e0d07715bb1958cd731 100644
(file)
--- a/
src/glx/xfont.c
+++ b/
src/glx/xfont.c
@@
-1,6
+1,5
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version: 3.1
*
* Copyright (C) 1999 Brian Paul All Rights Reserved.
*
*
* Copyright (C) 1999 Brian Paul All Rights Reserved.
*
@@
-17,9
+16,10
@@
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
*/
@@
-129,7
+129,7
@@
dump_bitmap(unsigned int width, unsigned int height, GLubyte * bitmap)
* Generate OpenGL-compatible bitmap.
*/
static void
* Generate OpenGL-compatible bitmap.
*/
static void
-fill_bitmap(Display * dpy,
Window wi
n, GC gc,
+fill_bitmap(Display * dpy,
int scree
n, GC gc,
unsigned int width, unsigned int height,
int x0, int y0, unsigned int c, GLubyte * bitmap)
{
unsigned int width, unsigned int height,
int x0, int y0, unsigned int c, GLubyte * bitmap)
{
@@
-138,7
+138,7
@@
fill_bitmap(Display * dpy, Window win, GC gc,
Pixmap pixmap;
XChar2b char2b;
Pixmap pixmap;
XChar2b char2b;
- pixmap = XCreatePixmap(dpy,
win
, 8 * width, height, 1);
+ pixmap = XCreatePixmap(dpy,
RootWindow(dpy, screen)
, 8 * width, height, 1);
XSetForeground(dpy, gc, 0);
XFillRectangle(dpy, pixmap, gc, 0, 0, 8 * width, height);
XSetForeground(dpy, gc, 1);
XSetForeground(dpy, gc, 0);
XFillRectangle(dpy, pixmap, gc, 0, 0, 8 * width, height);
XSetForeground(dpy, gc, 1);
@@
-212,10
+212,10
@@
isvalid(XFontStruct * fs, int which)
}
_X_HIDDEN void
}
_X_HIDDEN void
-DRI_glXUseXFont(
GLXContext
CC, Font font, int first, int count, int listbase)
+DRI_glXUseXFont(
struct glx_context *
CC, Font font, int first, int count, int listbase)
{
Display *dpy;
{
Display *dpy;
-
Window wi
n;
+
int scree
n;
Pixmap pixmap;
GC gc;
XGCValues values;
Pixmap pixmap;
GC gc;
XGCValues values;
@@
-231,7
+231,7
@@
DRI_glXUseXFont(GLXContext CC, Font font, int first, int count, int listbase)
int i;
dpy = CC->currentDpy;
int i;
dpy = CC->currentDpy;
-
win = CC->currentDrawable
;
+
screen = CC->screen
;
fs = XQueryFont(dpy, font);
if (!fs) {
fs = XQueryFont(dpy, font);
if (!fs) {
@@
-245,7
+245,7
@@
DRI_glXUseXFont(GLXContext CC, Font font, int first, int count, int listbase)
max_bm_width = (max_width + 7) / 8;
max_bm_height = max_height;
max_bm_width = (max_width + 7) / 8;
max_bm_height = max_height;
- bm =
(GLubyte *) X
malloc((max_bm_width * max_bm_height) * sizeof(GLubyte));
+ bm = malloc((max_bm_width * max_bm_height) * sizeof(GLubyte));
if (!bm) {
XFreeFontInfo(NULL, fs, 1);
__glXSetError(CC, GL_OUT_OF_MEMORY);
if (!bm) {
XFreeFontInfo(NULL, fs, 1);
__glXSetError(CC, GL_OUT_OF_MEMORY);
@@
-279,7
+279,7
@@
DRI_glXUseXFont(GLXContext CC, Font font, int first, int count, int listbase)
glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- pixmap = XCreatePixmap(dpy,
win
, 10, 10, 1);
+ pixmap = XCreatePixmap(dpy,
RootWindow(dpy, screen)
, 10, 10, 1);
values.foreground = BlackPixel(dpy, DefaultScreen(dpy));
values.background = WhitePixel(dpy, DefaultScreen(dpy));
values.font = fs->fid;
values.foreground = BlackPixel(dpy, DefaultScreen(dpy));
values.background = WhitePixel(dpy, DefaultScreen(dpy));
values.font = fs->fid;
@@
-342,7
+342,7
@@
DRI_glXUseXFont(GLXContext CC, Font font, int first, int count, int listbase)
if (valid && (bm_width > 0) && (bm_height > 0)) {
memset(bm, '\0', bm_width * bm_height);
if (valid && (bm_width > 0) && (bm_height > 0)) {
memset(bm, '\0', bm_width * bm_height);
- fill_bitmap(dpy,
wi
n, gc, bm_width, bm_height, x, y, c, bm);
+ fill_bitmap(dpy,
scree
n, gc, bm_width, bm_height, x, y, c, bm);
glBitmap(width, height, x0, y0, dx, dy, bm);
#ifdef DEBUG
glBitmap(width, height, x0, y0, dx, dy, bm);
#ifdef DEBUG
@@
-359,7
+359,7
@@
DRI_glXUseXFont(GLXContext CC, Font font, int first, int count, int listbase)
glEndList();
}
glEndList();
}
-
X
free(bm);
+ free(bm);
XFreeFontInfo(NULL, fs, 1);
XFreeGC(dpy, gc);
XFreeFontInfo(NULL, fs, 1);
XFreeGC(dpy, gc);