From owner-p4-projects@FreeBSD.ORG Wed Aug 1 03:39:07 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F02FD1065670; Wed, 1 Aug 2012 03:39:06 +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 A91FD106564A for ; Wed, 1 Aug 2012 03:39:06 +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 90F6C8FC08 for ; Wed, 1 Aug 2012 03:39:06 +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 q713d6Ou076698 for ; Wed, 1 Aug 2012 03:39:06 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q713d6S2076695 for perforce@freebsd.org; Wed, 1 Aug 2012 03:39:06 GMT (envelope-from brooks@freebsd.org) Date: Wed, 1 Aug 2012 03:39:06 GMT Message-Id: <201208010339.q713d6S2076695@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 215211 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: Wed, 01 Aug 2012 03:39:07 -0000 http://p4web.freebsd.org/@@215211?ac=10 Change 215211 by brooks@brooks_ecr_current on 2012/08/01 03:39:00 Wait for the gesture to be released before exiting from the keyboard. For reasons I don't understand, failing to do so seems to queue further zoom events even though the main screen ignores them complete. Fix a cut-and-paste'o on the main screen that made the bottom icons unselectable. made the bottom icons unselectable. made the bottom icons unselectable. Update the CheriBrowser thumbnail image. Affected files ... .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/browser-thumb.png#3 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#15 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/browser-thumb.png#3 (text+ko) ==== @@ -33,22 +33,31 @@ pp8\g)6֭[װ UfMl6'rssUZ,KQJyUPAm߾vW)S * Qx8-KtyQuQ=t.0tiյk/}~S>ٳؗײeTٲe=]g϶4^{}kܾeʔQ7o.(nUdy}-*_~Y>}3gΨYf z|;n\ܼyS*v -vvv ADD"""ꊌ \v DYYY{W,Rh-Kν= --߿6 ~P+gϞEuu5+*_~Y>}3gΨYf z|;n=ѤIqDT׺`m۶=rssq.Nj֬v ++]S-ccc+-o߾:t(nݺ={̿(Xz5E1c-Z… ؿ 4h+@mmG:|oDdjj*^$VZE-[$LFnnn,qX^^NgVZرcʕ+DDr<-__NԴiS255cRvv6b~c@c }+@{ݻQ\\)*FFFWb{×-[&۷oYZZƆd2ݻH [5k֐J:u*}Gdgg'N+ DD[lQ+NDD'NPЄyfqC ê|DDt=2778CÄ~ej֬J~'''"DU-_:*SnRkK.b\\\TYZZT$:U@+;wm+D ֭[GD+}O˗|鲎咪5i҄ + hZϺJRrC +@mtmGJMM%"@accC#FΝ;K?qÔOmٲ#;s 8p@,uRGm+F >} ++hIDATNc@Ԏ;j\Ƭ.HC2"ĉaccSթ5x1СC8::bbe:<<SNE߾}1h <}T쐸:D?+߫|+]tUn֖H i۲ߪUPN;w .jB:=:tĭV4m)Sm??T Ǎ'4<{GD2e_uU@ɰ0q^֦|~Z (<1FGI;;;ٺu6yl;R?NDDO>UC}edd$vѮ];1۾}rWR`` M4V^-^_$H0+ TO׭[GZR }wA'KUt]J -pedggwUtu!-}}}1oS|wFrwwǢEPYYu!,, &MBLL ***>@^ؐ f͚g}Dii)._|Q٦@KP#Ƅ p9Ǜg„ ɓ'{nur]^:u*yܽ{{QQQ~a=z4lllp)|GV?my;g[օ ڹFDDzd\,%ȉ'is>HV\vؿZfĈ{wYY̝;W-{!n?"bԍk׮w^rEEE2~xGFF͛7ruuuߗmpG%߿/",rrrLYYY)&ƪecGi `ܹsEDJ=^ .XzK׋իW['JuuZOٳgKmm1̔!C-ץKvXhi qqq""󎈈l۶Mx票d/aaaFP\~];TG; ǏܥKy`0L@Kݻ76mR+ HFFw}'˗/' - - ED@9R- -/jؘ{mX{ӧza:nݺaÆ~~~R_tnLZZT-___v&o&M-@}X1qD(..Fvv6푟vx'MذaEZc;,\-'''|pvvnr6l@~͟?Æ CQQ>S-e^/!moƍe޼yi&ÆǏ7S6AFF$$$ X^^.[n ȺuƣwwwWwEN>aeZ]]mƶ5 )y233ED$&&hz{}rWEDncca͘2e:\H^^߿_+wU8qB|||]f:ݻeѢEcɑboDDjm8 ;wΝ;/K.}f̘a?j;زe̙3GΝ+ j1;;;$>>^򤮮N[|]lٲEDL QQQ:o/a{2C#GT1|p6ax g-`cԇ~(&̘1Cr omlldFE꿚{InL(?1OxZ7_% -R6L@>6\ ׿ߗ%K|Pˎ;_ $5  =$$DҌ/--7|d[666'&u,--?Fk涱ɩΝ;2{lyE& 91ݻǏc`0Fo߾G>}p\xo %%%Hzzz""" BAAN<{222pڵF4GƒkÚv튐/^DVVV΂8qx 9B~? NJ1cƠ\ No newline at end of file +O蕧YtJ~MǀXچM>fΜIDo+@+ر#]wD͑۷okl1:Hmtmԧ-[ :uBNN^j[puu_l/L///ddd )) vvvHNNFEE!\.G~klP|ѭ[7tD;w 66VchsDu놇(,,jy1|svvL&Crr2n߾]/]+gϞptt5qm\xlcH 1chZb1cq+\ No newline at end of file ==== //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#15 (text+ko) ==== @@ -361,6 +361,7 @@ } } } while(!((touch_count==2) && (touch_gesture==0x49))); + multitouch_release_event(); } @@ -669,13 +670,12 @@ // wait for image selection for(display_image=-1; (display_image<0); ) { ts = ts_poll(); - printf("gesture 0x%02x, (%d, %d)\n", ts->ts_gesture, ts->ts_x1, ts->ts_x2); switch (ts->ts_gesture) { case TSG_CLICK: - case TSG2_CLICK: x = ts->ts_x1 / (fb_width / tile); - y = ts->ts_y1 / (fb_width / tile); + y = ts->ts_y1 / (fb_height / tile); display_image = imgmap[x][y]; + ts_drain(); break; case TSG_EAST: show_about();