PERFORCE change 215211 for review
Brooks Davis
brooks at FreeBSD.org
Wed Aug 1 03:39:07 UTC 2012
http://p4web.freebsd.org/@@215211?ac=10
Change 215211 by brooks at 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 @@
p¹¯åp8\îïg)Ñ6Ö[×°ýU³fM·þÞØl6Ãû'rssUZµ,ý»â¸KQÊë JyU¨PAmß¾Ýðàv½«W¯ª)S¦¨
*¸¥ÿ QóæÍÓx8-ÚñãÇKtÃyQu«Q=ôÊÌÌtç.0túôiÕµk׿/}~øá·ÍÐS>ÀôìÙ³ØײeËTÙ²e=º]³g϶4×^{Ä}½öÚkúúáܾeÊQ7o.Éî(¶üãnÙ»Udy}-*¨_~Y>}Úí×3gΨY³f©
z|;náééÜÜ\ܼyS*v
-vvv ADD"""àêê\»v
DYYY{WÑ,Rh-Kν½½=
--îß¿ßä6äååá~P§+çÉgÏEuu5+*¨_~Y>}Úí×3gΨY³f©
z|;n=ѤIÉqDÔÔT¤§§×º`ÿmÛ¶
½½=rssqûöí.N½jÖ¬ºví
++]S-cccäçç+Õ-¿oß¾:t(nݺ
={ö¨Ì¿¦ë(X½z5ñá¢E1cúôé-ZàÂ
Ø¿¿äë4h+@ô½m´ýmÔG:|ø°ÚoDÛdjj*^$VZE-[¶$LFnnn,îqá¤X^^N´gÏòõõ¥VZÑرcéÊ+DD§r<-_¾®_¿NÞÞÞÔ´iS255¥±cÇRvv6½þúëb~©c@c¨}+@{÷î¥îÝ»ùùùQ\\)*îFFFµÚW¾¾¾bóÞ{ïÃ-[&Û·o¯²´YZZåúàÈÆÆd2ÙÛÛÓîÝ»ÅëH
[¥Õî5kÖ¯¯¯J:u*}ÿý÷âGdgg'N+ DD[¶lQ+àçNDD'NPдyófqC êú|üøñDDtïÞ=277×8¿CÃ~ùòejÖ¬J~'''±â"DÓU-_ªò¥Ë:Ï*S·nÝRk®K.b\\\TÆYZZ¹¹¹©T$ë:U@+;wî¬òÐö«m+éÀD¤¨üÃÖ[GD+¦}ûöOµËª|é²Êåªø5iÒ
+hÀZíϺJRð¬røðáCõ
+@ô¹mtùmÔGJMM%"¢ÀÀ@çaccC#F Î;K?qâÃOþþþÓmÙ²
öìÙ#;sæ8p@í,ÜuRîÿGêÐö«m+©F
>}
++hIDATNcÌÀ@ºßÔ;j\¿Æ¬.öýóHè÷C¸è2ö"òòòÂÄaccSí«ÂÓâªÎåÕ©Í5öôéÓxüø1¼¼¼Ð¡C8::bÿþýbe:<<S§NEß¾}1hÐ <}úTì¸:Dÿüç?+ß«|ûí·+]¯±ÊótUnÖÞÖÖH¬i۲ߪU«ÄéûÝPN;w¦.jóB¹Ô:=:t¨ØĦV°4m¿)S¦¨m?¡?ÔÔTµ
Ç'×4µ£Ö<í{ï½GDÎ2Öe_uíÚUìú@¹É°°0q^ÊÍíÖ¦|áµ~Z(<<Tï¯"iwÐÔg
-B\\\{WÚHG:÷555¸}ûvÊjý»^[[évvv8p |}}áëë±cÇbòäÉ8yòd«ëLDDYòä¥^Òïêê*Ë/Wõ?¾U3(Í_äô¦¶ß½{w<x°øøø´{¦iíhøDÓhy>ù1F¥³£G···I;;;Ùºu«ÔÖÖ6yl;R<Jm =Î}[?¹xñ¢Eû¡<)))i´Á`#FH^^$''áÁx4¢Í_B/++ÃÊ+ñïÿ
+èo¾¡Ðç®Ò½¥¥¥¿iÓ¦tîÜ9±Û¶m£ ±)Ó²²2µ½¦åKU¾t]G]êPS¾öíÛ«45¨è{ÛhûÛ¨Ï4zôh±¹`"¢û÷ïSXX9rD¬ )NOF«W¯&"E}ÿþý@ßÿ=¥¤¤Pnn.ýþûïD¤èJ8n+ < ]»vÑG}D¿ýö8î7ÞPYpò)++£5kÍ=BCCÅsòOêÐö344¤{÷îâJ»ví¢û÷ïSEE
ØëóÔvß×u+ at 233)33?~LG¡Ï>û?NDDO>Uë£CÛ}edd$v¼üçªôÑÑ®];1Û¾}»Êr´×ã«W¯R`` M4V¯^-^_$ûHÚ0õ+TO¤×[GZµR }÷ÝwâA'Ùþ³¦åKU¾t]ÇJ
-pùòedgg·wUtuèÐ!-«ó}}}1oÞ<DDD W¯^(((@FF>ýôS|÷ÝwFërwwÇ¢EPYYuëÖ!,,&MBLL***>ø@í^Ø
fÍ
g}Dii)._¾¯¿þß|óQÙ¦Ú@KÚPÿ#Æ pîÜ9ÄÇÇÔg ÁÉ'±{÷nuºr]¬^½:u*yæܽ{{öìÁþýûQQQ~ýúaöìÙ=z4lllpêÔ)|ôÑGV?ÿmyî;³gÏø±[Ö
Ú¹FDDÔÌzdÒ\,%þö·¿È'ÔisæÌ>úHV®\©vØ¿¿ZfÄ¥Î{øð¡úwYYÌ;W-{èÐ!n?"bÔ¡k×®²wï^ÍrEEE2~üxºGFFÊÍ7Õruuuêß÷ïßÐÐÐm¿±pÍÙG%îß¿/"õÝ,rrrL¶YYY)ÑÑÑ&ËÅÆƪeúôécµGi
»`¹¹¹ÉܹsED¤ªªJ=^
£±.XzK®¶õë×ÈÕ«W[µ'JuuµZÿíÏúõëÊ÷ë×OÝÏÙ³gKmmÉ1ÈÌÌ!C-×¥KùÏþÓävÆÐXhi qqq""¨¹ïï¼ólÛ¶Móºxþù票¨Èdÿöïß/aaaFõP\¿~]³;TG;÷©ãÇúöÜ¥K£yìÅ`0L·@KîÝ»«76mR§+ HFFÔÕÕÉwß}'Ë/'
-
-Á ò¿üEDêû@9R-
-Âúõëñâ/jÓûØ{mXë{èÓ§zôèañ:nݺ¥äîîaÃÁ××~~~R_tnLZZæôÔÔT-___<xW®\iv
µõ>v&o½õ&M-@}¿íüXéâ1qâDÍùááá(..Fvv6ìíí¯v×xòÉ'MÊ÷îÝØ°aE¿ÞZc;,\¸-'''|þùçpvvnrû6l@¿~ý¦Í?Ã
CQQ>ýôS-e^¡/ú!moäççËÆeÞ¼y²iÓ&õÃÇ7þSù6AFF$$$
ªëX^^.[·nȺuëÆ£wwwWËwéÒEN>Öaûöí§eZ]]mòÅáƶ¯5©¥û¨)¨yì233ED$&&Æhz{}°±rýû÷W÷EDäí·ßn·ccîµaÍ2e:\°H^^ìß¿_öîÝ+wïÞU§8qB|||]³f:¼éîÝ»eÑ¢E²cÇÉÉÉââbùæoDDäôéÓj»m8ï;wäÎ;/K.}ûö©ófÌa´?üáj;زeÌ3GæÎ+ ê¿
×Õjæ¶1;;;ÉÎÎúá½$>>^òòò¤®®NýýöíÛ[|]lÙ²EDL£ QQQê¶:ú¹oë/¡£a{2çC#GT×1|øpÍ6Éaxãgæ-`͸¹¹©côÿÔ~(ööö&ËÌ1CªªªÔr
o´mlldñâÅFóEê¿ýÞ{ïI·nÝLÖçèè(ÿøÇ?Ô1ó©©©òôÓO·xûZ7_îãÏ% -RË6L@ô>6\Öù׿þ¥¹ï÷ïß%K|PØÛÛË;Ê×ÖÖÊñãÇÅßß_
$©©©ê5 =$$DÒÒÒ/--7ß|Ód[666'&u,--?ÿùÏFåk涱þýû«É©âÎ;2{ölyùåE¤ó& 9÷1éÝ»·ºãÇÍcÂ`0Fþÿ§oß¾G>}påÊ\¼x±Éo¸ººÂ××%%%ÃHzzz"""
BAAN<Ùì{®®®222píÚµF»þ4·ý¶ØÇGÇÆkúví¢¨¨/^DVVV³ÝÎ8qÂèx9ùùùÈÊÊB¿~ýðÃ? ®®
NíJãëë1cÆ \ No newline at end of file
+Oè§Yºt©J~MǶÇXûöíÕÚðàM>fÎIDÏo+ at +èر#²³³]íwæææðôôDóæÍÛ·okl1¡ºå×Å:¾Hô¹mtùmÔ§-[ÂÍÍ
:uBNN®^½¤¤¤j[ëpuu
òòòð×_©l/L///ddd )) vvvHNNFEE
ø!\.G¿~ýóçÏklP|«Ñ[7tèÐD;wî 66VcÿhsDºuëâúõë(,,Ôjy®û1ö|svvL&Crr2nß¾]/]+ô±¯´ gÏpttµµ5ÒÓÓqûöm\¼x±ÆËl´c¬þH 1ÆcúÐhZÁb1Æcýóq+ò\ 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();
More information about the p4-projects
mailing list