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Ãû'rssU­Zµ,ý»â¸KQ–Êë JyU¨PAmß¾Ýðàv½«W¯ª)S¦¨
 *¸¥ÿ€€ 		QóæÍÓx8-ÚñãÇKtÃyQu«Q=ôÊÌÌtç.0túôiÕµk׿/}~øá·ÍÐS>ÀôìٳؗŽײeËTÙ²e=º]³g϶4–×^{­Ä}½öÚk–úúá‡ܾeÊ”Q›7o.Éî(¶üã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ŒñᇢE‹˜1cúôéƒ-ZàÂ…Ø¿¿äë4h+@ô½m´ýmÔG:|ø°ÚoDÛdjj*^$V­ZE-[¶$™LFnnn,îqá¤X^^N´gÏòõõ¥V­ZÑرcéÊ•+DD§r<-_¾œˆˆ®_¿NÞÞÞÔ´iS255¥±cÇRvv6½þúëb~©c@›c¨}+@{÷î¥îÝ»“••ùùùQ\\)*îFFFµÚW¾¾¾b€óÞ{ï‰Ã—-[&žŸÛ·o¯²´­YZZŠåúàƒÈÆƆd2ÙÛÛÓîÝ»ÅëH
[¥Õ5k֐¯¯¯Jš:u*}ÿý÷âG†dgg'N+ DD[¶lQ+àçŸNDD'NœP‰Ð„´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
ž>}
++hIDATN—cÌÀ@ºßÔŽ;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«ëLDD“Y‹ò䥗^Òœïêê*Ë—/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¬ )N†•OF«W¯&"E}ÿþý@ßÿ=¥¤¤Pnn.ýþûïD¤èJ8n+ < ]»vÑG}D¿ýö›8î7ÞPY–pò)++£š5kÍž=›BCCÅsƒò‰OêÐö344¤{÷î‘âJ»ví¢û÷ïSEE…Ø‹ëó€Ôvß×u+ at 233)33“?~LGŽ¡Ï>ûŒŽ?NDDOŸ>Uë£CÛ}edd$v¼ü矪ôÑÑ®];1Û¾}»Êr´­™™™‰×ã«W¯R`` Mš4‰V¯^-^_$û‘HÚ0õ€+TO¤ˆ–×­[G­ZµR›Ÿ‰‰	}÷Ýwâ‰A'Ùþ³¦åKU¾t]ÇJ 
-pùòedgg·wUtuèÐ!-”——«ó}}}1oÞ<DDD W¯^(((@FF>ýôS|÷ÝwFërwwÇ¢E‹PYY‰uëÖ!,,“&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ì‚Å`0L˜·@KîÝ»«7‚›6mR§+	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Ê÷î݉‰‰Ø°aƒE¿ÞZc;‹’’,\¸-'''|þùçpvvnrû6l@¿~ýŒ¦ÍŸ?Æ
CQQ>ýôS-e^­¡/ú!m•oäççËƍ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„#GŽT×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Â`0Fþÿ§oß¾GŸ>}påÊ\¼x±Éo¸ººÂ××%%%šÃHzzz"""ƒ
BAANž<Ùì{®®®ˆˆˆ€‡‡222píÚµF»þ4·ý¶ØÇG‰žÇÆ’kÚºv튐¢¨¨/^DVVV³Ý΂ƒƒŽ’’œ8qÂèxŒ9ùùùÈÊÊ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¿~ýóçÏklžP|«Ñ­[7tèÐD„;wî 66VcÿšhsŒŠ–Dºu놇âúõë(,,Ôjy®ûž1ö|svv“L&Crr2nß¾]/]+ô±¯´­ gÏžptt„µµ5ÒÓÓqûöm\¼x±ÆËl´c¬þH Œ1ÆcúÐhZÁbŒ1Æ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