archive/mumble-voip_mumble
0
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-03-14 20:53:06 +00:00
Code Issues Projects Releases Wiki Activity

Unify overlay code for Unix and OS X.

Browse source 
This commit removes macx/overlay and merges
the OS X overlay into the Unix overlay in
overlay_gl.

Most of the overlay logic is exactly the same,
with most of the differences being in the
initialization code and the addition of few new
messages for the interactive client-in-overlay
feature that the OS X overlay suports.

The initialization code is factored out into
init_unix.c for Unix-likes and init_mac.c
for OS X.

These init files are #included by overlay.c.
That is, they're not separate translation
units. Doing it this way cuts down on the
total LOC count and overall complexity of the
code.

The interactive overlay support is ported
directly from the OS X overlay. It's mostly
a matter of supporting a few new message types:
OVERLAY_MSGTYPE_PID and OVERLAY_MSGTYPE_INTERACTIVE.

The overlay_gl.pro file in this commit is mostly
just a combination of the .pro files of the two
overlays, with a minor difference in the CFLAGS
for the OS X overlay. In old OS X overlay, the
overlay had an ".m" file extension, signalling
that it is an Objective-C source file to the
C compiler. Since the combined overlay has a
".c" extension, "-x objective-c" is added to
CFLAGS on OS X to tell the compiler to compile
the overlay as Objective-C code.
This commit is contained in:
Mikkel Krautz 2015-02-07 23:21:04 +01:00
parent a5651973d5
commit f0ff84f6c0
12 changed files with 635 additions and 1108 deletions

2
macx/macx.pro
View file

@ -1,6 +1,6 @@
TEMPLATE = subdirs
CONFIG += debug_and_release
SUBDIRS = overlay compat osax
SUBDIRS = compat osax
include(scripts/scripts.pro)

18
macx/overlay/avail.pl
View file

@ -1,18 +0,0 @@
#!/usr/bin/perl
# perl avail.pl < overlay.m > avail.h
%funcs = ();
while (<STDIN>) {
foreach (split(/([ \t])/, $_)) {
@glfunc = ($_ =~ /(gl[A-Z0-9][a-zA-Z0-9]+)/);
foreach $func(@glfunc) {
$funcs{$func} = 1;
}
}
}
print "#define AVAIL_ALL_GLSYM ( \\\n";
foreach my $key (keys %funcs) {
print "\tAVAIL($key) && \\\n";
}
print "\t1)\n";

791
macx/overlay/overlay.m
View file

@ -1,791 +0,0 @@
/* Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
Copyright (C) 2008-2011, Mikkel Krautz <mikkel@krautz.dk>
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
- Neither the name of the Mumble Developers nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <wchar.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/ipc.h>
#include <sys/time.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/stat.h>
#include <time.h>
#include <fcntl.h>
#include <errno.h>
#include <time.h>
#include <string.h>
#include <mach/mach_init.h>
#include <mach/task.h>
#include <dlfcn.h>
#include <pwd.h>
#include <unistd.h>
#include <objc/objc-runtime.h>
#include <OpenGL/OpenGL.h>
#include <Carbon/Carbon.h>
#include <Cocoa/Cocoa.h>
#include <AGL/AGL.h>
#include "mach_override.h"
#include "../../overlay/overlay.h"
#include "avail.h"
static bool bDebug = false;
static bool bCursorAvail = false;
typedef struct _Context {
struct _Context *next;
GLuint uiProgram;
CGLContextObj cglctx;
NSOpenGLContext *nsctx;
unsigned int uiWidth, uiHeight;
unsigned int uiLeft, uiRight, uiTop, uiBottom;
struct sockaddr_un saName;
int iSocket;
struct OverlayMsg omMsg;
GLuint texture;
unsigned char *a_ucTexture;
unsigned int uiMappedLength;
clock_t timeT;
unsigned int frameCount;
GLint maxVertexAttribs;
GLboolean* vertexAttribStates;
} Context;
static const char vshader[] = ""
"void main() {"
"gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;"
"gl_TexCoord[0] = gl_MultiTexCoord0;"
"}";
static const char fshader[] = ""
"uniform sampler2D tex;"
"void main() {"
"gl_FragColor = texture2D(tex, gl_TexCoord[0].st);"
"}";
const GLfloat fBorder[] = {0.125f, 0.250f, 0.5f, 0.75f};
static Context *contexts = NULL;
#define AVAIL(name) dlsym(RTLD_DEFAULT,#name)
#define FDEF(name) static __typeof__(&name) o##name = NULL
FDEF(CGLFlushDrawable);
FDEF(CGDisplayHideCursor);
FDEF(CGDisplayShowCursor);
__attribute__((format(printf, 1, 2)))
static void ods(const char *format, ...) {
if (!bDebug) {
return;
}
char fmt[1024] = { 0, };
strlcat(fmt, "MumbleOverlay: ", 1024);
strlcat(fmt, format, 1024);
strlcat(fmt, "\n", 1024);
va_list args;
va_start(args, format);
vfprintf(stderr, fmt, args);
va_end(args);
fflush(stderr);
}
static void newContext(Context * ctx) {
ctx->iSocket = -1;
ctx->omMsg.omh.iLength = -1;
ctx->texture = ~0;
ctx->timeT = clock();
ctx->frameCount = 0;
char *home = getenv("HOME");
if (home == NULL) {
struct passwd *pwent= getpwuid(getuid());
if (pwent && pwent->pw_dir && pwent->pw_dir[0])
home = pwent->pw_dir;
}
if (home) {
ctx->saName.sun_family = PF_UNIX;
strcpy(ctx->saName.sun_path, home);
strcat(ctx->saName.sun_path, "/.MumbleOverlayPipe");
}
ods("OpenGL Version %s, Vendor %s, Renderer %s, Shader %s", glGetString(GL_VERSION), glGetString(GL_VENDOR), glGetString(GL_RENDERER), glGetString(GL_SHADING_LANGUAGE_VERSION));
const char *vsource = vshader;
const char *fsource = fshader;
char buffer[8192];
GLint l;
GLuint vs = glCreateShader(GL_VERTEX_SHADER);
GLuint fs = glCreateShader(GL_FRAGMENT_SHADER);
glShaderSource(vs, 1, &vsource, NULL);
glShaderSource(fs, 1, &fsource, NULL);
glCompileShader(vs);
glCompileShader(fs);
glGetShaderInfoLog(vs, 8192, &l, buffer);
ods("VERTEX: %s", buffer);
glGetShaderInfoLog(fs, 8192, &l, buffer);
ods("FRAGMENT: %s", buffer);
ctx->uiProgram = glCreateProgram();
glAttachShader(ctx->uiProgram, vs);
glAttachShader(ctx->uiProgram, fs);
glLinkProgram(ctx->uiProgram);
glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &ctx->maxVertexAttribs);
ctx->vertexAttribStates = (GLboolean*)calloc(ctx->maxVertexAttribs, sizeof(GLboolean));
}
static void releaseMem(Context *ctx) {
if (ctx->a_ucTexture) {
munmap(ctx->a_ucTexture, ctx->uiMappedLength);
ctx->a_ucTexture = NULL;
ctx->uiMappedLength = 0;
}
if (ctx->texture != ~0) {
glDeleteTextures(1, &ctx->texture);
ctx->texture = ~0;
}
ctx->uiLeft = ctx->uiTop = ctx->uiRight = ctx->uiBottom = 0;
}
static void disconnect(Context *ctx) {
releaseMem(ctx);
ctx->uiWidth = ctx->uiHeight = 0;
if (ctx->iSocket != -1) {
close(ctx->iSocket);
ctx->iSocket = -1;
}
ods("Disconnected");
}
static bool sendMessage(Context *ctx, struct OverlayMsg *om) {
if (ctx->iSocket != -1) {
ssize_t wantsend = sizeof(struct OverlayMsgHeader) + om->omh.iLength;
ssize_t sent = send(ctx->iSocket, om, wantsend, MSG_DONTWAIT);
if (wantsend == sent)
return true;
ods("Short write");
}
disconnect(ctx);
return false;
}
static void regenTexture(Context *ctx) {
if (ctx->texture != ~0)
glDeleteTextures(1, & ctx->texture);
glGenTextures(1, &ctx->texture);
glBindTexture(GL_TEXTURE_2D, ctx->texture);
glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, fBorder);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, ctx->uiWidth, ctx->uiHeight, 0, GL_BGRA, GL_UNSIGNED_BYTE, ctx->a_ucTexture);
}
static void drawOverlay(Context *ctx, unsigned int width, unsigned int height) {
if (ctx->iSocket == -1) {
releaseMem(ctx);
if (! ctx->saName.sun_path[0])
return;
ctx->iSocket = socket(AF_UNIX, SOCK_STREAM, 0);
if (ctx->iSocket == -1) {
ods("socket() failure");
return;
}
fcntl(ctx->iSocket, F_SETFL, O_NONBLOCK, 1);
if (connect(ctx->iSocket, (struct sockaddr *)(& ctx->saName), sizeof(ctx->saName)) != 0) {
close(ctx->iSocket);
ctx->iSocket = -1;
ods("connect() failure %s", ctx->saName.sun_path);
return;
}
ods("Connected");
struct OverlayMsg om;
om.omh.uiMagic = OVERLAY_MAGIC_NUMBER;
om.omh.uiType = OVERLAY_MSGTYPE_PID;
om.omh.iLength = sizeof(struct OverlayMsgPid);
om.omp.pid = getpid();
if (!sendMessage(ctx, &om))
return;
ods("SentPid");
}
if ((ctx->uiWidth != width) || (ctx->uiHeight != height)) {
ods("Sent init %i %i", width, height);
releaseMem(ctx);
ctx->uiWidth = width;
ctx->uiHeight = height;
struct OverlayMsg om;
om.omh.uiMagic = OVERLAY_MAGIC_NUMBER;
om.omh.uiType = OVERLAY_MSGTYPE_INIT;
om.omh.iLength = sizeof(struct OverlayMsgInit);
om.omi.uiWidth = ctx->uiWidth;
om.omi.uiHeight = ctx->uiHeight;
if (! sendMessage(ctx, &om))
return;
}
while (1) {
if (ctx->omMsg.omh.iLength == -1) {
ssize_t length = recv(ctx->iSocket, ctx->omMsg.headerbuffer, sizeof(struct OverlayMsgHeader), 0);
if (length < 0) {
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
break;
disconnect(ctx);
return;
} else if (length != sizeof(struct OverlayMsgHeader)) {
ods("Short header read");
disconnect(ctx);
return;
}
} else {
ssize_t length = recv(ctx->iSocket, ctx->omMsg.msgbuffer, ctx->omMsg.omh.iLength, 0);
if (length < 0) {
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
break;
disconnect(ctx);
return;
} else if (length != ctx->omMsg.omh.iLength) {
ods("Short message read %x %d/%d", ctx->omMsg.omh.uiType, length, ctx->omMsg.omh.iLength);
disconnect(ctx);
return;
}
ctx->omMsg.omh.iLength = -1;
switch (ctx->omMsg.omh.uiType) {
case OVERLAY_MSGTYPE_SHMEM: {
struct OverlayMsgShmem *oms = & ctx->omMsg.omi;
ods("SHMEM %s", oms->a_cName);
releaseMem(ctx);
int fd = shm_open(oms->a_cName, O_RDONLY, 0600);
if (fd != -1) {
struct stat buf;
fstat(fd, &buf);
if (buf.st_size >= ctx->uiWidth * ctx->uiHeight * 4) {
ctx->uiMappedLength = buf.st_size;
ctx->a_ucTexture = mmap(NULL, buf.st_size, PROT_READ, MAP_SHARED, fd, 0);
if (ctx->a_ucTexture != (unsigned char *) -1) {
struct OverlayMsg om;
om.omh.uiMagic = OVERLAY_MAGIC_NUMBER;
om.omh.uiType = OVERLAY_MSGTYPE_SHMEM;
om.omh.iLength = 0;
if (! sendMessage(ctx, &om))
return;
regenTexture(ctx);
continue;
}
ctx->a_ucTexture = NULL;
}
ctx->uiMappedLength = 0;
close(fd);
}
ods("Failed to map memory");
}
break;
case OVERLAY_MSGTYPE_BLIT: {
struct OverlayMsgBlit *omb = & ctx->omMsg.omb;
ods("BLIT %d %d %d %d", omb->x, omb->y, omb->w, omb->h);
if ((ctx->a_ucTexture != NULL) && (ctx->texture != ~0)) {
glBindTexture(GL_TEXTURE_2D, ctx->texture);
if ((omb->x == 0) && (omb->y == 0) && (omb->w == ctx->uiWidth) && (omb->h == ctx->uiHeight)) {
ods("Optimzied fullscreen blit");
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, ctx->uiWidth, ctx->uiHeight, 0, GL_BGRA, GL_UNSIGNED_BYTE, ctx->a_ucTexture);
} else {
unsigned int x = omb->x;
unsigned int y = omb->y;
unsigned int w = omb->w;
unsigned int h = omb->h;
unsigned char *ptr = (unsigned char *) malloc(w*h*4);
int r;
memset(ptr, 0, w * h * 4);
for (r = 0; r < h; ++r) {
const unsigned char *sptr = ctx->a_ucTexture + 4 * ((y+r) * ctx->uiWidth + x);
unsigned char *dptr = ptr + 4 * w * r;
memcpy(dptr, sptr, w * 4);
}
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, GL_BGRA, GL_UNSIGNED_BYTE, ptr);
free(ptr);
}
}
}
break;
case OVERLAY_MSGTYPE_ACTIVE: {
struct OverlayMsgActive *oma = & ctx->omMsg.oma;
ods("ACTIVE %d %d %d %d", oma->x, oma->y, oma->w, oma->h);
ctx->uiLeft = oma->x;
ctx->uiTop = oma->y;
ctx->uiRight = oma->x + oma->w;
ctx->uiBottom = oma->y + oma->h;
}
break;
case OVERLAY_MSGTYPE_INTERACTIVE: {
struct OverlayMsgInteractive *omin = & ctx->omMsg.omin;
ods("Interactive %d", omin->state);
if (bCursorAvail) {
if (omin->state) {
oCGDisplayHideCursor(kCGNullDirectDisplay);
} else {
oCGDisplayShowCursor(kCGNullDirectDisplay);
}
}
}
default:
break;
}
}
}
if ((ctx->a_ucTexture == NULL) || (ctx->texture == ~0))
return;
if (! glIsTexture(ctx->texture)) {
ctx->texture = ~0;
ods("Lost texture");
regenTexture(ctx);
} else {
glBindTexture(GL_TEXTURE_2D, ctx->texture);
GLfloat bordercolor[4];
glGetTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, bordercolor);
if (bordercolor[0] != fBorder[0] || bordercolor[1] != fBorder[1] || bordercolor[2] != fBorder[2] || bordercolor[3] != fBorder[3]) {
ods("Texture hijacked");
regenTexture(ctx);
}
}
glBindTexture(GL_TEXTURE_2D, ctx->texture);
glPushMatrix();
float w = (float)(ctx->uiWidth);
float h = (float)(ctx->uiHeight);
float left = (float)(ctx->uiLeft);
float top = (float)(ctx->uiTop);
float right = (float)(ctx->uiRight);
float bottom = (float)(ctx->uiBottom);
float xm = (left) / w;
float ym = (top) / h;
float xmx = (right) / w;
float ymx = (bottom) / h;
GLfloat vertex[] = {left, bottom,
left, top,
right, top,
right, bottom};
GLfloat tex[] = {xm, ymx, xm, ym, xmx, ym, xmx, ymx};
glVertexPointer(2, GL_FLOAT, 0, vertex);
glTexCoordPointer(2, GL_FLOAT, 0, tex);
glDrawArrays(GL_QUADS, 0, 4);
glPopMatrix();
}
static void drawContext(Context * ctx, int width, int height) {
clock_t t = clock();
float elapsed = (float)(t - ctx->timeT) / CLOCKS_PER_SEC;
++(ctx->frameCount);
if (elapsed > OVERLAY_FPS_INTERVAL) {
struct OverlayMsg om;
om.omh.uiMagic = OVERLAY_MAGIC_NUMBER;
om.omh.uiType = OVERLAY_MSGTYPE_FPS;
om.omh.iLength = sizeof(struct OverlayMsgFps);
om.omf.fps = ctx->frameCount / elapsed;
sendMessage(ctx, &om);
ctx->frameCount = 0;
ctx->timeT = t;
}
GLint program;
GLint viewport[4];
int i;
glPushAttrib(GL_ALL_ATTRIB_BITS);
glPushClientAttrib(GL_ALL_ATTRIB_BITS);
glGetIntegerv(GL_VIEWPORT, viewport);
glGetIntegerv(GL_CURRENT_PROGRAM, &program);
glViewport(0, 0, width, height);
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
glOrtho(0, width, height, 0, -100.0, 100.0);
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();
glMatrixMode(GL_TEXTURE);
glPushMatrix();
glLoadIdentity();
glDisable(GL_ALPHA_TEST);
glDisable(GL_AUTO_NORMAL);
// Skip clip planes, there are thousands of them.
glDisable(GL_COLOR_LOGIC_OP);
glDisable(GL_COLOR_TABLE);
glDisable(GL_CONVOLUTION_1D);
glDisable(GL_CONVOLUTION_2D);
glDisable(GL_CULL_FACE);
glDisable(GL_DEPTH_TEST);
glDisable(GL_DITHER);
glDisable(GL_FOG);
glDisable(GL_HISTOGRAM);
glDisable(GL_INDEX_LOGIC_OP);
glDisable(GL_LIGHTING);
glDisable(GL_NORMALIZE);
// Skip line smmooth
// Skip map
glDisable(GL_MINMAX);
// Skip polygon offset
glDisable(GL_SEPARABLE_2D);
glDisable(GL_SCISSOR_TEST);
glDisable(GL_STENCIL_TEST);
GLboolean b = 0;
glGetBooleanv(GL_TEXTURE_GEN_Q, &b);
if (b)
glDisable(GL_TEXTURE_GEN_Q);
glGetBooleanv(GL_TEXTURE_GEN_R, &b);
if (b)
glDisable(GL_TEXTURE_GEN_R);
glGetBooleanv(GL_TEXTURE_GEN_S, &b);
if (b)
glDisable(GL_TEXTURE_GEN_S);
glGetBooleanv(GL_TEXTURE_GEN_T, &b);
if (b)
glDisable(GL_TEXTURE_GEN_T);
glRenderMode(GL_RENDER);
glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_NORMAL_ARRAY);
glDisableClientState(GL_COLOR_ARRAY);
glDisableClientState(GL_INDEX_ARRAY);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
glDisableClientState(GL_EDGE_FLAG_ARRAY);
glPixelStorei(GL_UNPACK_SWAP_BYTES, 0);
glPixelStorei(GL_UNPACK_LSB_FIRST, 0);
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
GLint texunits = 1;
glGetIntegerv(GL_MAX_TEXTURE_UNITS, &texunits);
for (i=texunits-1;i>=0;--i) {
glActiveTexture(GL_TEXTURE0 + i);
glDisable(GL_TEXTURE_1D);
glDisable(GL_TEXTURE_2D);
glDisable(GL_TEXTURE_3D);
}
glDisable(GL_TEXTURE_CUBE_MAP);
glDisable(GL_VERTEX_PROGRAM_ARB);
glDisable(GL_FRAGMENT_PROGRAM_ARB);
GLint enabled;
for (i=0;i<ctx->maxVertexAttribs;++i) {
enabled = GL_FALSE;
glGetVertexAttribiv((GLuint)i, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &enabled);
if (enabled == GL_TRUE) {
glDisableVertexAttribArray((GLuint)i);
ctx->vertexAttribStates[i] = GL_TRUE;
}
}
glUseProgram(ctx->uiProgram);
glEnable(GL_COLOR_MATERIAL);
glEnable(GL_TEXTURE_2D);
glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glMatrixMode(GL_MODELVIEW);
GLint uni = glGetUniformLocation(ctx->uiProgram, "tex");
glUniform1i(uni, 0);
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
int bound = 0, vbobound = 0;
glGetIntegerv(GL_PIXEL_UNPACK_BUFFER_BINDING, &bound);
glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &vbobound);
if (bound != 0)
glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
if (vbobound != 0)
glBindBuffer(GL_ARRAY_BUFFER, 0);
drawOverlay(ctx, width, height);
if (bound != 0)
glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, bound);
if (vbobound != 0)
glBindBuffer(GL_ARRAY_BUFFER, vbobound);
for (i=0;i<ctx->maxVertexAttribs;++i) {
if (ctx->vertexAttribStates[i] == GL_TRUE) {
glEnableVertexAttribArray((GLuint)i);
ctx->vertexAttribStates[i] = GL_FALSE;
}
}
glMatrixMode(GL_TEXTURE);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
glMatrixMode(GL_PROJECTION);
glPopMatrix();
glPopClientAttrib();
glPopAttrib();
glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
glUseProgram(program);
while (glGetError() != GL_NO_ERROR);
}
@implementation NSOpenGLContext (MumbleOverlay)
- (void) overlayFlushBuffer {
ods("[NSOpenGLContext flushBuffer] %p %p", self, [self CGLContextObj]);
Context *c = contexts;
while (c) {
if (c->nsctx == self && c->cglctx == [self CGLContextObj])
break;
c = c->next;
}
if (!c) {
ods("Current context is: %p", self);
c = malloc(sizeof(Context));
if (!c) {
ods("malloc failure");
return;
}
c->next = contexts;
c->nsctx = (NSOpenGLContext *)self;
c->cglctx = (CGLContextObj)[self CGLContextObj];
contexts = c;
newContext(c);
}
NSView *v = [c->nsctx view];
int width = 0, height = 0;
if (v) {
NSRect r = [v bounds];
width = (int)r.size.width;
height = (int)r.size.height;
} else {
if (AVAIL(CGMainDisplayID)) {
CGDirectDisplayID md = CGMainDisplayID();
if (CGDisplayIsCaptured(md)) {
width = CGDisplayPixelsWide(md);
height = CGDisplayPixelsHigh(md);
}
}
if (!width && !height) {
GLint viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
width = viewport[2];
height = viewport[3];
}
}
drawContext(c, width, height);
[self overlayFlushBuffer];
}
@end
void CGLFlushDrawableOverride(CGLContextObj ctx) {
ods("CGLFlushDrawableOverride %p", ctx);
Context *c = contexts;
/* Sometimes, we can get a FlushDrawable where the current context is NULL.
* Also, check that the context CGLFlushDrawable was called on is the active context.
* If it isn't, who knows what context we're drawing on?
*
* Maybe we should even use CGLSetCurrentContext() to switch to the context that's being
* flushed?
*/
CGLContextObj current = CGLGetCurrentContext();
if (current == NULL || ctx != current)
goto skip;
while (c) {
if (c->cglctx == ctx) {
/* There is no NSOpenGLContext for this CGLContext, so we should draw. */
if (c->nsctx == NULL)
break;
/* This context is coupled with a NSOpenGLContext, so skip. */
else
goto skip;
}
c = c->next;
}
if (!c) {
ods("Current context is: %p", ctx);
c = malloc(sizeof(Context));
if (!c) {
ods("malloc failure");
return;
}
memset(c, 0, sizeof(Context));
c->next = contexts;
c->cglctx = ctx;
c->nsctx = NULL;
contexts = c;
newContext(c);
}
int width = 0, height = 0;
if (AVAIL(CGMainDisplayID)) {
CGDirectDisplayID md = CGMainDisplayID();
if (CGDisplayIsCaptured(md)) {
width = CGDisplayPixelsWide(md);
height = CGDisplayPixelsHigh(md);
}
}
if (!width && !height) {
GLint viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
width = viewport[2];
height = viewport[3];
/* Are the viewport values crazy? Skip them in that case. */
if (height < 0 || width < 0 || height > 5000 || width > 5000)
goto skip;
}
drawContext(c, width, height);
skip:
oCGLFlushDrawable(ctx);
}
CGError CGDisplayShowCursorOverride(CGDirectDisplayID display) {
ods("CGDisplayShowCursor()");
return oCGDisplayShowCursor(display);
}
CGError CGDisplayHideCursorOverride(CGDirectDisplayID display) {
ods("CGDisplayHideCursor()");
return oCGDisplayHideCursor(display);
}
__attribute__ ((visibility("default")))
__attribute__((constructor))
void MumbleOverlayEntryPoint() {
struct stat buf;
bDebug = (stat("/Library/Application Support/.mumble_overlay_debug", &buf) == 0);
ods("!");
void *nsgl = NULL, *cgl = NULL;
nsgl = dlsym(RTLD_DEFAULT, "NSClassFromString");
cgl = dlsym(RTLD_DEFAULT, "CGLFlushDrawable");
/* Check for GL symbol availability */
if (!(AVAIL_ALL_GLSYM)) {
ods("Missing GL symbols. Disabling overlay.");
return;
}
/* NSOpenGL */
if (nsgl) {
ods("Attempting to hook NSOpenGL");
Class c = NSClassFromString(@"NSOpenGLContext");
if (c) {
Method orig = class_getInstanceMethod(c, @selector(flushBuffer));
Method new = class_getInstanceMethod(c, @selector(overlayFlushBuffer));
if (class_addMethod(c, @selector(flushBuffer), method_getImplementation(new), method_getTypeEncoding(new)))
class_replaceMethod(c, @selector(overlayFlushBuffer), method_getImplementation(orig), method_getTypeEncoding(orig));
else
method_exchangeImplementations(orig, new);
}
}
/* CGL */
if (AVAIL(CGLFlushDrawable)) {
ods("Attempting to hook CGL");
if (mach_override_ptr(dlsym(RTLD_DEFAULT, "CGLFlushDrawable"), CGLFlushDrawableOverride, (void **) &oCGLFlushDrawable) != 0) {
ods("CGLFlushDrawable override failed.");
} else
ods("Up running.");
} else {
ods("Required entry points not available in process. Not hooking up overlay.");
}
if (AVAIL(CGDisplayHideCursor) && AVAIL(CGDisplayShowCursor)) {
if (mach_override_ptr(dlsym(RTLD_DEFAULT, "CGDisplayHideCursor"), CGDisplayHideCursorOverride, (void **) &oCGDisplayHideCursor) != 0) {
ods("CGDisplayHideCursor override failed");
}
if (mach_override_ptr(dlsym(RTLD_DEFAULT, "CGDisplayShowCursor"), CGDisplayShowCursorOverride, (void **) &oCGDisplayShowCursor) != 0) {
ods("CGDisplayShowCursor override failed");
}
ods("Hooked CGDisplayShowCursor and CGDisplayHideCursor");
bCursorAvail = true;
}
}

40
macx/overlay/overlay.pro
View file

@ -1,40 +0,0 @@
# Overlay payload for Mac OS X.
include(../../compiler.pri)
CONFIG += x86_64 x86 debug_and_release plugin
CONFIG(universal) {
CONFIG += ppc
}
TEMPLATE = lib
CONFIG -= gui qt
CONFIG(static) {
CONFIG -= static
}
TARGET = mumbleoverlay
QMAKE_LFLAGS_PLUGIN += -undefined dynamic_lookup -dynamic
QMAKE_LFLAGS = -framework CoreFoundation
INCLUDEPATH *= ../../3rdparty/mach-override-src
LIBS *= -lmach-override
OBJECTIVE_SOURCES = overlay.m
HEADERS = avail.h
DIST = overlay.plist avail.pl
CONFIG(debug, debug|release) {
QMAKE_LIBDIR *= ../../debug
DESTDIR = ../../debug
}
CONFIG(release, debug|release) {
QMAKE_LIBDIR *= ../../release
DESTDIR = ../../release
}
include(../../symbols.pri)

1
main.pro
View file

@ -63,6 +63,7 @@ CONFIG *= ordered debug_and_release
error("Missing $MUMBLE_PREFIX environment variable");
}
SUBDIRS *= 3rdparty/mach-override-build
SUBDIRS *= overlay_gl
SUBDIRS *= macx
!exists($$(MUMBLE_PREFIX)/../LCDSDK) {
CONFIG *= no-g15

94
macx/overlay/avail.h → overlay_gl/avail_mac.h
View file

@ -1,55 +1,59 @@
#ifndef MUMBLE_AVAIL_H_
#define MUMBLE_AVAIL_H_
#ifndef MUMBLE_OVERLAY_AVAIL_MAC_H__
#define MUMBLE_OVERLAY_AVAIL_MAC_H__
// This file was auto-generated by 'avail_mac.pl'. Do not touch by hand.
#define AVAIL_ALL_GLSYM ( \
AVAIL(glTexImage2D) && \
AVAIL(glCreateShader) && \
AVAIL(glLinkProgram) && \
AVAIL(glActiveTexture) && \
AVAIL(glViewport) && \
AVAIL(glEnableClientState) && \
AVAIL(glOrtho) && \
AVAIL(glGetIntegerv) && \
AVAIL(glCompileShader) && \
AVAIL(glGetString) && \
AVAIL(glPopAttrib) && \
AVAIL(glPushClientAttrib) && \
AVAIL(glAttachShader) && \
AVAIL(glEnd) && \
AVAIL(glGetBooleanv) && \
AVAIL(glDisableClientState) && \
AVAIL(glUniform1i) && \
AVAIL(glRenderMode) && \
AVAIL(glIsTexture) && \
AVAIL(glTexEnvi) && \
AVAIL(glGetTexParameterfv) && \
AVAIL(glPopMatrix) && \
AVAIL(glDisable) && \
AVAIL(glBindTexture) && \
AVAIL(glPushAttrib) && \
AVAIL(glUseProgram) && \
AVAIL(glCreateProgram) && \
AVAIL(glDeleteTextures) && \
AVAIL(glBegin) && \
AVAIL(glVertex2f) && \
AVAIL(glMatrixMode) && \
AVAIL(glGenTextures) && \
AVAIL(glGetError) && \
AVAIL(glBlendFunc) && \
AVAIL(glPopClientAttrib) && \
AVAIL(glBindBuffer) && \
AVAIL(glShaderSource) && \
AVAIL(glEnable) && \
AVAIL(glGetShaderInfoLog) && \
AVAIL(glPixelStorei) && \
AVAIL(glTexParameterfv) && \
AVAIL(glTexSubImage2D) && \
AVAIL(glTexCoord2f) && \
AVAIL(glGetUniformLocation) && \
AVAIL(glBindTexture) && \
AVAIL(glBlendFunc) && \
AVAIL(glColorMaterial) && \
AVAIL(glPushMatrix) && \
AVAIL(glTexParameteri) && \
AVAIL(glCompileShader) && \
AVAIL(glCreateProgram) && \
AVAIL(glCreateShader) && \
AVAIL(glDeleteTextures) && \
AVAIL(glDisable) && \
AVAIL(glDisableClientState) && \
AVAIL(glDisableVertexAttribArray) && \
AVAIL(glDrawArrays) && \
AVAIL(glEnable) && \
AVAIL(glEnableClientState) && \
AVAIL(glEnableVertexAttribArray) && \
AVAIL(glGenTextures) && \
AVAIL(glGetBooleanv) && \
AVAIL(glGetError) && \
AVAIL(glGetIntegerv) && \
AVAIL(glGetShaderInfoLog) && \
AVAIL(glGetString) && \
AVAIL(glGetTexParameterfv) && \
AVAIL(glGetUniformLocation) && \
AVAIL(glGetVertexAttribiv) && \
AVAIL(glIsTexture) && \
AVAIL(glLinkProgram) && \
AVAIL(glLoadIdentity) && \
AVAIL(glMatrixMode) && \
AVAIL(glOrtho) && \
AVAIL(glPixelStorei) && \
AVAIL(glPopAttrib) && \
AVAIL(glPopClientAttrib) && \
AVAIL(glPopMatrix) && \
AVAIL(glPushAttrib) && \
AVAIL(glPushClientAttrib) && \
AVAIL(glPushMatrix) && \
AVAIL(glRenderMode) && \
AVAIL(glShaderSource) && \
AVAIL(glTexCoordPointer) && \
AVAIL(glTexEnvi) && \
AVAIL(glTexImage2D) && \
AVAIL(glTexParameterfv) && \
AVAIL(glTexParameteri) && \
AVAIL(glTexSubImage2D) && \
AVAIL(glUniform1i) && \
AVAIL(glUseProgram) && \
AVAIL(glVertexPointer) && \
AVAIL(glViewport) && \
1)
#endif

25
overlay_gl/avail_mac.pl Normal file
View file

@ -0,0 +1,25 @@
#!/usr/bin/perl
# perl avail_mac.pl < overlay.c init_mac.c > avail_mac.h
%funcs = ();
while (<STDIN>) {
foreach (split(/([ \t])/, $_)) {
@glfunc = ($_ =~ /(gl[A-VY-Z0-9][a-zA-Z0-9]+)/);
foreach $func(@glfunc) {
$funcs{$func} = 1;
}
}
}
print "#ifndef MUMBLE_OVERLAY_AVAIL_MAC_H__\n";
print "#define MUMBLE_OVERLAY_AVAIL_MAC_H__\n";
print "\n";
print "// This file was auto-generated by 'avail_mac.pl'. Do not touch by hand.\n";
print "\n";
print "#define AVAIL_ALL_GLSYM ( \\\n";
foreach my $key (sort keys %funcs) {
print "\tAVAIL($key) && \\\n";
}
print "\t1)\n";
print "\n";
print "#endif\n";

217
overlay_gl/init_mac.c Normal file
View file

@ -0,0 +1,217 @@
/* Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
Copyright (C) 2008-2015, Mikkel Krautz <mikkel@krautz.dk>
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
- Neither the name of the Mumble Developers nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
// This file is included by overlay.c for
// Mac-specific overlay initialization.
@implementation NSOpenGLContext (MumbleOverlay)
- (void) overlayFlushBuffer {
ods("[NSOpenGLContext flushBuffer] %p %p", self, [self CGLContextObj]);
Context *c = contexts;
while (c) {
if (c->nsctx == self && c->cglctx == [self CGLContextObj])
break;
c = c->next;
}
if (!c) {
ods("Current context is: %p", self);
c = malloc(sizeof(Context));
if (!c) {
ods("malloc failure");
return;
}
c->next = contexts;
c->nsctx = (NSOpenGLContext *)self;
c->cglctx = (CGLContextObj)[self CGLContextObj];
contexts = c;
newContext(c);
}
NSView *v = [c->nsctx view];
int width = 0, height = 0;
if (v) {
NSRect r = [v bounds];
width = (int)r.size.width;
height = (int)r.size.height;
} else {
if (AVAIL(CGMainDisplayID)) {
CGDirectDisplayID md = CGMainDisplayID();
if (CGDisplayIsCaptured(md)) {
width = CGDisplayPixelsWide(md);
height = CGDisplayPixelsHigh(md);
}
}
if (!width && !height) {
GLint viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
width = viewport[2];
height = viewport[3];
}
}
drawContext(c, width, height);
[self overlayFlushBuffer];
}
@end
void CGLFlushDrawableOverride(CGLContextObj ctx) {
ods("CGLFlushDrawableOverride %p", ctx);
Context *c = contexts;
/* Sometimes, we can get a FlushDrawable where the current context is NULL.
* Also, check that the context CGLFlushDrawable was called on is the active context.
* If it isn't, who knows what context we're drawing on?
*
* Maybe we should even use CGLSetCurrentContext() to switch to the context that's being
* flushed?
*/
CGLContextObj current = CGLGetCurrentContext();
if (current == NULL || ctx != current)
goto skip;
while (c) {
if (c->cglctx == ctx) {
/* There is no NSOpenGLContext for this CGLContext, so we should draw. */
if (c->nsctx == NULL)
break;
/* This context is coupled with a NSOpenGLContext, so skip. */
else
goto skip;
}
c = c->next;
}
if (!c) {
ods("Current context is: %p", ctx);
c = malloc(sizeof(Context));
if (!c) {
ods("malloc failure");
return;
}
memset(c, 0, sizeof(Context));
c->next = contexts;
c->cglctx = ctx;
c->nsctx = NULL;
contexts = c;
newContext(c);
}
int width = 0, height = 0;
if (AVAIL(CGMainDisplayID)) {
CGDirectDisplayID md = CGMainDisplayID();
if (CGDisplayIsCaptured(md)) {
width = CGDisplayPixelsWide(md);
height = CGDisplayPixelsHigh(md);
}
}
if (!width && !height) {
GLint viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
width = viewport[2];
height = viewport[3];
/* Are the viewport values crazy? Skip them in that case. */
if (height < 0 || width < 0 || height > 5000 || width > 5000)
goto skip;
}
drawContext(c, width, height);
skip:
oCGLFlushDrawable(ctx);
}
CGError CGDisplayShowCursorOverride(CGDirectDisplayID display) {
ods("CGDisplayShowCursor()");
return oCGDisplayShowCursor(display);
}
CGError CGDisplayHideCursorOverride(CGDirectDisplayID display) {
ods("CGDisplayHideCursor()");
return oCGDisplayHideCursor(display);
}
__attribute__((constructor))
static void initializeLibrary() {
struct stat buf;
bDebug = (stat("/Library/Application Support/.mumble_overlay_debug", &buf) == 0);
ods("!");
void *nsgl = NULL, *cgl = NULL;
nsgl = dlsym(RTLD_DEFAULT, "NSClassFromString");
cgl = dlsym(RTLD_DEFAULT, "CGLFlushDrawable");
/* Check for GL symbol availability */
if (!(AVAIL_ALL_GLSYM)) {
ods("Missing GL symbols. Disabling overlay.");
return;
}
/* NSOpenGL */
if (nsgl) {
ods("Attempting to hook NSOpenGL");
Class c = NSClassFromString(@"NSOpenGLContext");
if (c) {
Method orig = class_getInstanceMethod(c, @selector(flushBuffer));
Method new = class_getInstanceMethod(c, @selector(overlayFlushBuffer));
if (class_addMethod(c, @selector(flushBuffer), method_getImplementation(new), method_getTypeEncoding(new)))
class_replaceMethod(c, @selector(overlayFlushBuffer), method_getImplementation(orig), method_getTypeEncoding(orig));
else
method_exchangeImplementations(orig, new);
}
}
/* CGL */
if (AVAIL(CGLFlushDrawable)) {
ods("Attempting to hook CGL");
if (mach_override_ptr(dlsym(RTLD_DEFAULT, "CGLFlushDrawable"), CGLFlushDrawableOverride, (void **) &oCGLFlushDrawable) != 0) {
ods("CGLFlushDrawable override failed.");
} else
ods("Up running.");
} else {
ods("Required entry points not available in process. Not hooking up overlay.");
}
if (AVAIL(CGDisplayHideCursor) && AVAIL(CGDisplayShowCursor)) {
if (mach_override_ptr(dlsym(RTLD_DEFAULT, "CGDisplayHideCursor"), CGDisplayHideCursorOverride, (void **) &oCGDisplayHideCursor) != 0) {
ods("CGDisplayHideCursor override failed");
}
if (mach_override_ptr(dlsym(RTLD_DEFAULT, "CGDisplayShowCursor"), CGDisplayShowCursorOverride, (void **) &oCGDisplayShowCursor) != 0) {
ods("CGDisplayShowCursor override failed");
}
ods("Hooked CGDisplayShowCursor and CGDisplayHideCursor");
bCursorAvail = true;
}
}

214
overlay_gl/init_unix.c Normal file
View file

@ -0,0 +1,214 @@
/* Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
Copyright (C) 2008-2015, Mikkel Krautz <mikkel@krautz.dk>
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
- Neither the name of the Mumble Developers nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
// This file is included by overlay.c for
// Unix/X11/GLX-specific overlay initialization.
static void initializeLibrary();
#define RESOLVE(x) if (! o##x) o##x = (__typeof__(&x)) odlsym(RTLD_NEXT, #x)
static void resolveOpenGL() {
RESOLVE(glXSwapBuffers);
if (! oglXSwapBuffers) {
void *lib = dlopen("libGL.so.1", RTLD_GLOBAL | RTLD_NOLOAD);
if (! lib)
return;
RESOLVE(glXSwapBuffers);
if (! oglXSwapBuffers) {
dlclose(lib);
}
}
RESOLVE(glXGetProcAddressARB);
RESOLVE(glXGetProcAddress);
}
__attribute__((visibility("default")))
void glXSwapBuffers(Display * dpy, GLXDrawable draw) {
if (!oglXSwapBuffers) {
resolveOpenGL();
}
GLXContext ctx = glXGetCurrentContext();
Context *c = contexts;
while (c) {
if ((c->dpy == dpy) && (c->draw == draw))
break;
c = c->next;
}
if (!c) {
ods("Current context is: %p", ctx);
c = (Context *) malloc(sizeof(Context));
if (!c) {
ods("malloc failure");
return;
}
memset(c, 0, sizeof(Context));
c->next = contexts;
c->dpy = dpy;
c->draw = draw;
c->bGlx = false;
c->bValid = false;
int major, minor;
if (glXQueryVersion(dpy, &major, &minor)) {
ods("GLX version %d.%d", major, minor);
c->bValid = true;
if ((major > 1) || (major==1 && minor >= 3)) {
c->bGlx = true;
}
}
contexts = c;
newContext(c);
}
if (c->bValid) {
GLuint width, height;
if (c->bGlx) {
glXQueryDrawable(dpy, draw, GLX_WIDTH, (unsigned int *) &width);
glXQueryDrawable(dpy, draw, GLX_HEIGHT, (unsigned int *) &height);
} else {
GLint viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
width = viewport[2];
height = viewport[3];
}
drawContext(c, width, height);
}
oglXSwapBuffers(dpy, draw);
}
#define FGRAB(x) if (strcmp((const char *)(func), #x)==0) return (__GLXextFuncPtr)(x);
__attribute__((visibility("default")))
void (*glXGetProcAddress(const GLubyte * func))(void) {
FGRAB(glXSwapBuffers);
FGRAB(glXGetProcAddressARB);
FGRAB(glXGetProcAddress);
if (!oglXGetProcAddressARB && !oglXGetProcAddress) {
resolveOpenGL();
}
if (oglXGetProcAddress)
return oglXGetProcAddress(func);
else if (oglXGetProcAddressARB)
return oglXGetProcAddressARB(func);
else
return (__GLXextFuncPtr)(odlsym(RTLD_NEXT, (const char *)(func)));
}
__attribute__((visibility("default")))
__GLXextFuncPtr glXGetProcAddressARB(const GLubyte * func) {
return (void (*)(void)) glXGetProcAddress(func);
}
#define OGRAB(name) if (handle == RTLD_DEFAULT) handle = RTLD_NEXT; symbol = odlsym(handle, #name); if (symbol) { o##name = (__typeof__(&name)) symbol; symbol = (void *) name;}
__attribute__((visibility("default")))
void *dlsym(void *handle, const char *name) {
if (!odlsym) {
initializeLibrary();
}
void *symbol;
ods("Request for symbol %s (%p:%p)", name, handle, odlsym);
if (strcmp(name, "glXSwapBuffers") == 0) {
OGRAB(glXSwapBuffers);
} else if (strcmp(name, "glXGetProcAddress") == 0) {
OGRAB(glXGetProcAddress);
} else if (strcmp(name, "glXGetProcAddressARB") == 0) {
OGRAB(glXGetProcAddressARB);
} else if (strcmp(name, "dlsym") == 0) {
return (void *) dlsym;
} else {
symbol = odlsym(handle, name);
}
return symbol;
}
__attribute__((constructor))
static void initializeLibrary() {
if (odlsym)
return;
if (getenv("MUMBLE_OVERLAY_DEBUG")) {
bDebug = true;
} else {
bDebug = false;
}
bCursorAvail = false;
ods("Mumble overlay library loaded");
void *dl = dlopen("libdl.so.2", RTLD_LAZY);
if (!dl) {
ods("Failed to open libdl.so.2");
} else {
int i;
struct link_map *lm = (struct link_map *) dl;
int nchains = 0;
ElfW(Sym) *symtab = NULL;
const char *strtab = NULL;
ElfW(Dyn) *dyn = lm->l_ld;
while (dyn->d_tag) {
switch (dyn->d_tag) {
case DT_HASH:
nchains = *(int *)(dyn->d_un.d_ptr + 4);
break;
case DT_STRTAB:
strtab = (const char *) dyn->d_un.d_ptr;
break;
case DT_SYMTAB:
symtab = (ElfW(Sym) *) dyn->d_un.d_ptr;
break;
}
dyn ++;
}
ods("Iterating dlsym table %p %p %d", symtab, strtab, nchains);
for (i=0;i<nchains;++i) {
// ELF32_ST_TYPE and ELF64_ST_TYPE are the same
if (ELF32_ST_TYPE(symtab[i].st_info) != STT_FUNC)
continue;
if (strcmp(strtab+symtab[i].st_name, "dlsym") == 0)
odlsym = (void*)lm->l_addr + symtab[i].st_value;
}
ods("Original dlsym at %p", odlsym);
}
}

279
overlay_gl/overlay.c
View file

@ -1,4 +1,5 @@
/* Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
Copyright (C) 2008-2015, Mikkel Krautz <mikkel@krautz.dk>
All rights reserved.
@ -31,11 +32,7 @@
#define GLX_GLXEXT_LEGACY
#define GL_GLEXT_PROTOTYPES
#define _GNU_SOURCE
#include <GL/glx.h>
#include <GL/gl.h>
#include <GL/glext.h>
#include <dlfcn.h>
#include <link.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
@ -56,21 +53,45 @@
#include <errno.h>
#include <time.h>
#if defined(TARGET_UNIX)
# define GLX_GLXEXT_LEGACY
# define GL_GLEXT_PROTOTYPES
# define _GNU_SOURCE
# include <GL/glx.h>
# include <GL/gl.h>
# include <GL/glext.h>
#include <link.h>
typedef unsigned char bool;
#define true 1
#define false 0
# define true 1
# define false 0
#elif defined(TARGET_MAC)
# include <OpenGL/OpenGL.h>
# include <Carbon/Carbon.h>
# include <Cocoa/Cocoa.h>
# include <AGL/AGL.h>
#
# include <objc/objc-runtime.h>
#
# include "avail_mac.h"
#endif
#include "../overlay/overlay.h"
// Prototypes
static void ods(const char *format, ...);
static bool bDebug;
static bool bDebug = false;
static bool bCursorAvail = false;
typedef struct _Context {
struct _Context *next;
#if defined(TARGET_UNIX)
Display *dpy;
GLXDrawable draw;
#elif defined(TARGET_MAC)
CGLContextObj cglctx;
NSOpenGLContext *nsctx;
#endif
unsigned int uiWidth, uiHeight;
unsigned int uiLeft, uiRight, uiTop, uiBottom;
@ -114,36 +135,23 @@ const GLfloat fBorder[] = {0.125f, 0.250f, 0.5f, 0.75f};
static Context *contexts = NULL;
#define AVAIL(name) dlsym(RTLD_DEFAULT,#name)
#define FDEF(name) static __typeof__(&name) o##name = NULL
FDEF(dlsym);
FDEF(glXSwapBuffers);
FDEF(glXGetProcAddressARB);
FDEF(glXGetProcAddress);
#define RESOLVE(x) if (! o##x) o##x = (__typeof__(&x)) odlsym(RTLD_NEXT, #x)
static void resolveOpenGL() {
RESOLVE(glXSwapBuffers);
if (! oglXSwapBuffers) {
void *lib = dlopen("libGL.so.1", RTLD_GLOBAL | RTLD_NOLOAD);
if (! lib)
return;
RESOLVE(glXSwapBuffers);
if (! oglXSwapBuffers) {
dlclose(lib);
}
}
RESOLVE(glXGetProcAddressARB);
RESOLVE(glXGetProcAddress);
}
#if defined(TARGET_UNIX)
FDEF(dlsym);
FDEF(glXSwapBuffers);
FDEF(glXGetProcAddressARB);
FDEF(glXGetProcAddress);
#elif defined(TARGET_MAC)
FDEF(CGLFlushDrawable);
FDEF(CGDisplayHideCursor);
FDEF(CGDisplayShowCursor);
#endif
__attribute__((format(printf, 1, 2)))
static void ods(const char *format, ...) {
if (!bDebug) {
if (! bDebug) {
return;
}
@ -160,7 +168,7 @@ static void ods(const char *format, ...) {
static void newContext(Context * ctx) {
ctx->iSocket = -1;
ctx->omMsg.omh.iLength = -1;
ctx->texture = ~0;
ctx->texture = ~0U;
ctx->timeT = clock();
ctx->frameCount = 0;
@ -200,7 +208,7 @@ static void newContext(Context * ctx) {
glLinkProgram(ctx->uiProgram);
glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &ctx->maxVertexAttribs);
ctx->vertexAttribStates = (GLboolean*)calloc(ctx->maxVertexAttribs, sizeof(GLboolean));
ctx->vertexAttribStates = calloc((size_t) ctx->maxVertexAttribs, sizeof(GLboolean));
}
static void releaseMem(Context *ctx) {
@ -211,7 +219,7 @@ static void releaseMem(Context *ctx) {
}
if (ctx->texture != ~0U) {
glDeleteTextures(1, &ctx->texture);
ctx->texture = ~0;
ctx->texture = ~0U;
}
ctx->uiLeft = ctx->uiTop = ctx->uiRight = ctx->uiBottom = 0;
}
@ -228,10 +236,11 @@ static void disconnect(Context *ctx) {
static bool sendMessage(Context *ctx, struct OverlayMsg *om) {
if (ctx->iSocket != -1) {
ssize_t wantsend = sizeof(struct OverlayMsgHeader) + om->omh.iLength;
size_t wantsend = sizeof(struct OverlayMsgHeader) + (size_t)om->omh.iLength;
ssize_t sent = send(ctx->iSocket, om, wantsend, MSG_DONTWAIT);
if (wantsend == sent)
if (sent != -1 && wantsend == (size_t)sent) {
return true;
}
ods("Short write. Disconnecting pipe.");
}
disconnect(ctx);
@ -273,6 +282,17 @@ static void drawOverlay(Context *ctx, unsigned int width, unsigned int height) {
return;
}
ods("Socket connected");
struct OverlayMsg om;
om.omh.uiMagic = OVERLAY_MAGIC_NUMBER;
om.omh.uiType = OVERLAY_MSGTYPE_PID;
om.omh.iLength = sizeof(struct OverlayMsgPid);
om.omp.pid = getpid();
if (!sendMessage(ctx, &om))
return;
ods("SentPid");
}
// if overlay size (width or height) is not up-to-date create and send an overlay initialization message
@ -402,6 +422,20 @@ static void drawOverlay(Context *ctx, unsigned int width, unsigned int height) {
ctx->uiBottom = oma->y + oma->h;
}
break;
case OVERLAY_MSGTYPE_INTERACTIVE: {
#if defined(TARGET_MAC)
struct OverlayMsgInteractive *omin = & ctx->omMsg.omin;
ods("Interactive %d", omin->state);
if (bCursorAvail) {
if (omin->state) {
oCGDisplayHideCursor(kCGNullDirectDisplay);
} else {
oCGDisplayShowCursor(kCGNullDirectDisplay);
}
}
#endif
}
break;
default:
break;
}
@ -413,7 +447,7 @@ static void drawOverlay(Context *ctx, unsigned int width, unsigned int height) {
// texture checks, that our gltexture is still valid and sane
if (! glIsTexture(ctx->texture)) {
ctx->texture = ~0;
ctx->texture = ~0U;
ods("Lost texture");
regenTexture(ctx);
} else {
@ -640,161 +674,8 @@ static void drawContext(Context * ctx, int width, int height) {
while (glGetError() != GL_NO_ERROR);
}
__attribute__((visibility("default")))
void glXSwapBuffers(Display * dpy, GLXDrawable draw) {
if (!oglXSwapBuffers) {
resolveOpenGL();
}
GLXContext ctx = glXGetCurrentContext();
Context *c = contexts;
while (c) {
if ((c->dpy == dpy) && (c->draw == draw))
break;
c = c->next;
}
if (!c) {
ods("Current context is: %p", ctx);
c = (Context *) malloc(sizeof(Context));
if (!c) {
ods("malloc failure");
return;
}
memset(c, 0, sizeof(Context));
c->next = contexts;
c->dpy = dpy;
c->draw = draw;
c->bGlx = false;
c->bValid = false;
int major, minor;
if (glXQueryVersion(dpy, &major, &minor)) {
ods("GLX version %d.%d", major, minor);
c->bValid = true;
if ((major > 1) || (major==1 && minor >= 3)) {
c->bGlx = true;
}
}
contexts = c;
newContext(c);
}
if (c->bValid) {
GLuint width, height;
if (c->bGlx) {
glXQueryDrawable(dpy, draw, GLX_WIDTH, (unsigned int *) &width);
glXQueryDrawable(dpy, draw, GLX_HEIGHT, (unsigned int *) &height);
} else {
GLint viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
width = viewport[2];
height = viewport[3];
}
drawContext(c, width, height);
}
oglXSwapBuffers(dpy, draw);
}
#define FGRAB(x) if (strcmp((const char *)(func), #x)==0) return (__GLXextFuncPtr)(x);
__attribute__((visibility("default")))
void (*glXGetProcAddress(const GLubyte * func))(void) {
FGRAB(glXSwapBuffers);
FGRAB(glXGetProcAddressARB);
FGRAB(glXGetProcAddress);
if (!oglXGetProcAddressARB && !oglXGetProcAddress) {
resolveOpenGL();
}
if (oglXGetProcAddress)
return oglXGetProcAddress(func);
else if (oglXGetProcAddressARB)
return oglXGetProcAddressARB(func);
else
return (__GLXextFuncPtr)(odlsym(RTLD_NEXT, (const char *)(func)));
}
__attribute__((visibility("default")))
__GLXextFuncPtr glXGetProcAddressARB(const GLubyte * func) {
return (void (*)(void)) glXGetProcAddress(func);
}
__attribute__((constructor))
static void initializeLibrary() {
if (odlsym)
return;
if (getenv("MUMBLE_OVERLAY_DEBUG")) {
bDebug = true;
} else {
bDebug = false;
}
ods("Mumble overlay library loaded");
void *dl = dlopen("libdl.so.2", RTLD_LAZY);
if (!dl) {
ods("Failed to open libdl.so.2");
} else {
int i;
struct link_map *lm = (struct link_map *) dl;
int nchains = 0;
ElfW(Sym) *symtab = NULL;
const char *strtab = NULL;
ElfW(Dyn) *dyn = lm->l_ld;
while (dyn->d_tag) {
switch (dyn->d_tag) {
case DT_HASH:
nchains = *(int *)(dyn->d_un.d_ptr + 4);
break;
case DT_STRTAB:
strtab = (const char *) dyn->d_un.d_ptr;
break;
case DT_SYMTAB:
symtab = (ElfW(Sym) *) dyn->d_un.d_ptr;
break;
}
dyn ++;
}
ods("Iterating dlsym table %p %p %d", symtab, strtab, nchains);
for (i=0;i<nchains;++i) {
// ELF32_ST_TYPE and ELF64_ST_TYPE are the same
if (ELF32_ST_TYPE(symtab[i].st_info) != STT_FUNC)
continue;
if (strcmp(strtab+symtab[i].st_name, "dlsym") == 0)
odlsym = (void*)lm->l_addr + symtab[i].st_value;
}
ods("Original dlsym at %p", odlsym);
}
}
#define OGRAB(name) if (handle == RTLD_DEFAULT) handle = RTLD_NEXT; symbol = odlsym(handle, #name); if (symbol) { o##name = (__typeof__(&name)) symbol; symbol = (void *) name;}
__attribute__((visibility("default")))
void *dlsym(void *handle, const char *name) {
if (!odlsym) {
initializeLibrary();
}
void *symbol;
ods("Request for symbol %s (%p:%p)", name, handle, odlsym);
if (strcmp(name, "glXSwapBuffers") == 0) {
OGRAB(glXSwapBuffers);
} else if (strcmp(name, "glXGetProcAddress") == 0) {
OGRAB(glXGetProcAddress);
} else if (strcmp(name, "glXGetProcAddressARB") == 0) {
OGRAB(glXGetProcAddressARB);
} else if (strcmp(name, "dlsym") == 0) {
return (void *) dlsym;
} else {
symbol = odlsym(handle, name);
}
return symbol;
}
#if defined(TARGET_UNIX)
# include "init_unix.c"
#elif defined(TARGET_MAC)
# include "init_mac.c"
#endif

0
macx/overlay/overlay.plist → overlay_gl/overlay_gl.plist
View file

62
overlay_gl/overlay_gl.pro
View file

@ -1,26 +1,60 @@
# Simple project file to build overlay with same compilers
# as Qt used.
# Overlay payload for Unix-like systems and OS X.
include(../compiler.pri)
TEMPLATE = lib
CONFIG -= qt
CONFIG -= qt gui
CONFIG *= debug_and_release
TARGET = mumble$(TARGET_ADD)
VERSION = 1.3.0
SOURCES = overlay.c
LIBS *= -lrt -ldl
QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
QMAKE_LFLAGS -= -Wl,--no-undefined
QMAKE_LFLAGS *= $(LFLAGS_ADD)
equals(QMAKE_LINK,g++) {
message(Overriding linker)
QMAKE_LINK = gcc
QMAKE_LINK_SHLIB = gcc
CONFIG(static) {
CONFIG -= static
}
unix:!macx {
TARGET = mumble$(TARGET_ADD)
DEFINES += TARGET_UNIX
LIBS *= -lrt -ldl
QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
QMAKE_LFLAGS -= -Wl,--no-undefined
QMAKE_LFLAGS *= $(LFLAGS_ADD)
equals(QMAKE_LINK,g++) {
message(Overriding linker)
QMAKE_LINK = gcc
QMAKE_LINK_SHLIB = gcc
}
}
macx {
CONFIG *= x86_64 x86 plugin
CONFIG(universal) {
CONFIG *= ppc
}
TARGET = mumbleoverlay$(TARGET_ADD)
DEFINES += TARGET_MAC
QMAKE_CFLAGS *= -x objective-c
QMAKE_CFLAGS *= $(CFLAGS_ADD)
QMAKE_LFLAGS_PLUGIN *= -undefined dynamic_lookup -dynamic
QMAKE_LFLAGS += -framework CoreFoundation
QMAKE_LFLAGS += $(LFLAGS_ADD)
QMAKE_INFO_PLIST = overlay_gl.plist
INCLUDEPATH *= ../3rdparty/mach-override-src
LIBS *= -lmach-override
}
CONFIG(debug, debug|release) {
DESTDIR = ../debug$(DESTDIR_ADD)
QMAKE_LIBDIR *= ../debug$(DESTDIR_ADD)
DESTDIR = ../debug$(DESTDIR_ADD)
}
CONFIG(release, debug|release) {
DESTDIR = ../release$(DESTDIR_ADD)
QMAKE_LIBDIR *= ../release$(DESTDIR_ADD)
DESTDIR = ../release$(DESTDIR_ADD)
}
include(../symbols.pri)