it's own utility (as per raster's request/idea). Remove explicit x_clags in Makefile.am(s) as they are no longer needed. NB: I added some additional libs to the precache stuffs (even tho it's not used right now). Also a newer e_main (more optimized). NB: IF you are brave and want to test this, build evas w/ xcb, build ecore w/ xcb, then rebuild E. Also, disable building opengl in both evas & ecore (it's not ready for public consumption when paired w/ xcb). SVN revision: 61680devs/princeamd/enlightenment-0.17-elive
Christopher Michael
12 years ago
parent
bc5f550546
commit
1a13f8c26f
17 changed files with 2114 additions and 1608 deletions
@ -1,13 +1,20 @@ |
||||
#ifdef E_TYPEDEFS |
||||
|
||||
typedef enum _E_Alert_Op_Type
|
||||
{ |
||||
E_ALERT_OP_RESTART = 0,
|
||||
E_ALERT_OP_EXIT |
||||
} E_Alert_Op_Type; |
||||
|
||||
#else |
||||
#ifndef E_ALERT_H |
||||
#define E_ALERT_H |
||||
|
||||
EINTERN int e_alert_init(const char *disp); |
||||
EINTERN int e_alert_init(void); |
||||
EINTERN int e_alert_shutdown(void); |
||||
|
||||
void e_alert_show(const char *text); |
||||
EAPI void e_alert_show(int sig); |
||||
EAPI void e_alert_hide(void); |
||||
|
||||
#endif |
||||
#endif |
||||
|
||||
@ -0,0 +1,615 @@ |
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
#include <stdarg.h> |
||||
#include <string.h> |
||||
#include <sys/types.h> |
||||
#include <unistd.h> |
||||
#include <signal.h> |
||||
#include <limits.h> |
||||
#include <Eina.h> |
||||
#include <Ecore.h> |
||||
#include <Ecore_Ipc.h> |
||||
#include <xcb/xcb.h> |
||||
|
||||
#define WINDOW_WIDTH 320 |
||||
#define WINDOW_HEIGHT 240 |
||||
|
||||
/* local function prototypes */ |
||||
static int _e_alert_ipc_init(void); |
||||
static Eina_Bool _e_alert_ipc_server_add(void *data, int type, void *event); |
||||
static int _e_alert_connect(void); |
||||
static void _e_alert_create(void); |
||||
static void _e_alert_display(void); |
||||
static void _e_alert_button_move_resize(xcb_window_t btn, int x, int y, int w, int h); |
||||
static void _e_alert_window_raise(xcb_window_t win); |
||||
static void _e_alert_sync(void); |
||||
static void _e_alert_shutdown(void); |
||||
static void _e_alert_run(void); |
||||
static void _e_alert_draw(void); |
||||
static int _e_alert_handle_key_press(xcb_generic_event_t *event); |
||||
static int _e_alert_handle_button_press(xcb_generic_event_t *event); |
||||
static xcb_char2b_t *_e_alert_build_string(const char *str); |
||||
static void _e_alert_draw_outline(void); |
||||
static void _e_alert_draw_title_outline(void); |
||||
static void _e_alert_draw_title(void); |
||||
static void _e_alert_draw_text(void); |
||||
static void _e_alert_draw_button_outlines(void); |
||||
static void _e_alert_draw_button_text(void); |
||||
static void _e_alert_restart_e(void); |
||||
static void _e_alert_exit_e(void); |
||||
|
||||
/* local variables */ |
||||
static Ecore_Ipc_Server *_ipc_server = NULL; |
||||
static Ecore_Ipc_Server *_server = NULL; |
||||
static xcb_connection_t *conn = NULL; |
||||
static xcb_screen_t *screen = NULL; |
||||
static xcb_window_t win = 0; |
||||
static xcb_window_t btn1 = 0; |
||||
static xcb_window_t btn2 = 0; |
||||
static xcb_font_t font = 0; |
||||
static xcb_gcontext_t gc = 0; |
||||
static int sw = 0, sh = 0; |
||||
static int fa = 0, fh = 0, fw = 0; |
||||
static const char *title = NULL, *str1 = NULL, *str2 = NULL; |
||||
static int ret = 0, sig = 0; |
||||
static pid_t pid; |
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{ |
||||
int i = 0; |
||||
|
||||
for (i = 1; i < argc; i++) |
||||
{ |
||||
if ((!strcmp(argv[i], "-h")) || |
||||
(!strcmp(argv[i], "-help")) || |
||||
(!strcmp(argv[i], "--help"))) |
||||
{ |
||||
printf("This is an internal tool for Enlightenment.\n" |
||||
"do not use it.\n"); |
||||
exit(0); |
||||
} |
||||
else if ((i == 1))
|
||||
sig = atoi(argv[i]); // signal
|
||||
else if ((i == 2))
|
||||
pid = atoi(argv[i]); // E's pid
|
||||
} |
||||
|
||||
if (!ecore_init()) return EXIT_FAILURE; |
||||
if (!ecore_ipc_init())
|
||||
{ |
||||
ecore_shutdown(); |
||||
return EXIT_FAILURE; |
||||
} |
||||
|
||||
if (!_e_alert_connect())
|
||||
{ |
||||
printf("FAILED TO INIT ALERT SYSTEM!!!\n"); |
||||
ecore_ipc_shutdown(); |
||||
ecore_shutdown(); |
||||
return EXIT_FAILURE; |
||||
} |
||||
|
||||
if (!_e_alert_ipc_init())
|
||||
{ |
||||
printf("Failed to Connect to Enlightenment!!!\n"); |
||||
ecore_ipc_shutdown(); |
||||
ecore_shutdown(); |
||||
return EXIT_FAILURE; |
||||
} |
||||
|
||||
title = "Enlightenment Error"; |
||||
str1 = "(F1) Recover"; |
||||
str2 = "(F2) Exit"; |
||||
|
||||
_e_alert_create(); |
||||
_e_alert_display(); |
||||
_e_alert_run(); |
||||
_e_alert_shutdown(); |
||||
|
||||
if (ret == 1) |
||||
_e_alert_restart_e(); |
||||
else if (ret == 2) |
||||
_e_alert_exit_e(); |
||||
|
||||
if (_ipc_server)
|
||||
ecore_ipc_server_del(_ipc_server); |
||||
|
||||
ecore_ipc_shutdown(); |
||||
ecore_shutdown(); |
||||
|
||||
return EXIT_SUCCESS; |
||||
} |
||||
|
||||
/* local functions */ |
||||
static int
|
||||
_e_alert_ipc_init(void)
|
||||
{ |
||||
char *edir = NULL; |
||||
|
||||
if (!(edir = getenv("E_IPC_SOCKET"))) return 0; |
||||
_ipc_server =
|
||||
ecore_ipc_server_connect(ECORE_IPC_LOCAL_SYSTEM, edir, 0, NULL); |
||||
if (!_ipc_server) return 0; |
||||
|
||||
ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_ADD,
|
||||
_e_alert_ipc_server_add, NULL); |
||||
return 1; |
||||
} |
||||
|
||||
static Eina_Bool
|
||||
_e_alert_ipc_server_add(void *data, int type, void *event)
|
||||
{ |
||||
Ecore_Ipc_Event_Server_Add *e; |
||||
|
||||
e = event; |
||||
_server = e->server; |
||||
return ECORE_CALLBACK_PASS_ON; |
||||
} |
||||
|
||||
static int
|
||||
_e_alert_connect(void)
|
||||
{ |
||||
conn = xcb_connect(NULL, NULL); |
||||
if ((!conn) || (xcb_connection_has_error(conn))) |
||||
{ |
||||
printf("E_Alert_Main: Error Trying to Connect!!\n"); |
||||
return 0; |
||||
} |
||||
|
||||
/* grab default screen */ |
||||
screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data; |
||||
sw = screen->width_in_pixels; |
||||
sh = screen->height_in_pixels; |
||||
|
||||
return 1; |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_create(void)
|
||||
{ |
||||
uint32_t mask, mask_list[4]; |
||||
int wx = 0, wy = 0; |
||||
|
||||
wx = ((sw - WINDOW_WIDTH) / 2); |
||||
wy = ((sh - WINDOW_HEIGHT) / 2); |
||||
|
||||
font = xcb_generate_id(conn); |
||||
xcb_open_font(conn, font, strlen("fixed"), "fixed"); |
||||
|
||||
/* create main window */ |
||||
mask = (XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL |
|
||||
XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK); |
||||
mask_list[0] = screen->white_pixel; |
||||
mask_list[1] = screen->black_pixel; |
||||
mask_list[2] = 1; |
||||
mask_list[3] = (XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE |
|
||||
XCB_EVENT_MASK_EXPOSURE); |
||||
|
||||
win = xcb_generate_id(conn); |
||||
xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, screen->root,
|
||||
wx, wy, WINDOW_WIDTH, WINDOW_HEIGHT, 0,
|
||||
XCB_WINDOW_CLASS_INPUT_OUTPUT,
|
||||
XCB_COPY_FROM_PARENT, mask, mask_list); |
||||
|
||||
/* create button 1 */ |
||||
mask_list[3] = (XCB_EVENT_MASK_BUTTON_PRESS |
|
||||
XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_EXPOSURE); |
||||
|
||||
btn1 = xcb_generate_id(conn); |
||||
xcb_create_window(conn, XCB_COPY_FROM_PARENT, btn1, win,
|
||||
-100, -100, 1, 1, 0,
|
||||
XCB_WINDOW_CLASS_INPUT_OUTPUT,
|
||||
XCB_COPY_FROM_PARENT, mask, mask_list); |
||||
xcb_map_window(conn, btn1); |
||||
|
||||
/* create button 2 */ |
||||
btn2 = xcb_generate_id(conn); |
||||
xcb_create_window(conn, XCB_COPY_FROM_PARENT, btn2, win,
|
||||
-100, -100, 1, 1, 0,
|
||||
XCB_WINDOW_CLASS_INPUT_OUTPUT,
|
||||
XCB_COPY_FROM_PARENT, mask, mask_list); |
||||
xcb_map_window(conn, btn2); |
||||
|
||||
/* create drawing gc */ |
||||
mask = (XCB_GC_FOREGROUND | XCB_GC_BACKGROUND | XCB_GC_FONT); |
||||
mask_list[0] = screen->black_pixel; |
||||
mask_list[1] = screen->white_pixel; |
||||
mask_list[2] = font; |
||||
|
||||
gc = xcb_generate_id(conn); |
||||
xcb_create_gc(conn, gc, win, mask, mask_list); |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_display(void)
|
||||
{ |
||||
xcb_char2b_t *str = NULL; |
||||
xcb_query_text_extents_cookie_t cookie; |
||||
xcb_query_text_extents_reply_t *reply; |
||||
int x = 0, w = 0; |
||||
|
||||
str = _e_alert_build_string(title); |
||||
|
||||
cookie =
|
||||
xcb_query_text_extents_unchecked(conn, font, strlen(title), str); |
||||
reply = xcb_query_text_extents_reply(conn, cookie, NULL); |
||||
if (reply)
|
||||
{ |
||||
fa = reply->font_ascent; |
||||
fh = (fa + reply->font_descent); |
||||
fw = reply->overall_width; |
||||
free(reply); |
||||
} |
||||
free(str); |
||||
|
||||
/* move buttons */ |
||||
x = 20; |
||||
w = (WINDOW_WIDTH / 2) - 40; |
||||
_e_alert_button_move_resize(btn1, x, WINDOW_HEIGHT - 20 - (fh + 20),
|
||||
w, (fh + 20)); |
||||
|
||||
x = ((WINDOW_WIDTH / 2) + 20); |
||||
_e_alert_button_move_resize(btn2, x, WINDOW_HEIGHT - 20 - (fh + 20),
|
||||
w, (fh + 20)); |
||||
|
||||
/* FIXME: May need e_alert_composite_win here and checks for shapedinput */ |
||||
/* if (e_alert_composite_win) */ |
||||
/* { */ |
||||
/* #ifdef ShapeInput */ |
||||
/* XRectangle rect; */ |
||||
|
||||
/* rect.x = wx; */ |
||||
/* rect.y = wy; */ |
||||
/* rect.width = ww; */ |
||||
/* rect.height = hh; */ |
||||
/* XShapeCombineRectangles(dd, e_alert_composite_win, ShapeInput, */ |
||||
/* 0, 0, &rect, 1, ShapeSet, Unsorted); */ |
||||
/* #endif */ |
||||
/* XReparentWindow(dd, win, e_alert_composite_win, wx, wy); */ |
||||
/* } */ |
||||
|
||||
/* map and raise main window */ |
||||
xcb_map_window(conn, win); |
||||
_e_alert_window_raise(win); |
||||
|
||||
/* grab pointer & keyboard */ |
||||
xcb_grab_pointer_unchecked(conn, 0, win,
|
||||
(XCB_EVENT_MASK_BUTTON_PRESS |
|
||||
XCB_EVENT_MASK_BUTTON_RELEASE),
|
||||
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
|
||||
XCB_NONE, XCB_NONE, XCB_CURRENT_TIME); |
||||
xcb_grab_keyboard_unchecked(conn, 0, win, XCB_CURRENT_TIME,
|
||||
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC); |
||||
xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT,
|
||||
win, XCB_CURRENT_TIME); |
||||
|
||||
/* flush screen */ |
||||
xcb_flush(conn); |
||||
|
||||
/* sync */ |
||||
_e_alert_sync(); |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_button_move_resize(xcb_window_t btn, int x, int y, int w, int h)
|
||||
{ |
||||
uint32_t list[4], mask; |
||||
|
||||
if (!btn) return; |
||||
|
||||
mask = (XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y |
|
||||
XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT); |
||||
list[0] = x; |
||||
list[1] = y; |
||||
list[2] = w; |
||||
list[3] = h; |
||||
|
||||
xcb_configure_window(conn, btn, mask, (const uint32_t *)&list); |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_window_raise(xcb_window_t win)
|
||||
{ |
||||
uint32_t list[] = { XCB_STACK_MODE_ABOVE }; |
||||
|
||||
if (!win) return; |
||||
xcb_configure_window(conn, win, XCB_CONFIG_WINDOW_STACK_MODE, list); |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_sync(void)
|
||||
{ |
||||
xcb_flush(conn); |
||||
free(xcb_get_input_focus_reply(conn,
|
||||
xcb_get_input_focus(conn), NULL)); |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_shutdown(void)
|
||||
{ |
||||
xcb_close_font(conn, font); |
||||
xcb_destroy_window(conn, btn1); |
||||
xcb_destroy_window(conn, btn2); |
||||
xcb_destroy_window(conn, win); |
||||
xcb_free_gc(conn, gc); |
||||
xcb_disconnect(conn); |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_run(void)
|
||||
{ |
||||
xcb_generic_event_t *event = NULL; |
||||
|
||||
xcb_flush(conn); |
||||
while ((event = xcb_wait_for_event(conn)))
|
||||
{ |
||||
switch (event->response_type & ~0x80)
|
||||
{ |
||||
case XCB_BUTTON_PRESS: |
||||
ret = _e_alert_handle_button_press(event); |
||||
break; |
||||
case XCB_KEY_PRESS:
|
||||
ret = _e_alert_handle_key_press(event); |
||||
break; |
||||
case XCB_EXPOSE:
|
||||
{ |
||||
xcb_expose_event_t *ev; |
||||
|
||||
ev = (xcb_expose_event_t *)event; |
||||
if (ev->window != win) break; |
||||
|
||||
_e_alert_draw(); |
||||
_e_alert_sync(); |
||||
|
||||
break; |
||||
} |
||||
default: |
||||
break; |
||||
} |
||||
free(event); |
||||
if (ret > 0) break; |
||||
} |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_draw(void)
|
||||
{ |
||||
_e_alert_draw_outline(); |
||||
_e_alert_draw_title_outline(); |
||||
_e_alert_draw_title(); |
||||
_e_alert_draw_text(); |
||||
_e_alert_draw_button_outlines(); |
||||
_e_alert_draw_button_text(); |
||||
|
||||
xcb_flush(conn); |
||||
} |
||||
|
||||
static int
|
||||
_e_alert_handle_key_press(xcb_generic_event_t *event)
|
||||
{ |
||||
xcb_key_press_event_t *ev; |
||||
|
||||
ev = (xcb_key_press_event_t *)event; |
||||
if (ev->detail == 67) // F1
|
||||
return 1; |
||||
else if (ev->detail == 68) // F2
|
||||
return 2; |
||||
else |
||||
return 0; |
||||
} |
||||
|
||||
static int
|
||||
_e_alert_handle_button_press(xcb_generic_event_t *event)
|
||||
{ |
||||
xcb_button_press_event_t *ev; |
||||
|
||||
ev = (xcb_button_press_event_t *)event; |
||||
if (ev->child == btn1)
|
||||
return 1; |
||||
else if (ev->child == btn2) |
||||
return 2; |
||||
else |
||||
return 0; |
||||
} |
||||
|
||||
static xcb_char2b_t * |
||||
_e_alert_build_string(const char *str)
|
||||
{ |
||||
unsigned int i = 0; |
||||
xcb_char2b_t *ret = NULL; |
||||
|
||||
if (!(ret = malloc(strlen(str) * sizeof(xcb_char2b_t))))
|
||||
return NULL; |
||||
|
||||
for (i = 0; i < strlen(str); i++)
|
||||
{ |
||||
ret[i].byte1 = 0; |
||||
ret[i].byte2 = str[i]; |
||||
} |
||||
|
||||
return ret; |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_draw_outline(void)
|
||||
{ |
||||
xcb_rectangle_t rect; |
||||
|
||||
/* draw outline */ |
||||
rect.x = 0; |
||||
rect.y = 0; |
||||
rect.width = (WINDOW_WIDTH - 1); |
||||
rect.height = (WINDOW_HEIGHT - 1); |
||||
xcb_poly_rectangle(conn, win, gc, 1, &rect); |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_draw_title_outline(void)
|
||||
{ |
||||
xcb_rectangle_t rect; |
||||
|
||||
/* draw title box */ |
||||
rect.x = 2; |
||||
rect.y = 2; |
||||
rect.width = (WINDOW_WIDTH - 4 - 1); |
||||
rect.height = (fh + 4 + 2); |
||||
xcb_poly_rectangle(conn, win, gc, 1, &rect); |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_draw_title(void)
|
||||
{ |
||||
xcb_void_cookie_t cookie; |
||||
int x = 0, y = 0; |
||||
|
||||
/* draw title */ |
||||
x = (2 + 2 + ((WINDOW_WIDTH - 4 - 4 - fw) / 2)); |
||||
y = (2 + 2 + fh); |
||||
|
||||
cookie =
|
||||
xcb_image_text_8(conn, strlen(title), win, gc, x, y, title); |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_draw_text(void)
|
||||
{ |
||||
xcb_void_cookie_t cookie; |
||||
char warn[1024], msg[PATH_MAX], line[1024]; |
||||
int i = 0, j = 0, k = 0; |
||||
|
||||
snprintf(msg, sizeof(msg),
|
||||
"This is not meant to happen and is likely a sign of \n" |
||||
"a bug in Enlightenment or the libraries it relies \n" |
||||
"on. You can gdb attach to this process (%d) now \n" |
||||
"to try debug it or you could exit, or just hit \n" |
||||
"restart to try and get your desktop back the way \n" |
||||
"it was.\n" |
||||
"\n" |
||||
"Please compile everything with -g in your CFLAGS.", pid); |
||||
|
||||
switch (sig)
|
||||
{ |
||||
case SIGSEGV: |
||||
snprintf(warn, sizeof(warn),
|
||||
"This is very bad. Enlightenment SEGV'd."); |
||||
break; |
||||
case SIGILL: |
||||
snprintf(warn, sizeof(warn),
|
||||
"This is very bad. Enlightenment SIGILL'd."); |
||||
break; |
||||
case SIGFPE: |
||||
snprintf(warn, sizeof(warn),
|
||||
"This is very bad. Enlightenment SIGFPE'd."); |
||||
break; |
||||
case SIGBUS: |
||||
snprintf(warn, sizeof(warn),
|
||||
"This is very bad. Enlightenment SIGBUS'd."); |
||||
break; |
||||
case SIGABRT: |
||||
snprintf(warn, sizeof(warn),
|
||||
"This is very bad. Enlightenment SIGABRT'd."); |
||||
break; |
||||
default: |
||||
break; |
||||
} |
||||
|
||||
/* draw text */ |
||||
k = (fh + 12); |
||||
cookie =
|
||||
xcb_image_text_8(conn, strlen(warn), win, gc,
|
||||
4, (k + fa), warn); |
||||
k += (2 * (fh + 2)); |
||||
while (msg[i])
|
||||
{ |
||||
line[j++] = msg[i++]; |
||||
if (line[j - 1] == '\n')
|
||||
{ |
||||
line[j - 1] = 0; |
||||
j = 0; |
||||
cookie =
|
||||
xcb_image_text_8(conn, strlen(line), win, gc,
|
||||
4, (k + fa), line); |
||||
k += (fh + 2); |
||||
} |
||||
} |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_draw_button_outlines(void)
|
||||
{ |
||||
xcb_rectangle_t rect; |
||||
|
||||
rect.x = 0; |
||||
rect.y = 0; |
||||
rect.width = (WINDOW_WIDTH / 2) - 40 - 1; |
||||
rect.height = (fh + 20) - 1; |
||||
|
||||
/* draw button outlines */ |
||||
xcb_poly_rectangle(conn, btn1, gc, 1, &rect); |
||||
xcb_poly_rectangle(conn, btn2, gc, 1, &rect); |
||||
} |
||||
|
||||
static void
|
||||
_e_alert_draw_button_text(void)
|
||||
{ |
||||
xcb_void_cookie_t dcookie; |
||||
xcb_char2b_t *str = NULL; |
||||
xcb_query_text_extents_cookie_t cookie; |
||||
xcb_query_text_extents_reply_t *reply; |
||||
int x = 0, w = 0, bw = 0; |
||||
|
||||
bw = (WINDOW_WIDTH / 2) - 40 - 1; |
||||
|
||||
/* draw button1 text */ |
||||
str = _e_alert_build_string(str1); |
||||
|
||||
cookie =
|
||||
xcb_query_text_extents_unchecked(conn, font, strlen(str1), str); |
||||
reply = xcb_query_text_extents_reply(conn, cookie, NULL); |
||||
if (reply)
|
||||
{ |
||||
w = reply->overall_width; |
||||
free(reply); |
||||
} |
||||
free(str); |
||||
|
||||
x = (5 + ((bw - w) / 2)); |
||||
|
||||
dcookie =
|
||||
xcb_image_text_8(conn, strlen(str1), btn1, gc, x, (10 + fa), str1); |
||||
|
||||
/* draw button2 text */ |
||||
str = _e_alert_build_string(str2); |
||||
|
||||
cookie =
|
||||
xcb_query_text_extents_unchecked(conn, font, strlen(str2), str); |
||||