From owner-p4-projects@FreeBSD.ORG Fri Jul 13 20:16:14 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7283F1065673; Fri, 13 Jul 2012 20:16:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 34B3F106566C for ; Fri, 13 Jul 2012 20:16:14 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 04E148FC17 for ; Fri, 13 Jul 2012 20:16:14 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q6DKGDOv025763 for ; Fri, 13 Jul 2012 20:16:13 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q6DKGDsQ025760 for perforce@freebsd.org; Fri, 13 Jul 2012 20:16:13 GMT (envelope-from brooks@freebsd.org) Date: Fri, 13 Jul 2012 20:16:13 GMT Message-Id: <201207132016.q6DKGDsQ025760@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 214345 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2012 20:16:14 -0000 http://p4web.freebsd.org/@@214345?ac=10 Change 214345 by brooks@brooks_ecr_current on 2012/07/13 20:15:15 Add a public function to save the current framebuffer contents to a buffer. Save and restore the framebuffer after displaying a dialog box. Affected files ... .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/de4tc.c#8 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/de4tc.h#8 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/de4tc.c#8 (text+ko) ==== @@ -297,6 +297,16 @@ void +fb_save(u_int32_t *buf) +{ + int i; + + for (i = 0; i < fb_height * fb_width; i++) + buf[i] = pfbp[i]; +} + + +void fb_blend(int blend_text_bg, int blend_text_fg, int blend_pixel, int wash __unused) { mtlctrl[0] = @@ -534,7 +544,7 @@ int textheight, textwidth, titleheight, titlewidth; char **lines; char *textdup; - u_int32_t *textbuf, *titlebuf; + u_int32_t *textbuf, *titlebuf, *bgimage; struct tsstate *ts; titlewidth = strlen(title) * fb_get_font_width() * 2; @@ -587,6 +597,11 @@ } textlines++; + bgimage = malloc(sizeof(u_int32_t) * fb_width * fb_height); + if (bgimage == NULL) + err(1, "malloc"); + fb_save(bgimage); + fb_fill_region(bgcolor, x0, y0, dwidth, dheight); for (x = x0 + FBD_BORDER_SPACE; x < x0 + dwidth - FBD_BORDER_SPACE; x++) { @@ -637,8 +652,10 @@ case FBDT_PINCH2CLOSE: for (;;) { ts = ts_poll(); - if (ts->ts_gesture == TSG2_ZOOM_OUT) + if (ts->ts_gesture == TSG2_ZOOM_OUT) { + fb_post(bgimage); return(FBDA_OK); + } } default: err(1, "Unhandled dialog type"); ==== //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/de4tc.h#8 (text+ko) ==== @@ -108,6 +108,7 @@ void fb_fill_buf(u_int32_t *buf, u_int32_t color, int width, int height); void fb_post(u_int32_t *buf); void fb_post_region(u_int32_t *buf, int x, int y, int w, int h); +void fb_save(u_int32_t *buf); void fb_blend(int blend_text_bg, int blend_text_fg, int blend_pixel, int wash); void fb_text_cursor(int x, int y); void fb_fade2off(void);