diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index 5288e47722..0bb20a306b 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -1,7 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT -AC_CONFIG_SRCDIR([configure.in]) +AC_INIT(configure.in) AM_INIT_AUTOMAKE(ecore, 0.0.2) AM_CONFIG_HEADER(config.h) @@ -79,14 +78,12 @@ AC_SUBST(x_includes) AC_SUBST(x_ldflags) AC_SUBST(x_libs) -AC_CONFIG_FILES([ +AC_OUTPUT([ Makefile ecore-config src/Makefile debian/Makefile -]) -AC_CONFIG_COMMANDS([default],[[ +], [ chmod +x ecore-config - -]],[[]]) -AC_OUTPUT +] +) diff --git a/legacy/ecore/src/Ecore.h b/legacy/ecore/src/Ecore.h index cfc9346a50..0ad4396425 100644 --- a/legacy/ecore/src/Ecore.h +++ b/legacy/ecore/src/Ecore.h @@ -228,6 +228,7 @@ void e_draw_rectangle(Drawable d, GC gc, int x, int y, int w, void e_draw_line(Drawable d, GC gc, int x1, int y1, int x2, int y2); +void e_draw_point(Drawable d, GC gc, int x, int y); void e_window_hint_set_layer(Window win, int layer); void e_window_hint_set_sticky(Window win, int sticky); void e_window_hint_set_borderless(Window win); @@ -290,6 +291,9 @@ Window e_selection_request(void); Window e_selection_set(char *string); void e_set_blank_pointer(Window w); +Cursor e_cursor_new(Pixmap pmap, Pixmap mask, int x, int y, int fr, int fg, int fb, int br, int bg, int bb); +void e_cursor_free(Cursor c); +void e_cursor_set(Window win, Cursor c); typedef struct _eev Eevent; typedef struct _ev_fd_handler Ev_Fd_Handler; diff --git a/legacy/ecore/src/e_x.c b/legacy/ecore/src/e_x.c index 5b0f5ed2bd..e5c51c8c79 100644 --- a/legacy/ecore/src/e_x.c +++ b/legacy/ecore/src/e_x.c @@ -2364,6 +2364,12 @@ e_draw_line(Drawable d, GC gc, int x1, int y1, int x2, int y2) XDrawLine(disp, d, gc, x1, y1, x2, y2); } +void +e_draw_point(Drawable d, GC gc, int x, int y) +{ + XDrawPoint(disp, d, gc, x, y); +} + void e_window_hint_set_layer(Window win, int layer) { @@ -3082,6 +3088,8 @@ e_set_blank_pointer(Window w) GC gc; XGCValues gcv; + if (w == 0) + w = default_root; p = XCreatePixmap(disp, w, 1, 1, 1); m = XCreatePixmap(disp, w, 1, 1, 1); gc = XCreateGC(disp, m, 0, &gcv); @@ -3094,3 +3102,35 @@ e_set_blank_pointer(Window w) XFreePixmap(disp, p); XFreePixmap(disp, m); } + +Cursor +e_cursor_new(Pixmap pmap, Pixmap mask, int x, int y, int fr, int fg, int fb, int br, int bg, int bb) +{ + XColor cl1, cl2; + + cl1.pixel = 0; + cl1.red = fr << 8 | fr; + cl1.green = fg << 8 | fg; + cl1.blue = fb << 8 | fb; + cl1.flags = DoRed|DoGreen|DoBlue; + cl2.pixel = 0; + cl2.red = br << 8 | br; + cl2.green = bg << 8 | bg; + cl2.blue = bb << 8 | bb; + cl2.flags = DoRed|DoGreen|DoBlue; + return XCreatePixmapCursor(disp, pmap, mask, &cl1, &cl2, x, y); +} + +void +e_cursor_free(Cursor c) +{ + XFreeCursor(disp, c); +} + +void +e_cursor_set(Window win, Cursor c) +{ + if (win == 0) + win = default_root; + XDefineCursor(disp, win, c); +}