enlightenment
/
expedite
2
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

* expedite: Massive cleanup.

Browse Source 
SVN revision: 46439
expedite-1.1
Cedric BAIL 13 years ago
parent 72fb4bcb67
commit ec23bf6a0f
36 changed files with 318 additions and 556 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      src/bin/engine_direct3d.cpp
  2. 2
      src/bin/engine_direct3d.h
  3. 25
      src/bin/engine_directfb.c
  4. 2
      src/bin/engine_directfb.h
  5. 21
      src/bin/engine_fb.c
  6. 2
      src/bin/engine_fb.h
  7. 25
      src/bin/engine_gl_glew.c
  8. 2
      src/bin/engine_gl_glew.h
  9. 20
      src/bin/engine_gl_sdl.c
  10. 2
      src/bin/engine_gl_sdl.h
  11. 27
      src/bin/engine_gl_x11.c
  12. 2
      src/bin/engine_gl_x11.h
  13. 2
      src/bin/engine_quartz.h
  14. 29
      src/bin/engine_quartz.m
  15. 27
      src/bin/engine_software_16_ddraw.cpp
  16. 2
      src/bin/engine_software_16_ddraw.h
  17. 33
      src/bin/engine_software_16_wince.c
  18. 2
      src/bin/engine_software_16_wince.h
  19. 27
      src/bin/engine_software_16_x11.c
  20. 2
      src/bin/engine_software_16_x11.h
  21. 19
      src/bin/engine_software_ddraw.cpp
  22. 3
      src/bin/engine_software_ddraw.h
  23. 25
      src/bin/engine_software_gdi.c
  24. 3
      src/bin/engine_software_gdi.h
  25. 23
      src/bin/engine_software_sdl.c
  26. 2
      src/bin/engine_software_sdl.h
  27. 31
      src/bin/engine_software_xcb.c
  28. 2
      src/bin/engine_software_xcb.h
  29. 27
      src/bin/engine_software_xlib.c
  30. 2
      src/bin/engine_software_xlib.h
  31. 27
      src/bin/engine_xrender_x11.c
  32. 2
      src/bin/engine_xrender_x11.h
  33. 35
      src/bin/engine_xrender_xcb.c
  34. 2
      src/bin/engine_xrender_xcb.h
  35. 374
      src/bin/main.c
  36. 18
      src/bin/main.h

25
src/bin/engine_direct3d.cpp
Unescape View File

@ -171,8 +171,8 @@ MainWndProc(HWND hwnd,
}
}
int
engine_direct3d_args(int argc, char **argv)
Eina_Bool
engine_direct3d_args(const char *engine, int width, int height)
{
WNDCLASS wc;
RECT rect;
@ -182,20 +182,9 @@ engine_direct3d_args(int argc, char **argv)
DWORD style;
int depth;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "direct3d")) ok = 1;
}
}
if (!ok) return 0;
instance = GetModuleHandle(NULL);
if (!instance) return 0;
if (!instance) return EINA_FALSE;
wc.style = 0;
wc.lpfnWndProc = MainWndProc;
@ -213,8 +202,8 @@ engine_direct3d_args(int argc, char **argv)
rect.left = 0;
rect.top = 0;
rect.right = win_w;
rect.bottom = win_h;
rect.right = width;
rect.bottom = height;
AdjustWindowRect (&rect, WS_OVERLAPPEDWINDOW | WS_SIZEBOX, FALSE);
window = CreateWindowEx(0,
@ -261,7 +250,7 @@ engine_direct3d_args(int argc, char **argv)
ShowWindow(window, SW_SHOWDEFAULT);
UpdateWindow(window);
return 1;
return EINA_TRUE;
destroy_window:
DestroyWindow(window);
@ -270,7 +259,7 @@ engine_direct3d_args(int argc, char **argv)
free_library:
FreeLibrary(instance);
return 0;
return EINA_FALSE;
}
void

2
src/bin/engine_direct3d.h
Unescape View File

@ -7,7 +7,7 @@ extern "C" {
#endif
int engine_direct3d_args(int argc, char **argv);
Eina_Bool engine_direct3d_args(const char *engine, int width, int height);
void engine_direct3d_loop(void);
void engine_direct3d_shutdown(void);

25
src/bin/engine_directfb.c
Unescape View File

@ -22,30 +22,19 @@ static IDirectFBSurface *_dfb_surface;
} \
}
int
engine_directfb_args(int argc, char **argv)
Eina_Bool
engine_directfb_args(const char *engine, int width, int height)
{
Evas_Engine_Info_DirectFB *einfo;
DFBWindowDescription desc;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "directfb")) ok = 1;
}
}
if (!ok) return 0;
evas_output_method_set(evas, evas_render_method_lookup("directfb"));
einfo = (Evas_Engine_Info_DirectFB *)evas_engine_info_get(evas);
if (!einfo)
{
printf("Evas does not support the DirectFB Engine\n");
return 0;
return EINA_FALSE;
}
DFBCHECK(DirectFBInit(NULL, NULL));
@ -58,8 +47,8 @@ engine_directfb_args(int argc, char **argv)
desc.flags = (DWDESC_POSX | DWDESC_POSY | DWDESC_WIDTH | DWDESC_HEIGHT | DWDESC_PIXELFORMAT);
desc.posx = 0;
desc.posy = 0;
desc.width = win_w;
desc.height = win_h;
desc.width = width;
desc.height = height;
desc.pixelformat = DSPF_ARGB;
DFBCHECK(_layer->CreateWindow(_layer, &desc, &_dfb_window));
@ -74,10 +63,10 @@ engine_directfb_args(int argc, char **argv)
if (!evas_engine_info_set(evas, (Evas_Engine_Info *) einfo))
{
printf("Evas can not setup the informations of the DirectFB Engine\n");
return 0;
return EINA_FALSE;
}
return 1;
return EINA_TRUE;
}
static void

2
src/bin/engine_directfb.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef ENGINE_DIRECTFB_H
#define ENGINE_DIRECTFB_H
int engine_directfb_args(int argc, char **argv);
Eina_Bool engine_directfb_args(const char *engine, int width, int height);
void engine_directfb_loop(void);
void engine_directfb_shutdown(void);

21
src/bin/engine_fb.c
Unescape View File

@ -2,29 +2,18 @@
#include <Evas_Engine_FB.h>
int
engine_fb_args(int argc, char **argv)
Eina_Bool
engine_fb_args(const char *engine, int width, int height)
{
Evas_Engine_Info_FB *einfo;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "fb")) ok = 1;
}
}
if (!ok) return 0;
evas_output_method_set(evas, evas_render_method_lookup("fb"));
einfo = (Evas_Engine_Info_FB *)evas_engine_info_get(evas);
if (!einfo)
{
printf("Evas does not support the FB Engine\n");
return 0;
return EINA_FALSE;
}
einfo->info.virtual_terminal = 0;
@ -35,10 +24,10 @@ engine_fb_args(int argc, char **argv)
if (!evas_engine_info_set(evas, (Evas_Engine_Info *) einfo))
{
printf("Evas can not setup the informations of the FB Engine\n");
return 0;
return EINA_FALSE;
}
return 1;
return EINA_TRUE;
}
void

2
src/bin/engine_fb.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef ENGINE_FB_H
#define ENGINE_FB_H
int engine_fb_args(int argc, char **argv);
Eina_Bool engine_fb_args(const char *engine, int width, int height);
void engine_fb_loop(void);
void engine_fb_shutdown(void);

25
src/bin/engine_gl_glew.c
Unescape View File

@ -172,8 +172,8 @@ MainWndProc(HWND hwnd,
}
}
int
engine_gl_glew_args(int argc, char **argv)
Eina_Bool
engine_gl_glew_args(const char *engine, int width, int height)
{
WNDCLASS wc;
RECT rect;
@ -182,20 +182,9 @@ engine_gl_glew_args(int argc, char **argv)
DWORD style;
int depth;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "gl-glew")) ok = 1;
}
}
if (!ok) return 0;
instance = GetModuleHandle(NULL);
if (!instance) return 0;
if (!instance) return EINA_FALSE;
wc.style = 0;
wc.lpfnWndProc = MainWndProc;
@ -213,8 +202,8 @@ engine_gl_glew_args(int argc, char **argv)
rect.left = 0;
rect.top = 0;
rect.right = win_w;
rect.bottom = win_h;
rect.right = width;
rect.bottom = height;
AdjustWindowRect (&rect, WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW | WS_SIZEBOX, FALSE);
window = CreateWindowEx(0,
@ -260,7 +249,7 @@ engine_gl_glew_args(int argc, char **argv)
ShowWindow(window, SW_SHOWDEFAULT);
UpdateWindow(window);
return 1;
return EINA_TRUE;
destroy_window:
DestroyWindow(window);
@ -269,7 +258,7 @@ engine_gl_glew_args(int argc, char **argv)
free_library:
FreeLibrary(instance);
return 0;
return EINA_FALSE;
}
void

2
src/bin/engine_gl_glew.h
Unescape View File

@ -2,7 +2,7 @@
#define __ENGINE_GL_GLEW_H__
int engine_gl_glew_args(int argc, char **argv);
Eina_Bool engine_gl_glew_args(const char *engine, int width, int height);
void engine_gl_glew_loop(void);
void engine_gl_glew_shutdown(void);

20
src/bin/engine_gl_sdl.c
Unescape View File

@ -3,24 +3,12 @@
#include <Evas_Engine_GL_SDL.h>
int
engine_gl_sdl_args(int argc, char **argv)
Eina_Bool
engine_gl_sdl_args(const char *engine, int width, int height)
{
Evas_Engine_Info_GL_SDL *einfo;
int i;
int ok = 0;
for (i = 1; i < argc; ++i)
{
if ((!strcmp(argv[i], "-e") && (i < (argc - 1))))
{
i++;
if (!strcmp(argv[i], "gl-sdl")) ok = 1;
}
}
if (!ok) return 0;
if (ok == 1)
evas_output_method_set(evas, evas_render_method_lookup("gl_sdl"));
einfo = (Evas_Engine_Info_GL_SDL *) evas_engine_info_get(evas);
@ -32,10 +20,10 @@ engine_gl_sdl_args(int argc, char **argv)
if (!evas_engine_info_set(evas, (Evas_Engine_Info *) einfo))
{
printf("Evas could not initialize the GL SDL Engine\n");
return 0;
return EINA_FALSE;
}
return 1;
return EINA_TRUE;
}
void

2
src/bin/engine_gl_sdl.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef ENGINE_GL_SDL_H
#define ENGINE_GL_SDL_H
int engine_gl_sdl_args(int argc, char **argv);
Eina_Bool engine_gl_sdl_args(const char *engine, int width, int height);
void engine_gl_sdl_loop(void);
void engine_gl_sdl_shutdown(void);

27
src/bin/engine_gl_x11.c
Unescape View File

@ -8,28 +8,17 @@ static Display *disp = NULL;
static Window win = 0;
static int first_expose = 0;
int
engine_gl_x11_args(int argc, char **argv)
Eina_Bool
engine_gl_x11_args(const char *engine, int width, int height)
{
XSetWindowAttributes attr;
XClassHint chint;
XSizeHints szhints;
Evas_Engine_Info_GL_X11 *einfo;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "gl")) ok = 1;
}
}
if (!ok) return 0;
disp = XOpenDisplay(NULL);
if (!disp) return 0;
if (!disp) return EINA_FALSE;
evas_output_method_set(evas, evas_render_method_lookup("gl_x11"));
einfo = (Evas_Engine_Info_GL_X11 *)evas_engine_info_get(evas);
@ -54,7 +43,7 @@ engine_gl_x11_args(int argc, char **argv)
KeyPressMask | KeyReleaseMask;
attr.bit_gravity = ForgetGravity;
win = XCreateWindow(disp, DefaultRootWindow(disp),
0, 0, win_w, win_h, 0,
0, 0, width, height, 0,
einfo->info.depth, InputOutput,
einfo->info.visual,
CWBackingStore | CWColormap |
@ -76,21 +65,21 @@ engine_gl_x11_args(int argc, char **argv)
chint.res_class = "Expedite";
XSetClassHint(disp, win, &chint);
szhints.flags = PMinSize | PMaxSize | PSize | USSize;
szhints.min_width = szhints.max_width = win_w;
szhints.min_height = szhints.max_height = win_h;
szhints.min_width = szhints.max_width = width;
szhints.min_height = szhints.max_height = height;
XSetWMNormalHints(disp, win, &szhints);
XMapWindow(disp, win);
XSync(disp, False);
while (!first_expose)
engine_gl_x11_loop();
return 1;
return EINA_TRUE;
destroy_window:
XDestroyWindow(disp, win);
close_display:
XCloseDisplay(disp);
return 0;
return EINA_FALSE;
}
void

2
src/bin/engine_gl_x11.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef ENGINE_GL_X11_H
#define ENGINE_GL_X11_H
int engine_gl_x11_args(int argc, char **argv);
Eina_Bool engine_gl_x11_args(const char *engine, int width, int height);
void engine_gl_x11_loop(void);
void engine_gl_x11_shutdown(void);

2
src/bin/engine_quartz.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef ENGINE_QUARTZ_H
#define ENGINE_QUARTZ_H
int engine_quartz_args(int argc, char **argv);
Eina_Bool engine_quartz_args(const char *engine, int width, int height);
void engine_quartz_loop(void);
void engine_quartz_shutdown(void);

29
src/bin/engine_quartz.m
Unescape View File

@ -46,29 +46,18 @@ static NSWindow * main_window;
@end
int
engine_quartz_args(int argc, char **argv)
Eina_Bool
engine_quartz_args(const char *engine, int width, int height)
{
Evas_Engine_Info_Quartz *einfo;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "quartz")) ok = 1;
}
}
if (!ok) return 0;
evas_output_method_set(evas, evas_render_method_lookup("quartz"));
einfo = (Evas_Engine_Info_Quartz *)evas_engine_info_get(evas);
if (!einfo)
{
printf("Evas does not support the Quartz Engine\n");
return 0;
return EINA_FALSE;
}
// Set up the Cocoa runtime
@ -83,30 +72,30 @@ engine_quartz_args(int argc, char **argv)
[NSApp finishLaunching];
// Create our main window, and embed an EvasView in it
main_window = [[NSWindow alloc] initWithContentRect:NSMakeRect(20,500,win_w,win_h) styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask) backing:NSBackingStoreBuffered defer:NO screen:nil];
main_window = [[NSWindow alloc] initWithContentRect:NSMakeRect(20,500,width,height) styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask) backing:NSBackingStoreBuffered defer:NO screen:nil];
[main_window makeKeyAndOrderFront:NSApp];
[main_window setTitle:@"Expedite"];
[main_window makeMainWindow];
[main_window setAcceptsMouseMovedEvents:YES];
[NSApp activateIgnoringOtherApps:YES];
evas_view = [[EvasView alloc] initWithFrame:NSMakeRect(0,0,win_w,win_h)];
evas_view = [[EvasView alloc] initWithFrame:NSMakeRect(0,0,width,height)];
[[main_window contentView] addSubview:evas_view];
// drawRect: must be run at least once, to make sure we've set ctx
[evas_view display];
evas_output_size_set(evas, win_w, win_h);
evas_output_viewport_set(evas, 0, 0, win_w, win_h);
evas_output_size_set(evas, width, height);
evas_output_viewport_set(evas, 0, 0, width, height);
einfo->info.context = [evas_view context];
if (!evas_engine_info_set(evas, (Evas_Engine_Info *) einfo))
{
printf("Evas can not setup the informations of the Quartz Engine\n");
exit(-1);
return EINA_FALSE;
}
return 1;
return EINA_TRUE;
}
void

27
src/bin/engine_software_16_ddraw.cpp
Unescape View File

@ -263,8 +263,8 @@ MainWndProc(HWND hwnd,
}
}
int
engine_software_16_ddraw_args(int argc, char **argv)
Eina_Bool
engine_software_16_ddraw_args(const char *engine, int width, int height)
{
WNDCLASS wc;
RECT rect;
@ -277,20 +277,9 @@ engine_software_16_ddraw_args(int argc, char **argv)
DWORD exstyle;
int depth;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "ddraw-16")) ok = 1;
}
}
if (!ok) return 0;
instance = GetModuleHandle(NULL);
if (!instance) return 0;
if (!instance) return EINA_FALSE;
wc.style = CS_HREDRAW | CS_VREDRAW;
wc.lpfnWndProc = MainWndProc;
@ -311,8 +300,8 @@ engine_software_16_ddraw_args(int argc, char **argv)
rect.left = 0;
rect.top = 0;
rect.right = win_w;
rect.bottom = win_h;
rect.right = width;
rect.bottom = height;
AdjustWindowRectEx(&rect, style, FALSE, exstyle);
window = CreateWindowEx(exstyle,
@ -331,7 +320,7 @@ engine_software_16_ddraw_args(int argc, char **argv)
if (!SetWindowLong(window, GWL_STYLE, style))
goto unregister_class;
if (!_directdraw_init(window, win_w, win_h,
if (!_directdraw_init(window, width, height,
&object,
&surface_primary,
&surface_back,
@ -365,7 +354,7 @@ engine_software_16_ddraw_args(int argc, char **argv)
ShowWindow(window, SW_SHOWDEFAULT);
UpdateWindow(window);
return 1;
return EINA_TRUE;
destroy_window:
DestroyWindow(window);
@ -374,7 +363,7 @@ engine_software_16_ddraw_args(int argc, char **argv)
free_library:
FreeLibrary(instance);
return 0;
return EINA_FALSE;
}
void

2
src/bin/engine_software_16_ddraw.h
Unescape View File

@ -7,7 +7,7 @@ extern "C" {
#endif
int engine_software_16_ddraw_args(int argc, char **argv);
Eina_Bool engine_software_16_ddraw_args(const char *engine, int width, int height);
void engine_software_16_ddraw_loop(void);
void engine_software_16_ddraw_shutdown(void);

33
src/bin/engine_software_16_wince.c
Unescape View File

@ -166,8 +166,8 @@ MainWndProc(HWND hwnd,
}
}
int
engine_software_16_wince_args(int argc, char **argv)
Eina_Bool
engine_software_16_wince_args(const char *engine, int width, int height)
{
WNDCLASS wc;
RECT rect;
@ -185,22 +185,15 @@ engine_software_16_wince_args(int argc, char **argv)
int ok = 0;
int i;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "wince")) ok = 1;
if (!strcmp(argv[i], "wince-fb")) { ok = 1; backend = 1; }
if (!strcmp(argv[i], "wince-gapi")) { ok = 1; backend = 2; }
if (!strcmp(argv[i], "wince-ddraw")) { ok = 1; backend = 3; }
if (!strcmp(argv[i], "wince-gdi")) { ok = 1; backend = 4; }
}
}
if (!ok) return 0;
if (!strcmp(engine, "wince")) ok = 1;
if (!strcmp(engine, "wince-fb")) { ok = 1; backend = 1; }
if (!strcmp(engine, "wince-gapi")) { ok = 1; backend = 2; }
if (!strcmp(engine, "wince-ddraw")) { ok = 1; backend = 3; }
if (!strcmp(engine, "wince-gdi")) { ok = 1; backend = 4; }
if (!ok) return EINA_FALSE;
instance = GetModuleHandle(NULL);
if (!instance) return 0;
if (!instance) return EINA_FALSE;
memset (&wc, 0, sizeof (wc));
wc.style = CS_HREDRAW | CS_VREDRAW;
@ -256,8 +249,8 @@ engine_software_16_wince_args(int argc, char **argv)
}
einfo->info.window = window;
einfo->info.width = win_w;
einfo->info.height = win_h;
einfo->info.width = width;
einfo->info.height = height;
einfo->info.backend = backend;
einfo->info.rotation = 0;
if (!evas_engine_info_set(evas, (Evas_Engine_Info *) einfo))
@ -273,7 +266,7 @@ engine_software_16_wince_args(int argc, char **argv)
ShowWindow(window, SW_SHOWDEFAULT);
UpdateWindow(window);
return 1;
return EINA_TRUE;
destroy_window:
DestroyWindow(window);
@ -288,7 +281,7 @@ engine_software_16_wince_args(int argc, char **argv)
free_library:
FreeLibrary(instance);
return 0;
return EINA_FALSE;
}
void

2
src/bin/engine_software_16_wince.h
Unescape View File

@ -2,7 +2,7 @@
#define __ENGINE_SOFTWARE_16_WINCE_H__
int engine_software_16_wince_args(int argc, char **argv);
Eina_Bool engine_software_16_wince_args(const char *engine, int width, int height);
void engine_software_16_wince_loop(void);
void engine_software_16_wince_shutdown(void);

27
src/bin/engine_software_16_x11.c
Unescape View File

@ -8,28 +8,17 @@ static Display *disp = NULL;
static Window win = 0;
static int first_expose = 0;
int
engine_software_16_x11_args(int argc, char **argv)
Eina_Bool
engine_software_16_x11_args(const char *engine, int width, int height)
{
XSetWindowAttributes attr;
XClassHint chint;
XSizeHints szhints;
Evas_Engine_Info_Software_16_X11 *einfo;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "x11-16")) ok = 1;
}
}
if (!ok) return 0;
disp = XOpenDisplay(NULL);
if (!disp) return 0;
if (!disp) return EINA_FALSE;
evas_output_method_set(evas, evas_render_method_lookup("software_16_x11"));
einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(evas);
@ -50,7 +39,7 @@ engine_software_16_x11_args(int argc, char **argv)
KeyPressMask | KeyReleaseMask;
attr.bit_gravity = ForgetGravity;
win = XCreateWindow(disp, DefaultRootWindow(disp),
0, 0, win_w, win_h, 0,
0, 0, width, height, 0,
DefaultDepth(disp, DefaultScreen(disp)), InputOutput,
DefaultVisual(disp, DefaultScreen(disp)),
CWBackingStore | CWColormap |
@ -72,21 +61,21 @@ engine_software_16_x11_args(int argc, char **argv)
chint.res_class = "Expedite";
XSetClassHint(disp, win, &chint);
szhints.flags = PMinSize | PMaxSize | PSize | USSize;
szhints.min_width = szhints.max_width = win_w;
szhints.min_height = szhints.max_height = win_h;
szhints.min_width = szhints.max_width = width;
szhints.min_height = szhints.max_height = height;
XSetWMNormalHints(disp, win, &szhints);
XMapWindow(disp, win);
XSync(disp, False);
while (!first_expose)
engine_software_16_x11_loop();
return 1;
return EINA_TRUE;
destroy_window:
XDestroyWindow(disp, win);
close_display:
XCloseDisplay(disp);
return 0;
return EINA_FALSE;
}
void

2
src/bin/engine_software_16_x11.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef ENGINE_SOFTWARE_16_X11_H
#define ENGINE_SOFTWARE_16_X11_H
int engine_software_16_x11_args(int argc, char **argv);
Eina_Bool engine_software_16_x11_args(const char *engine, int width, int height);
void engine_software_16_x11_loop(void);
void engine_software_16_x11_shutdown(void);

19
src/bin/engine_software_ddraw.cpp
Unescape View File

@ -171,8 +171,8 @@ MainWndProc(HWND hwnd,
}
}
int
engine_software_ddraw_args(int argc, char **argv)
Eina_Bool
engine_software_ddraw_args(const char *engine, int width, int height)
{
WNDCLASS wc;
RECT rect;
@ -182,17 +182,6 @@ engine_software_ddraw_args(int argc, char **argv)
DWORD exstyle;
int depth;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "ddraw")) ok = 1;
}
}
if (!ok) return 0;
instance = GetModuleHandle(NULL);
if (!instance) return 0;
@ -216,8 +205,8 @@ engine_software_ddraw_args(int argc, char **argv)
rect.left = 0;
rect.top = 0;
rect.right = win_w;
rect.bottom = win_h;
rect.right = width;
rect.bottom = height;
AdjustWindowRectEx (&rect, style, FALSE, exstyle);
window = CreateWindowEx(exstyle,

3
src/bin/engine_software_ddraw.h
Unescape View File

@ -6,8 +6,7 @@
extern "C" {
#endif
int engine_software_ddraw_args(int argc, char **argv);
Eina_Bool engine_software_ddraw_args(const char *engine, int width, int height);
void engine_software_ddraw_loop(void);
void engine_software_ddraw_shutdown(void);

25
src/bin/engine_software_gdi.c
Unescape View File

@ -171,8 +171,8 @@ MainWndProc(HWND hwnd,
}
}
int
engine_software_gdi_args(int argc, char **argv)
Eina_Bool
engine_software_gdi_args(const char *engine, int width, int height)
{
WNDCLASS wc;
RECT rect;
@ -182,20 +182,9 @@ engine_software_gdi_args(int argc, char **argv)
DWORD exstyle;
int depth;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "gdi")) ok = 1;
}
}
if (!ok) return 0;
instance = GetModuleHandle(NULL);
if (!instance) return 0;
if (!instance) return EINA_FALSE;
wc.style = CS_HREDRAW | CS_VREDRAW;
wc.lpfnWndProc = MainWndProc;
@ -216,8 +205,8 @@ engine_software_gdi_args(int argc, char **argv)
rect.left = 0;
rect.top = 0;
rect.right = win_w;
rect.bottom = win_h;
rect.right = width;
rect.bottom = height;
AdjustWindowRectEx (&rect, style, FALSE, exstyle);
window = CreateWindowEx(exstyle,
@ -266,7 +255,7 @@ engine_software_gdi_args(int argc, char **argv)
ShowWindow(window, SW_SHOWDEFAULT);
UpdateWindow(window);
return 1;
return EINA_TRUE;
destroy_window:
DestroyWindow(window);
@ -275,7 +264,7 @@ engine_software_gdi_args(int argc, char **argv)
free_library:
FreeLibrary(instance);
return 0;
return EINA_FALSE;
}
void

3
src/bin/engine_software_gdi.h
Unescape View File

@ -6,8 +6,7 @@
extern "C" {
#endif
int engine_software_gdi_args(int argc, char **argv);
Eina_Bool engine_software_gdi_args(const char *engine, int width, int height);
void engine_software_gdi_loop(void);
void engine_software_gdi_shutdown(void);

23
src/bin/engine_software_sdl.c
Unescape View File

@ -4,26 +4,19 @@
#include <SDL/SDL.h>
#include <Evas_Engine_SDL.h>
int
engine_software_sdl_args(int argc, char **argv)
Eina_Bool
engine_software_sdl_args(const char *engine, int width, int height)
{
Evas_Engine_Info_SDL *einfo;
int i;
int ok = 0;
for (i = 1; i < argc; ++i)
{
if ((!strcmp(argv[i], "-e") && (i < (argc - 1))))
{
i++;
if (!strcmp(argv[i], "sdl")) ok = 1;
if (!strcmp(argv[i], "sdl-16")) ok = 2;
}
}
if (!ok) return 0;
if (!strcmp(engine, "sdl")) ok = 1;
if (!strcmp(engine, "sdl-16")) ok = 2;
if (!ok) return EINA_FALSE;
if (ok == 1)
evas_output_method_set(evas, evas_render_method_lookup("software_sdl"));
evas_output_method_set(evas, evas_render_method_lookup("software_sdl"));
else
evas_output_method_set(evas, evas_render_method_lookup("software_16_sdl"));
@ -36,10 +29,10 @@ engine_software_sdl_args(int argc, char **argv)
if (!evas_engine_info_set(evas, (Evas_Engine_Info *) einfo))
{
printf("Evas can not setup the informations of the Software SDL Engine\n");
return 0;
return EINA_FALSE;
}
return 1;
return EINA_TRUE;
}
void

2
src/bin/engine_software_sdl.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef ENGINE_SOFTWARE_SDL_H
#define ENGINE_SOFTWARE_SDL_H
int engine_software_sdl_args(int argc, char **argv);
Eina_Bool engine_software_sdl_args(const char *engine, int width, int height);
void engine_software_sdl_loop(void);
void engine_software_sdl_shutdown(void);

31
src/bin/engine_software_xcb.c
Unescape View File

@ -38,8 +38,8 @@ static xcb_screen_t *screen = NULL;
static xcb_window_t win = 0;
static int first_expose = 0;
int
engine_software_xcb_args(int argc, char **argv)
Eina_Bool
engine_software_xcb_args(const char *engine, int width, int height)
{
struct xcb_size_hints_t hints;
uint32_t value_list[6];
@ -63,20 +63,9 @@ engine_software_xcb_args(int argc, char **argv)
int l1;
int l2;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "xcb")) ok = 1;
}
}
if (!ok) return 0;
conn = xcb_connect(NULL, &s);
if (xcb_connection_has_error(conn)) return 0;
if (xcb_connection_has_error(conn)) return EINA_FALSE;
cookie1 = xcb_intern_atom_unchecked(conn, 0, strlen("STRING"), "STRING");
cookie2 = xcb_intern_atom_unchecked(conn, 0, strlen("WM_NAME"), "WM_NAME");
@ -131,7 +120,7 @@ engine_software_xcb_args(int argc, char **argv)
goto close_connection;
xcb_create_window(conn,
einfo->info.depth,
win, screen->root, 0, 0, win_w, win_h, 0,
win, screen->root, 0, 0, width, height, 0,
XCB_WINDOW_CLASS_INPUT_OUTPUT,
((xcb_visualtype_t *)einfo->info.visual)->visual_id,
value_mask,
@ -150,10 +139,10 @@ engine_software_xcb_args(int argc, char **argv)
memset(&hints, 0, sizeof(hints));
hints.flags = XCB_SIZE_US_SIZE_HINT | XCB_SIZE_P_SIZE_HINT | XCB_SIZE_P_MIN_SIZE_HINT | XCB_SIZE_P_MAX_SIZE_HINT;
hints.min_width = win_w;
hints.max_width = win_w;
hints.min_height = win_h;
hints.max_height = win_h;
hints.min_width = width;
hints.max_width = width;
hints.min_height = height;
hints.max_height = height;
reply = xcb_intern_atom_reply(conn, cookie1, NULL);
string = reply->atom;
@ -191,7 +180,7 @@ engine_software_xcb_args(int argc, char **argv)
while (!first_expose)
engine_software_xcb_loop();
return 1;
return EINA_TRUE;
destroy_window:
xcb_destroy_window(conn, win);
@ -203,7 +192,7 @@ engine_software_xcb_args(int argc, char **argv)
free(xcb_intern_atom_reply(conn, cookie5, NULL));
xcb_disconnect(conn);
return 0;
return EINA_FALSE;
}
void

2
src/bin/engine_software_xcb.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef ENGINE_SOFTWARE_XCB_H
#define ENGINE_SOFTWARE_XCB_H
int engine_software_xcb_args(int argc, char **argv);
Eina_Bool engine_software_xcb_args(const char *engine, int width, int height);
void engine_software_xcb_loop(void);
void engine_software_xcb_shutdown(void);

27
src/bin/engine_software_xlib.c
Unescape View File

@ -8,28 +8,17 @@ static Display *disp = NULL;
static Window win = 0;
static int first_expose = 0;
int
engine_software_xlib_args(int argc, char **argv)
Eina_Bool
engine_software_xlib_args(const char *engine, int width, int height)
{
XSetWindowAttributes attr;
XClassHint chint;
XSizeHints szhints;
Evas_Engine_Info_Software_X11 *einfo;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "xlib")) ok = 1;
}
}
if (!ok) return 0;
disp = XOpenDisplay(NULL);
if (!disp) return 0;
if (!disp) return EINA_FALSE;
evas_output_method_set(evas, evas_render_method_lookup("software_x11"));
einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(evas);
@ -57,7 +46,7 @@ engine_software_xlib_args(int argc, char **argv)
KeyPressMask | KeyReleaseMask;
attr.bit_gravity = ForgetGravity;
win = XCreateWindow(disp, DefaultRootWindow(disp),
0, 0, win_w, win_h, 0,
0, 0, width, height, 0,
einfo->info.depth, InputOutput,
einfo->info.visual,
CWBackingStore | CWColormap |
@ -79,21 +68,21 @@ engine_software_xlib_args(int argc, char **argv)
chint.res_class = "Expedite";
XSetClassHint(disp, win, &chint);
szhints.flags = PMinSize | PMaxSize | PSize | USSize;
szhints.min_width = szhints.max_width = win_w;
szhints.min_height = szhints.max_height = win_h;
szhints.min_width = szhints.max_width = width;
szhints.min_height = szhints.max_height = height;
XSetWMNormalHints(disp, win, &szhints);
XMapWindow(disp, win);
XSync(disp, False);
while (!first_expose)
engine_software_xlib_loop();
return 1;
return EINA_TRUE;
destroy_window:
XDestroyWindow(disp, win);
close_display:
XCloseDisplay(disp);
return 0;
return EINA_FALSE;
}
void

2
src/bin/engine_software_xlib.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef ENGINE_SOFTWARE_XLIB_H
#define ENGINE_SOFTWARE_XLIB_H
int engine_software_xlib_args(int argc, char **argv);
Eina_Bool engine_software_xlib_args(const char *engine, int width, int height);
void engine_software_xlib_loop(void);
void engine_software_xlib_shutdown(void);

27
src/bin/engine_xrender_x11.c
Unescape View File

@ -8,28 +8,17 @@ static Display *disp = NULL;
static Window win = 0;
static int first_expose = 0;
int
engine_xrender_x11_args(int argc, char **argv)
Eina_Bool
engine_xrender_x11_args(const char *engine, int width, int height)
{
XSetWindowAttributes attr;
XClassHint chint;
XSizeHints szhints;
Evas_Engine_Info_XRender_X11 *einfo;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
{
i++;
if (!strcmp(argv[i], "xr")) ok = 1;
}
}
if (!ok) return 0;
disp = XOpenDisplay(NULL);
if (!disp) return 0;
if (!disp) return EINA_FALSE;
evas_output_method_set(evas, evas_render_method_lookup("xrender_x11"));
einfo = (Evas_Engine_Info_XRender_X11 *)evas_engine_info_get(evas);
@ -52,7 +41,7 @@ engine_xrender_x11_args(int argc, char **argv)
KeyPressMask | KeyReleaseMask;
attr.bit_gravity = ForgetGravity;
win = XCreateWindow(disp, DefaultRootWindow(disp),
0, 0, win_w, win_h, 0,
0, 0, width, height, 0,
0, InputOutput,
einfo->info.visual,
CWBackingStore |
@ -74,21 +63,21 @@ engine_xrender_x11_args(int argc, char **argv)
chint.res_class = "Expedite";
XSetClassHint(disp, win, &chint);
szhints.flags = PMinSize | PMaxSize | PSize | USSize;
szhints.min_width = szhints.max_width = win_w;
szhints.min_height = szhints.max_height = win_h;
szhints.min_width = szhints.max_width = width;
szhints.min_height = szhints.max_height = height;
XSetWMNormalHints(disp, win, &szhints);
XMapWindow(disp, win);
XSync(disp, False);
while (!first_expose)
engine_xrender_x11_loop();
return 1;
return EINA_TRUE;
destroy_window:
XDestroyWindow(disp, win);
close_display:
XCloseDisplay(disp);
return 0;
return EINA_FALSE;
}
void

2
src/bin/engine_xrender_x11.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef ENGINE_XRENDER_X11_H
#define ENGINE_XRENDER_X11_H
int engine_xrender_x11_args(int argc, char **argv);
Eina_Bool engine_xrender_x11_args(const char *engine, int width, int height);
void engine_xrender_x11_loop(void);
void engine_xrender_x11_shutdown(void);

35
src/bin/engine_xrender_xcb.c
Unescape View File

@ -57,8 +57,8 @@ _engine_xrender_visual_get(xcb_connection_t *conn, xcb_screen_t *screen)
}
}
int
engine_xrender_xcb_args(int argc, char **argv)
Eina_Bool
engine_xrender_xcb_args(const char *engine, int width, int height)
{
struct xcb_size_hints_t hints;
uint32_t value_list[6];