summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2012-11-02 05:15:34 +0000
committerChunEon Park <hermet@hermet.pe.kr>2012-11-02 05:15:34 +0000
commitd78ed2e298a0ab02c01784da3417506ed6382bc3 (patch)
treea90519dd0dc7480837e2f4c41433c115ce150622 /src
parentf81697bb994e7a88cca0c6901482dc16a9dc5d7c (diff)
expedite - --white spaces & trailings.
SVN revision: 78825
Diffstat (limited to 'src')
-rw-r--r--src/bin/ui.c646
1 files changed, 323 insertions, 323 deletions
diff --git a/src/bin/ui.c b/src/bin/ui.c
index ab92fa3..72e18a4 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -51,156 +51,156 @@ static int exit_after_test = 0;
51static double weights[] = 51static double weights[] =
52{ 52{
53 0.0, // no test 0 53 0.0, // no test 0
54 54
55 50.4851, // test 1 55 50.4851, // test 1
56 97.3703, // test 2 56 97.3703, // test 2
57 10.0000, // test 3 57 10.0000, // test 3
58 87.3703, // ... 58 87.3703, // ...
59 10.0000, 59 10.0000,
60 60
61 150.0000, // test 6 61 150.0000, // test 6
62 10.0000, 62 10.0000,
63 150.0000, 63 150.0000,
64 10.0000, 64 10.0000,
65 150.0000, 65 150.0000,
66 66
67 10.0000, // test 11 67 10.0000, // test 11
68 150.0000, 68 150.0000,
69 10.0000, 69 10.0000,
70 10.6493, 70 10.6493,
71 38.4818, 71 38.4818,
72 72
73 40.7314, // test 16 73 40.7314, // test 16
74 32.0866, 74 32.0866,
75 21.3337, 75 21.3337,
76 21.2167, 76 21.2167,
77 71.6141, 77 71.6141,
78 78
79 64.8893, // test 21 79 64.8893, // test 21
80 95.0880, 80 95.0880,
81 121.0438, 81 121.0438,
82 41.2646, 82 41.2646,
83 162.7149, 83 162.7149,
84 84
85 89.1650, // test 26 85 89.1650, // test 26
86 105.3571, 86 105.3571,
87 40.9657, 87 40.9657,
88 98.4671, 88 98.4671,
89 28.4322, 89 28.4322,
90 90
91 60.000, // test 31 91 60.000, // test 31
92 75.5507, 92 75.5507,
93 51.6601, 93 51.6601,
94 135.4753, 94 135.4753,
95 38.2705, 95 38.2705,
96 96
97 35.9915, // test 36 97 35.9915, // test 36
98 31.9500, 98 31.9500,
99 22.6752, 99 22.6752,
100 38.2702, 100 38.2702,
101 37.4459, 101 37.4459,
102 102
103 37.2009, // test 41 103 37.2009, // test 41
104 34.5459, 104 34.5459,
105 38.5043, 105 38.5043,
106 50.0000, 106 50.0000,
107 37.0282, 107 37.0282,
108 108
109 55.8886, // test 46 109 55.8886, // test 46
110 17.2535, 110 17.2535,
111 23.1457, 111 23.1457,
112 36.9874, 112 36.9874,
113 37.9336, 113 37.9336,
114 114
115 17.1830, // test 51 115 17.1830, // test 51
116 20.7521, 116 20.7521,
117 29.0141, 117 29.0141,
118 131.6784, 118 131.6784,
119 13.6851, 119 13.6851,
120 120
121 23.4462, // test 56 121 23.4462, // test 56
122 14.7573, 122 14.7573,
123 36.5261, 123 36.5261,
124 5.0000, 124 5.0000,
125 5.0000, 125 5.0000,
126 126
127 24.3482, // test 61 127 24.3482, // test 61
128 10.4611, 128 10.4611,
129 86.0290, 129 86.0290,
130 82.0735, 130 82.0735,
131 18.6459, 131 18.6459,
132 132
133 37.4608, // test 66 133 37.4608, // test 66
134 32.4417, 134 32.4417,
135 11.5449, 135 11.5449,
136 5.0000, 136 5.0000,
137 11.4172, 137 11.4172,
138 138
139 13.3682, // test 71 139 13.3682, // test 71
140 10.0324, 140 10.0324,
141 10.0584, 141 10.0584,
142 10.0170, 142 10.0170,
143 5.4029, 143 5.4029,
144 144
145 10.6349, // test 76 145 10.6349, // test 76
146 21.7728, 146 21.7728,
147 12.7933, 147 12.7933,
148 19.4177, 148 19.4177,
149 34.4192, 149 34.4192,
150 150
151 23.9110, // test 81 151 23.9110, // test 81
152 22.8287, 152 22.8287,
153 41.2399, 153 41.2399,
154 30.1383, 154 30.1383,
155 22.0342, 155 22.0342,
156 156
157 38.2952, // test 86 157 38.2952, // test 86
158 5.5560, 158 5.5560,
159 0.5000, 159 0.5000,
160 1.000, 160 1.000,
161 10.000, 161 10.000,
162 162
163 5.000, // test 91 163 5.000, // test 91
164 20.000, // MASK 164 20.000, // MASK
165 20.000, // MASK 2 165 20.000, // MASK 2
166 20.000, // MASK 3 166 20.000, // MASK 3
167 20.000, // MASK 4 167 20.000, // MASK 4
168 168
169 20.000, // test 96 169 20.000, // test 96
170 20.000, // MASK 6 170 20.000, // MASK 6
171 20.000, // MASK 7 171 20.000, // MASK 7
172 20.000, // MASK 8 172 20.000, // MASK 8
173 20.000, // MASK 9 173 20.000, // MASK 9
174 174
175 20.000, // test 101 175 20.000, // test 101
176 20.000, // MASK 11 176 20.000, // MASK 11
177 20.000, // MASK 12 177 20.000, // MASK 12
178 20.000, // MASK 13 178 20.000, // MASK 13
179 20.000, // MASK 14 179 20.000, // MASK 14
180 180
181 20.000, // test 106 MASK 15 181 20.000, // test 106 MASK 15
182 1.000, 182 1.000,
183 2.000, 183 2.000,
184 1.000, 184 1.000,
185 2.000, 185 2.000,
186 186
187 1.000, // test 111 187 1.000, // test 111
188 2.000, 188 2.000,
189 1.000, 189 1.000,
190 2.000, 190 2.000,
191 1.000, 191 1.000,
192 192
193 2.000, // test 116 193 2.000, // test 116
194 10.000, 194 10.000,
195 10.000, 195 10.000,
196 196
197 0.0, // Exit 197 0.0, // Exit
198 198
199 0.0, // no final test - add a 0 at the end anyway to pad 199 0.0, // no final test - add a 0 at the end anyway to pad
200 0.0, 200 0.0,
201 0.0, 201 0.0,
202 0.0, 202 0.0,
203 0.0 203 0.0
204}; 204};
205 205
206static void 206static void
@@ -243,32 +243,32 @@ _ui_all(void)
243 evas_object_hide(o_byline); 243 evas_object_hide(o_byline);
244 for (l = menu; l; l = l->next) 244 for (l = menu; l; l = l->next)
245 { 245 {
246 Menu_Item *mi; 246 Menu_Item *mi;
247 247
248 mi = l->data; 248 mi = l->data;
249 if ((mi->func == about_start) || 249 if ((mi->func == about_start) ||
250 (mi->func == _ui_exit) || 250 (mi->func == _ui_exit) ||
251 (mi->func == _ui_all)) 251 (mi->func == _ui_all))
252 continue; 252 continue;
253 if (mi->func) mi->func(); 253 if (mi->func) mi->func();
254 evas_object_hide(o_title); 254 evas_object_hide(o_title);
255 evas_object_hide(o_byline); 255 evas_object_hide(o_byline);
256 while (p_fps == 0.0) 256 while (p_fps == 0.0)
257 { 257 {
258 engine_loop(); 258 engine_loop();
259 ui_loop(); 259 ui_loop();
260 evas_render(evas); 260 evas_render(evas);
261 } 261 }
262 /* This give time to delete the objects of the previous test and make 262 /* This give time to delete the objects of the previous test and make
263 the result of next test more accurate. Draw back, some time is not 263 the result of next test more accurate. Draw back, some time is not
264 counted at all. */ 264 counted at all. */
265 evas_render(evas); 265 evas_render(evas);
266 t_count++; 266 t_count++;
267 fps += p_fps; 267 fps += p_fps;
268 wfps += (p_fps * weights[t_count]); 268 wfps += (p_fps * weights[t_count]);
269 key_func("Escape"); 269 key_func("Escape");
270 } 270 }
271 for (i = 1; 271 for (i = 1;
272 (i < (1 + t_count)) && 272 (i < (1 + t_count)) &&
273 (weights[i] > 0.0); 273 (weights[i] > 0.0);
274 i++) 274 i++)
@@ -279,12 +279,12 @@ _ui_all(void)
279 char datestr[1024]; 279 char datestr[1024];
280 struct tm *tim; 280 struct tm *tim;
281 time_t now; 281 time_t now;
282 282
283 now = time(NULL); 283 now = time(NULL);
284 tim = localtime(&now); 284 tim = localtime(&now);
285 if (tim) strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", tim); 285 if (tim) strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", tim);
286 else snprintf(datestr, sizeof(datestr), "unknown"); 286 else snprintf(datestr, sizeof(datestr), "unknown");
287// printf("%5.2f , EVAS SPEED\n", fps / t_count); 287 // printf("%5.2f , EVAS SPEED\n", fps / t_count);
288 printf("%5.2f , EVAS SPEED (WEIGHTED), " 288 printf("%5.2f , EVAS SPEED (WEIGHTED), "
289 "tn, %i , " 289 "tn, %i , "
290 "t, %s , " 290 "t, %s , "
@@ -296,7 +296,7 @@ _ui_all(void)
296 "fs , %i\n" 296 "fs , %i\n"
297 , 297 ,
298 wfps / (t_count * avgw), 298 wfps / (t_count * avgw),
299// fps / t_count, 299 // fps / t_count,
300 t_count, 300 t_count,
301 datestr, 301 datestr,
302 evas_version->major, evas_version->minor, evas_version->micro, evas_version->revision, 302 evas_version->major, evas_version->minor, evas_version->micro, evas_version->revision,
@@ -331,35 +331,35 @@ _ui_num(int n)
331 mi = eina_list_nth(menu, n); 331 mi = eina_list_nth(menu, n);
332 if (mi) 332 if (mi)
333 { 333 {
334 if ((mi->func == about_start) || 334 if ((mi->func == about_start) ||
335 (mi->func == _ui_exit) || 335 (mi->func == _ui_exit) ||
336 (mi->func == _ui_all)) 336 (mi->func == _ui_all))
337 goto done; 337 goto done;
338 if (mi->func) mi->func(); 338 if (mi->func) mi->func();
339 evas_object_hide(o_title); 339 evas_object_hide(o_title);
340 evas_object_hide(o_byline); 340 evas_object_hide(o_byline);
341 while (p_fps == 0.0) 341 while (p_fps == 0.0)
342 { 342 {
343 ui_loop(); 343 ui_loop();
344 engine_loop(); 344 engine_loop();
345 evas_render(evas); 345 evas_render(evas);
346 } 346 }
347 /* This give time to delete the objects of the previous test and make 347 /* This give time to delete the objects of the previous test and make
348 the result of next test more accurate. Draw back, some time is not 348 the result of next test more accurate. Draw back, some time is not
349 counted at all. */ 349 counted at all. */
350 evas_render(evas); 350 evas_render(evas);
351 t_count++; 351 t_count++;
352 fps += p_fps; 352 fps += p_fps;
353 wfps += (p_fps * weights[n]); 353 wfps += (p_fps * weights[n]);
354 key_func("Escape"); 354 key_func("Escape");
355 } 355 }
356 done: 356done:
357 for (i = 1; i < ((sizeof(weights) / sizeof(double)) - 1); i++) 357 for (i = 1; i < ((sizeof(weights) / sizeof(double)) - 1); i++)
358 avgw += weights[i]; 358 avgw += weights[i];
359 avgw /= (i - 1); 359 avgw /= (i - 1);
360 if (t_count > 0) 360 if (t_count > 0)
361 { 361 {
362// printf("%5.2f , EVAS SPEED\n", fps / t_count); 362 // printf("%5.2f , EVAS SPEED\n", fps / t_count);
363 printf("%5.2f , EVAS SPEED (WEIGHTED)\n", wfps / (t_count * avgw)); 363 printf("%5.2f , EVAS SPEED (WEIGHTED)\n", wfps / (t_count * avgw));
364 } 364 }
365} 365}
@@ -381,12 +381,12 @@ _ui_select(void)
381 evas_object_hide(o_byline); 381 evas_object_hide(o_byline);
382 for (i = 0, l = menu; l; l = l->next, i++) 382 for (i = 0, l = menu; l; l = l->next, i++)
383 { 383 {
384 Menu_Item *mi; 384 Menu_Item *mi;
385 385
386 mi = l->data; 386 mi = l->data;
387 evas_object_hide(mi->o_icon); 387 evas_object_hide(mi->o_icon);
388 if (i == menu_sel) 388 if (i == menu_sel)
389 func = mi->func; 389 func = mi->func;
390 } 390 }
391 menu_active = 0; 391 menu_active = 0;
392 if (func) func(); 392 if (func) func();
@@ -402,23 +402,23 @@ _ui_key(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
402 ev = event_info; 402 ev = event_info;
403 if (key_func) 403 if (key_func)
404 { 404 {
405 key_func(ev->keyname); 405 key_func(ev->keyname);
406 return; 406 return;
407 } 407 }
408 if ((!strcmp(ev->keyname, "Escape")) || 408 if ((!strcmp(ev->keyname, "Escape")) ||
409 (!strcmp(ev->keyname, "q")) || 409 (!strcmp(ev->keyname, "q")) ||
410 (!strcmp(ev->keyname, "Q"))) 410 (!strcmp(ev->keyname, "Q")))
411 { 411 {
412 _ui_exit(); 412 _ui_exit();
413 } 413 }
414 if (menu_active) 414 if (menu_active)
415 { 415 {
416 if (!strcmp(ev->keyname, "Left")) menu_sel++; 416 if (!strcmp(ev->keyname, "Left")) menu_sel++;
417 if (!strcmp(ev->keyname, "Right")) menu_sel--; 417 if (!strcmp(ev->keyname, "Right")) menu_sel--;
418 if (menu_sel < 0) menu_sel = 0; 418 if (menu_sel < 0) menu_sel = 0;
419 else if ((unsigned int)menu_sel >= eina_list_count(menu)) menu_sel = eina_list_count(menu) - 1; 419 else if ((unsigned int)menu_sel >= eina_list_count(menu)) menu_sel = eina_list_count(menu) - 1;
420 menu_anim_sel = menu_sel; 420 menu_anim_sel = menu_sel;
421 if (!strcmp(ev->keyname, "Return")) _ui_select(); 421 if (!strcmp(ev->keyname, "Return")) _ui_select();
422 } 422 }
423} 423}
424 424
@@ -622,7 +622,7 @@ _ui_setup(void)
622 622
623 if (run_all) 623 if (run_all)
624 { 624 {
625 _ui_all(); 625 _ui_all();
626 } 626 }
627 else if (run_test > 0) 627 else if (run_test > 0)
628 { 628 {
@@ -644,11 +644,11 @@ _ui_setup(void)
644 } 644 }
645 else 645 else
646 { 646 {
647 menu_active = 1; 647 menu_active = 1;
648 } 648 }
649 649
650 if (exit_after_test) 650 if (exit_after_test)
651 _ui_exit(); 651 _ui_exit();
652 652
653} 653}
654 654
@@ -659,21 +659,21 @@ ui_args(int argc, char **argv)
659 659
660 for (i = 1; i < argc; i++) 660 for (i = 1; i < argc; i++)
661 { 661 {
662 if (!strcmp(argv[i], "-a")) 662 if (!strcmp(argv[i], "-a"))
663 { 663 {
664 run_all = 1; 664 run_all = 1;
665 exit_after_test = 1; 665 exit_after_test = 1;
666 } 666 }
667 else if ((!strcmp(argv[i], "-t")) && (i < (argc - 1))) 667 else if ((!strcmp(argv[i], "-t")) && (i < (argc - 1)))
668 { 668 {
669 run_test = atoi(argv[i + 1]) + 1; 669 run_test = atoi(argv[i + 1]) + 1;
670 exit_after_test = 1; 670 exit_after_test = 1;
671 if (run_test < 2) run_test = 2; 671 if (run_test < 2) run_test = 2;
672 } 672 }
673 else if (!strcmp(argv[i], "-l")) 673 else if (!strcmp(argv[i], "-l"))
674 { 674 {
675 list_test = 1; 675 list_test = 1;
676 } 676 }
677 } 677 }
678 _ui_setup(); 678 _ui_setup();
679 start = get_time(); 679 start = get_time();
@@ -690,116 +690,116 @@ ui_loop(void)
690 evas_object_resize(o_wallpaper, win_w, win_h); 690 evas_object_resize(o_wallpaper, win_w, win_h);
691 if (loop_func) 691 if (loop_func)
692 { 692 {
693 t = get_time(); 693 t = get_time();
694 f_loop++; 694 f_loop++;
695 f_start++; 695 f_start++;
696 if ((t - t_loop) >= 1.0) 696 if ((t - t_loop) >= 1.0)
697 { 697 {
698// ui_fps((double)f_loop / (t - t_loop)); 698 // ui_fps((double)f_loop / (t - t_loop));
699 t_loop = t; 699 t_loop = t;
700 f_loop = 0; 700 f_loop = 0;
701 } 701 }
702 loop_func(t - t_start, f_start); 702 loop_func(t - t_start, f_start);
703 return; 703 return;
704 } 704 }
705 t2 = get_time(); 705 t2 = get_time();
706 if (first) 706 if (first)
707 { 707 {
708 t = 0.1; 708 t = 0.1;
709 pt = t2; 709 pt = t2;
710 } 710 }
711 else 711 else
712 { 712 {
713 t = t2 - pt; 713 t = t2 - pt;
714 pt = t2; 714 pt = t2;
715 } 715 }
716 first = 0; 716 first = 0;
717 717
718 /* menu layout */ 718 /* menu layout */
719 if (menu_active) 719 if (menu_active)
720 { 720 {
721 Eina_List *l; 721 Eina_List *l;
722 int i; 722 int i;
723 static double tr = 0.0; 723 static double tr = 0.0;
724 double tt; 724 double tt;
725 725
726 tt = t; 726 tt = t;
727 tt += tr; 727 tt += tr;
728 while (tt > 0.001) 728 while (tt > 0.001)
729 { 729 {
730 menu_anim = (menu_anim * 0.995) + (menu_anim_sel * 0.005); 730 menu_anim = (menu_anim * 0.995) + (menu_anim_sel * 0.005);
731 tt -= 0.001; 731 tt -= 0.001;
732 } 732 }
733 tr = tt; 733 tr = tt;
734 for (i = 0, l = menu; l; l = l->next, i++) 734 for (i = 0, l = menu; l; l = l->next, i++)
735 { 735 {
736 char buf[4096]; 736 char buf[4096];
737 Menu_Item *mi; 737 Menu_Item *mi;
738 Evas_Coord x, y, w, h, tw, th; 738 Evas_Coord x, y, w, h, tw, th;
739 Evas_Coord len; 739 Evas_Coord len;
740 double a; 740 double a;
741 Evas_Object *o; 741 Evas_Object *o;
742 742
743 mi = l->data; 743 mi = l->data;
744 o = mi->o_icon; 744 o = mi->o_icon;
745 evas_object_geometry_get(o_menu_logo, NULL, NULL, &w, &h); 745 evas_object_geometry_get(o_menu_logo, NULL, NULL, &w, &h);
746 len = ((w * 3) + 10) / 4; 746 len = ((w * 3) + 10) / 4;
747 evas_object_geometry_get(o, NULL, NULL, &w, &h); 747 evas_object_geometry_get(o, NULL, NULL, &w, &h);
748 x = (win_w / 2) 748 x = (win_w / 2)
749 + (sin((menu_anim - (double)i) * 0.33) * len) 749 + (sin((menu_anim - (double)i) * 0.33) * len)
750 - (w / 2); 750 - (w / 2);
751 y = (win_h / 2) 751 y = (win_h / 2)
752 + (cos((menu_anim - (double)i) * 0.33) * len) 752 + (cos((menu_anim - (double)i) * 0.33) * len)
753 - (h / 2); 753 - (h / 2);
754 evas_object_move(o, x, y); 754 evas_object_move(o, x, y);
755 a = menu_anim - (double)i; 755 a = menu_anim - (double)i;
756 if (a < 0) a = -a; 756 if (a < 0) a = -a;
757 a = 255 - (30 * a); 757 a = 255 - (30 * a);
758 evas_object_color_set(o, a, a, a, a); 758 evas_object_color_set(o, a, a, a, a);
759 evas_object_show(o); 759 evas_object_show(o);
760 760
761 if (i == menu_sel) 761 if (i == menu_sel)
762 { 762 {
763 a = menu_anim - (double)i; 763 a = menu_anim - (double)i;
764 if (a < 0) a = -a; 764 if (a < 0) a = -a;
765 a = 255 - (255 * a); 765 a = 255 - (255 * a);
766 766
767 o = o_menu_icon_sel; 767 o = o_menu_icon_sel;
768 evas_object_move(o, x - ((48 - w) / 2), y - ((48 - h) / 2)); 768 evas_object_move(o, x - ((48 - w) / 2), y - ((48 - h) / 2));
769 evas_object_color_set(o, a, a, a, a); 769 evas_object_color_set(o, a, a, a, a);
770 770
771 o = o_menu_title; 771 o = o_menu_title;
772 evas_object_color_set(o, a, a, a, a); 772 evas_object_color_set(o, a, a, a, a);
773 evas_object_text_text_set(o, mi->text); 773 evas_object_text_text_set(o, mi->text);
774 evas_object_geometry_get(o, NULL, NULL, &tw, &th); 774 evas_object_geometry_get(o, NULL, NULL, &tw, &th);
775 x = (win_w - tw) / 2; 775 x = (win_w - tw) / 2;
776 y = (win_h / 2) + len + 48; 776 y = (win_h / 2) + len + 48;
777 evas_object_move(o, x, y); 777 evas_object_move(o, x, y);
778 778
779 779
780 o = o_menu_text_sel; 780 o = o_menu_text_sel;
781 w = tw + 24; 781 w = tw + 24;
782 h = 28; 782 h = 28;
783 x = x - 12; 783 x = x - 12;
784 y = y + ((th - h) / 2); 784 y = y + ((th - h) / 2);
785 evas_object_move(o, x, y); 785 evas_object_move(o, x, y);
786 evas_object_resize(o, w, h); 786 evas_object_resize(o, w, h);
787 evas_object_image_fill_set(o, 0, 0, w, h); 787 evas_object_image_fill_set(o, 0, 0, w, h);
788 evas_object_color_set(o, a, a, a, a); 788 evas_object_color_set(o, a, a, a, a);
789 789
790 o = o_menu_icon; 790 o = o_menu_icon;
791 snprintf(buf, 4096, "%s%s", data_dir, mi->icon); 791 snprintf(buf, 4096, "%s%s", data_dir, mi->icon);
792 evas_object_image_file_set(o, buf, NULL); 792 evas_object_image_file_set(o, buf, NULL);
793 evas_object_color_set(o, a / 2, a / 2, a / 2, a / 2); 793 evas_object_color_set(o, a / 2, a / 2, a / 2, a / 2);
794 } 794 }
795 } 795 }
796 evas_object_move(o_menu_logo, (win_w - 120) / 2, ((win_h - 160) / 2)); 796 evas_object_move(o_menu_logo, (win_w - 120) / 2, ((win_h - 160) / 2));
797 evas_object_show(o_menu_logo); 797 evas_object_show(o_menu_logo);
798 evas_object_show(o_menu_title); 798 evas_object_show(o_menu_title);
799 evas_object_show(o_menu_icon); 799 evas_object_show(o_menu_icon);
800 evas_object_show(o_menu_icon_sel); 800 evas_object_show(o_menu_icon_sel);
801 evas_object_show(o_menu_icon_sel2); 801 evas_object_show(o_menu_icon_sel2);
802 evas_object_show(o_menu_text_sel); 802 evas_object_show(o_menu_text_sel);
803 } 803 }
804 else 804 else
805 { 805 {
@@ -812,7 +812,7 @@ ui_menu(void)
812 evas_object_show(o_title); 812 evas_object_show(o_title);
813 evas_object_show(o_byline); 813 evas_object_show(o_byline);
814 evas_object_text_text_set 814 evas_object_text_text_set
815 (o_byline, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."); 815 (o_byline, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.");
816 menu_active = 1; 816 menu_active = 1;
817 key_func = NULL; 817 key_func = NULL;
818 loop_func = NULL; 818 loop_func = NULL;
@@ -833,10 +833,10 @@ void
833ui_fps(double fps) 833ui_fps(double fps)
834{ 834{
835 /* 835 /*
836 char buf[256]; 836 char buf[256];
837 837
838 snprintf(buf, sizeof(buf), "ESCAPE - exit, FPS: %4.3f", fps); 838 snprintf(buf, sizeof(buf), "ESCAPE - exit, FPS: %4.3f", fps);
839 evas_object_text_text_set(o_byline, buf); 839 evas_object_text_text_set(o_byline, buf);
840 */ 840 */
841 p_fps = fps; 841 p_fps = fps;
842} 842}