PERFORCE change 166447 for review
Jonathan Anderson
jona at FreeBSD.org
Thu Jul 23 14:12:07 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=166447
Change 166447 by jona at jona-trustedbsd-belle-vmware on 2009/07/23 14:11:52
Removed raw_x_tests()
Affected files ...
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_qt/sandbox_qt.cpp#4 edit
Differences ...
==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_qt/sandbox_qt.cpp#4 (text+ko) ====
@@ -259,9 +259,6 @@
}
-void raw_x_tests();
-
-
extern "C" int cap_main(int argc, char *argv[])
{
printf("sandbox:\tIn sandbox: %i\n", ld_insandbox());
@@ -365,8 +362,6 @@
printf("sandbox:\tset DISPLAY to %s\n", getenv("DISPLAY"));
fflush(stdout);
-// raw_x_tests();
-
printf("sandbox:\tCreating QApplication...\n");
fflush(stdout);
QApplication app(argc, argv);
@@ -416,77 +411,6 @@
-void raw_x_tests()
-{
- printf("sandbox:\traw_x_tests()\n");
- fflush(stdout);
-
- xcb_connection_t *c;
- xcb_screen_t *s;
- xcb_window_t w;
- xcb_gcontext_t g;
- xcb_generic_event_t *e;
- uint32_t mask;
- uint32_t values[2];
- int done = 0;
- xcb_rectangle_t r = { 20, 20, 60, 60 };
-
- /* open connection with the server */
- int screenp;
- printf("sandbox:\tConnecting...\n");
- fflush(stdout);
- c = xcb_connect_to_display_with_auth_info(NULL, NULL/*xauth*/, &screenp);
- printf("sandbox:\tConnection: %x\n", (unsigned int) c);
- fflush(stdout);
- if (xcb_connection_has_error(c)) {
- printf("Cannot open display\n");
- fflush(stdout);
- return;
- }
- /* get the first screen */
- s = xcb_setup_roots_iterator( xcb_get_setup(c) ).data;
-
- /* create black graphics context */
- g = xcb_generate_id(c);
- w = s->root;
- mask = XCB_GC_FOREGROUND | XCB_GC_GRAPHICS_EXPOSURES;
- values[0] = s->black_pixel;
- values[1] = 0;
- xcb_create_gc(c, g, w, mask, values);
-
- /* create window */
- w = xcb_generate_id(c);
- mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK;
- values[0] = s->white_pixel;
- values[1] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_KEY_PRESS;
- xcb_create_window(c, s->root_depth, w, s->root,
- 10, 10, 100, 100, 1,
- XCB_WINDOW_CLASS_INPUT_OUTPUT, s->root_visual,
- mask, values);
-
- /* map (show) the window */
- xcb_map_window(c, w);
-
- xcb_flush(c);
-
- /* event loop */
- while (!done && (e = xcb_wait_for_event(c))) {
- switch (e->response_type & ~0x80) {
- case XCB_EXPOSE: /* draw or redraw the window */
- xcb_poly_fill_rectangle(c, w, g, 1, &r);
- xcb_flush(c);
- break;
- case XCB_KEY_PRESS: /* exit on key press */
- done = 1;
- break;
- }
- free(e);
- }
- /* close connection to server */
- xcb_disconnect(c);
-}
-
-
int connect_to_X(int *Xfd, xcb_auth_info_t *auth)
{
char *host;
More information about the p4-projects
mailing list