PERFORCE change 219790 for review
Brooks Davis
brooks at FreeBSD.org
Thu Nov 15 01:30:36 UTC 2012
http://p4web.freebsd.org/@@219790?ac=10
Change 219790 by brooks at brooks_zenith on 2012/11/15 01:29:45
- Default to CHERI sandboxes.
- Actually support the visiable option for sandboxs when in a
sandboxed mode.
- Make configuration accessable via a single finger swipe
up. Close with pinch as before or with a swipe down.
Affected files ...
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#5 edit
Differences ...
==== //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#5 (text+ko) ====
@@ -45,6 +45,8 @@
#define vwhite(v) fb_colour((v), (v), (v))
#define black vwhite(0)
#define white vwhite(0xFF)
+#define vred(v) fb_colour((v), 0, 0)
+#define red vred(0xFF)
enum mtl_display_mode {
MTL_DM_800x480, /* Full touch screen */
@@ -54,7 +56,7 @@
};
int sb_vis = 0;
-enum sbtype sb = SB_NONE;
+enum sbtype sb = SB_CHERI;
enum mtl_display_mode res = MTL_DM_720x480;
static uint32_t slide_fcol;
@@ -259,6 +261,7 @@
#endif
switch (ts->ts_gesture) {
case TSG2_ZOOM_OUT:
+ case TSG_SOUTH:
goto done;
case TSG_CLICK:
row = (ts->ts_y1 - d_y - cfg_startr) / f_height;
@@ -380,6 +383,8 @@
}
fb_post_region(__DEVOLATILE(uint32_t *, is->buffer), 0, 0,
is->width, is->height);
+ if (sb_vis && sb != SB_NONE)
+ fb_rectangle(red, 2, 0, 0, is->width, is->height);
iboxstate_free(is);
return (0);
@@ -421,6 +426,9 @@
fb_fill_region(is->buffer[r * is->width], 0, r, fb_width, 1);
fb_post_region(__DEVOLATILE(uint32_t *, is->buffer),
slide_fcol + slide_width - is->width, 0, is->width, is->height);
+ if (sb_vis && sb != SB_NONE)
+ fb_rectangle(red, 2, slide_fcol + slide_width - is->width,
+ 0, is->width, is->height);
header_height = is->height;
iboxstate_free(is);
@@ -439,6 +447,9 @@
}
fb_post_region(__DEVOLATILE(uint32_t *, is->buffer),
slide_fcol, fb_height - is->height, is->width, is->height);
+ if (sb_vis && sb != SB_NONE)
+ fb_rectangle(red, 2, slide_fcol, fb_height - is->height,
+ is->width, is->height);
iboxstate_free(is);
/* put a cambridge logo in the lower right corner */
@@ -457,6 +468,9 @@
fb_post_region(__DEVOLATILE(uint32_t *, is->buffer),
slide_fcol + slide_width - is->width, fb_height - is->height,
is->width, is->height);
+ if (sb_vis && sb != SB_NONE)
+ fb_rectangle(red, 2, slide_fcol + slide_width - is->width,
+ fb_height - is->height, is->width, is->height);
iboxstate_free(is);
if ((pfd = openat(dfd, slide, O_RDONLY)) == -1) {
@@ -489,6 +503,11 @@
fb_post_region(__DEVOLATILE(uint32_t *, is->buffer),
slide_fcol + ((slide_width - is->width) / 2), header_height,
is->width, is->height < slide_height ? is->height : slide_height);
+ if (sb_vis && sb != SB_NONE)
+ fb_rectangle(red, 2,
+ slide_fcol + ((slide_width - is->width) / 2),
+ header_height, is->width,
+ is->height < slide_height ? is->height : slide_height);
iboxstate_free(is);
return (0);
@@ -585,7 +604,7 @@
switch (ts->ts_gesture) {
case TSG2_ZOOM_OUT:
exit(0);
- case TSG2_NORTH:
+ case TSG_NORTH:
error = config_dialog();
ts_drain();
if (error == -1)
More information about the p4-projects
mailing list