summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHermet Park <chuneon.park@samsung.com>2020-03-16 12:32:41 +0900
committerHermet Park <chuneon.park@samsung.com>2020-03-16 12:32:41 +0900
commit75f338b01cf7733f6c90f789ba9441c6b8e79a02 (patch)
treead97cd3e744de7969702bbb4b6186b376c216887
parentb932fe8430697a973cf96ec226a3a56a196bd19c (diff)
parent04675a64cd308bd12ecaef56a9885058fdf2d70f (diff)
Merge branch 'master' into devs/hermet/lottie
-rw-r--r--po/sr.po234
-rw-r--r--src/bin/efl_canvas_wl/efl_canvas_wl_test.c4
-rw-r--r--src/lib/efl_canvas_wl/Efl_Canvas_Wl.h198
-rw-r--r--src/lib/efl_canvas_wl/efl_canvas_wl.c8
-rw-r--r--src/lib/efl_canvas_wl/efl_canvas_wl.eo126
-rw-r--r--src/lib/efl_canvas_wl/efl_canvas_wl_surface.eo46
-rw-r--r--src/lib/evas/common/evas_convert_gry_8.c4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_manager.c1
8 files changed, 249 insertions, 372 deletions
diff --git a/po/sr.po b/po/sr.po
index 3f9e78f084..4a6eb244c0 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -4,23 +4,20 @@
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2013. 4# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
5# Саша Петровић <salepetronije@gmail.com>, 2013, 2015. 5# Саша Петровић <salepetronije@gmail.com>, 2013, 2015.
6# 6#
7#: src/lib/elementary/elm_config.c:4135
8msgid "" 7msgid ""
9msgstr "" 8msgstr ""
10"Project-Id-Version: а\n" 9"Project-Id-Version: а\n"
11"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" 10"Report-Msgid-Bugs-To: $MSGID_BUGS_ADDRESS\n"
12"POT-Creation-Date: 2019-04-15 12:03+0100\n" 11"POT-Creation-Date: 2017-09-02 20:01+0200\n"
13"PO-Revision-Date: 2015-01-31 14:06+0100\n" 12"PO-Revision-Date: 2020-03-08 19:04+0100\n"
14"Last-Translator: Саша Петровић <salepetronije@gmail.com>\n" 13"Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"
15"Language-Team: српски <xfce4@xfce4.org>\n" 14"Language-Team: српски <xfce4@xfce4.org>\n"
16"Language: sr\n"
17"MIME-Version: 1.0\n" 15"MIME-Version: 1.0\n"
18"Content-Type: text/plain; charset=UTF-8\n" 16"Content-Type: text/plain; charset=UTF-8\n"
19"Content-Transfer-Encoding: 8bit\n" 17"Content-Transfer-Encoding: 8bit\n"
20"X-Launchpad-Export-Date: 2014-06-14 05:42+0000\n" 18"X-Launchpad-Export-Date: 2017-09-03 05:32+0000\n"
21"X-Generator: Gtranslator 2.91.6\n" 19"X-Generator: Poedit 2.2.1\n"
22"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" 20"Language: sr\n"
23"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
24 21
25#: src/lib/ecore/ecore_getopt.c:89 22#: src/lib/ecore/ecore_getopt.c:89
26msgid "Version:" 23msgid "Version:"
@@ -242,236 +239,220 @@ msgstr "Слике"
242msgid "Videos" 239msgid "Videos"
243msgstr "Видео снимци" 240msgstr "Видео снимци"
244 241
245#: src/lib/elementary/elc_fileselector.c:1705 242#: src/lib/elementary/elc_fileselector.c:1905
246msgid "Up" 243msgid "Up"
247msgstr "Горе" 244msgstr "Горе"
248 245
249#: src/lib/elementary/elc_fileselector.c:1719 246#: src/lib/elementary/elc_fileselector.c:1919
250msgid "Home" 247msgid "Home"
251msgstr "Лична фасцикла" 248msgstr "Лична фасцикла"
252 249
253#: src/lib/elementary/elc_fileselector.c:1738 250#: src/lib/elementary/elc_fileselector.c:1938
254msgid "Search" 251msgid "Search"
255msgstr "Тражи" 252msgstr "Тражи"
256 253
257#: src/lib/elementary/elc_fileselector.c:2012 254#: src/lib/elementary/elc_fileselector.c:2232
258msgid "OK" 255msgid "OK"
259msgstr "У реду" 256msgstr "У реду"
260 257
261#: src/lib/elementary/elc_fileselector.c:2022 258#: src/lib/elementary/elc_fileselector.c:2242
262#: src/lib/elementary/elm_entry.c:1759 src/lib/elementary/elm_entry.c:1784 259#: src/lib/elementary/elm_entry.c:1719 src/lib/elementary/elm_entry.c:1744
263msgid "Cancel" 260msgid "Cancel"
264msgstr "Откажи" 261msgstr "Откажи"
265 262
266#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/efl_ui_button.c:208 263#: src/lib/elementary/elc_hoversel.c:436 src/lib/elementary/efl_ui_button.c:263
267#: src/lib/elementary/efl_ui_check.c:187 src/lib/elementary/elm_gengrid.c:1532 264#: src/lib/elementary/efl_ui_check.c:197 src/lib/elementary/elm_gengrid.c:1470
268#: src/lib/elementary/elm_genlist.c:1769 src/lib/elementary/elm_list.c:2185 265#: src/lib/elementary/elm_genlist.c:1738 src/lib/elementary/elm_list.c:2155
269#: src/lib/elementary/efl_ui_radio.c:201 266#: src/lib/elementary/efl_ui_radio.c:199
270#: src/lib/elementary/elm_segment_control.c:525 267#: src/lib/elementary/elm_segment_control.c:526
271#: src/lib/elementary/elm_spinner.c:1041 src/lib/elementary/elm_toolbar.c:2294 268#: src/lib/elementary/efl_ui_spinner.c:1020
269#: src/lib/elementary/elm_toolbar.c:2335
272msgid "State: Disabled" 270msgid "State: Disabled"
273msgstr "Стање: онемогућено" 271msgstr "Стање: онемогућено"
274 272
275#: src/lib/elementary/elc_hoversel.c:652 273#: src/lib/elementary/elc_hoversel.c:638
276msgid "Hoversel" 274msgid "Hoversel"
277msgstr "" 275msgstr "Лебедна ћелија"
278 276
279#: src/lib/elementary/elc_multibuttonentry.c:682 277#: src/lib/elementary/elc_multibuttonentry.c:723
280msgid "multi button entry label" 278msgid "multi button entry label"
281msgstr "ознака улаза са више дугмади" 279msgstr "ознака улаза са више дугмади"
282 280
283#: src/lib/elementary/elc_multibuttonentry.c:704 281#: src/lib/elementary/elc_multibuttonentry.c:745
284msgid "multi button entry item" 282msgid "multi button entry item"
285msgstr "ставка улаза са више дугмади" 283msgstr "ставка улаза са више дугмади"
286 284
287#: src/lib/elementary/elc_multibuttonentry.c:1586 285#: src/lib/elementary/elc_multibuttonentry.c:1634
288msgid "multi button entry" 286msgid "multi button entry"
289msgstr "улаз са више дугмади" 287msgstr "улаз са више дугмади"
290 288
291#: src/lib/elementary/elc_naviframe.c:408 289#: src/lib/elementary/elc_naviframe.c:467
292#: src/lib/elementary/elc_naviframe.c:436
293msgid "Title" 290msgid "Title"
294msgstr "Наслов" 291msgstr "Наслов"
295 292
296#: src/lib/elementary/elc_naviframe.c:415 293#: src/lib/elementary/elc_naviframe.c:1026
297#, fuzzy 294#: src/lib/elementary/elc_naviframe.c:1244
298msgid "Subtitle"
299msgstr "Наслов"
300
301#: src/lib/elementary/elc_naviframe.c:968
302#: src/lib/elementary/elc_naviframe.c:1186
303msgid "Back" 295msgid "Back"
304msgstr "Назад" 296msgstr "Назад"
305 297
306#: src/lib/elementary/elc_naviframe.c:1358 298#: src/lib/elementary/elc_naviframe.c:1342
307msgid "Next" 299msgid "Next"
308msgstr "Следеће" 300msgstr "Следеће"
309 301
310#: src/lib/elementary/elc_popup.c:320 src/lib/elementary/elc_popup.c:984 302#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:975
311msgid "Popup Title" 303msgid "Popup Title"
312msgstr "Искачући наслов" 304msgstr "Искачући наслов"
313 305
314#: src/lib/elementary/elc_popup.c:330 src/lib/elementary/elc_popup.c:1060 306#: src/lib/elementary/elc_popup.c:318 src/lib/elementary/elc_popup.c:1051
315msgid "Popup Body Text" 307msgid "Popup Body Text"
316msgstr "Тело искачућег текста" 308msgstr "Тело искачућег текста"
317 309
318#: src/lib/elementary/elc_popup.c:1836 310#: src/lib/elementary/elm_bubble.c:200
319msgid "Alert"
320msgstr ""
321
322#: src/lib/elementary/elm_bubble.c:163
323msgid "Bubble" 311msgid "Bubble"
324msgstr "Мехур" 312msgstr "Мехур"
325 313
326#: src/lib/elementary/efl_ui_button.c:71 314#: src/lib/elementary/efl_ui_button.c:70
327msgid "Clicked" 315msgid "Clicked"
328msgstr "Кликнуто" 316msgstr "Кликнуто"
329 317
330#: src/lib/elementary/efl_ui_button.c:250 318#: src/lib/elementary/efl_ui_button.c:288
331msgid "Button" 319msgid "Button"
332msgstr "Дугме" 320msgstr "Дугме"
333 321
334#: src/lib/elementary/elm_calendar.c:225 322#: src/lib/elementary/elm_calendar.c:272
335#: src/lib/elementary/efl_ui_calendar.c:193
336msgid "%B %Y" 323msgid "%B %Y"
337msgstr "%B %Y" 324msgstr "%B %Y"
338 325
339#: src/lib/elementary/elm_calendar.c:231 326#: src/lib/elementary/elm_calendar.c:278
340msgid "%B" 327msgid "%B"
341msgstr "%B" 328msgstr "%B"
342 329
343#: src/lib/elementary/elm_calendar.c:237 330#: src/lib/elementary/elm_calendar.c:284
344msgid "%Y" 331msgid "%Y"
345msgstr "%Y" 332msgstr "%Y"
346 333
347#: src/lib/elementary/elm_calendar.c:363 334#: src/lib/elementary/elm_calendar.c:409
348#: src/lib/elementary/efl_ui_calendar.c:240
349msgid "calendar item" 335msgid "calendar item"
350msgstr "ставка календара" 336msgstr "ставка календара"
351 337
352#: src/lib/elementary/elm_calendar.c:391 338#: src/lib/elementary/elm_calendar.c:436
353#: src/lib/elementary/efl_ui_calendar.c:267
354msgid "calendar decrement month button" 339msgid "calendar decrement month button"
355msgstr "дугме померања месеца календара уназад" 340msgstr "дугме померања месеца календара уназад"
356 341
357#: src/lib/elementary/elm_calendar.c:397 342#: src/lib/elementary/elm_calendar.c:442
358msgid "calendar decrement year button" 343msgid "calendar decrement year button"
359msgstr "дугме померања година календара уназад" 344msgstr "дугме померања година календара уназад"
360 345
361#: src/lib/elementary/elm_calendar.c:403 346#: src/lib/elementary/elm_calendar.c:448
362#: src/lib/elementary/efl_ui_calendar.c:273
363msgid "calendar increment month button" 347msgid "calendar increment month button"
364msgstr "дугме померања месеца календара унапред" 348msgstr "дугме померања месеца календара унапред"
365 349
366#: src/lib/elementary/elm_calendar.c:409 350#: src/lib/elementary/elm_calendar.c:454
367msgid "calendar increment year button" 351msgid "calendar increment year button"
368msgstr "дугме померања година календара унапред" 352msgstr "дугме померања година календара унапред"
369 353
370#: src/lib/elementary/elm_calendar.c:414 354#: src/lib/elementary/elm_calendar.c:459
371#: src/lib/elementary/efl_ui_calendar.c:278
372msgid "calendar month" 355msgid "calendar month"
373msgstr "месец календара" 356msgstr "месец календара"
374 357
375#: src/lib/elementary/elm_calendar.c:419 358#: src/lib/elementary/elm_calendar.c:464
376msgid "calendar year" 359msgid "calendar year"
377msgstr "година календара" 360msgstr "година календара"
378 361
379#: src/lib/elementary/efl_ui_check.c:76 src/lib/elementary/efl_ui_check.c:200 362#: src/lib/elementary/efl_ui_check.c:65 src/lib/elementary/efl_ui_check.c:210
380#: src/lib/elementary/efl_ui_radio.c:136 src/lib/elementary/efl_ui_radio.c:202 363#: src/lib/elementary/efl_ui_radio.c:119 src/lib/elementary/efl_ui_radio.c:200
381msgid "State: On" 364msgid "State: On"
382msgstr "Стање : укључен" 365msgstr "Стање : укључен"
383 366
384#: src/lib/elementary/efl_ui_check.c:96 src/lib/elementary/efl_ui_check.c:212 367#: src/lib/elementary/efl_ui_check.c:76 src/lib/elementary/efl_ui_check.c:222
385#: src/lib/elementary/efl_ui_radio.c:204 368#: src/lib/elementary/efl_ui_radio.c:202
386msgid "State: Off" 369msgid "State: Off"
387msgstr "Стање: искључен" 370msgstr "Стање: искључен"
388 371
389#: src/lib/elementary/efl_ui_check.c:196 src/lib/elementary/efl_ui_check.c:209 372#: src/lib/elementary/efl_ui_check.c:206 src/lib/elementary/efl_ui_check.c:219
390msgid "State" 373msgid "State"
391msgstr "Стање" 374msgstr "Стање"
392 375
393#: src/lib/elementary/efl_ui_check.c:348 376#: src/lib/elementary/efl_ui_check.c:300
394msgid "Check" 377msgid "Check"
395msgstr "Провера" 378msgstr "Провера"
396 379
397#: src/lib/elementary/elm_clock.c:309 380#: src/lib/elementary/elm_clock.c:303
398msgid "clock increment button for am,pm" 381msgid "clock increment button for am,pm"
399msgstr "дугме за увећање часовника са am,pm" 382msgstr "дугме за увећање часовника са am,pm"
400 383
401#: src/lib/elementary/elm_clock.c:317 384#: src/lib/elementary/elm_clock.c:311
402msgid "clock decrement button for am,pm" 385msgid "clock decrement button for am,pm"
403msgstr "дугме за смањивање часовника са am,pm" 386msgstr "дугме за смањивање часовника са am,pm"
404 387
405#: src/lib/elementary/elm_clock.c:714 388#: src/lib/elementary/elm_clock.c:647
406msgid "State: Editable" 389msgid "State: Editable"
407msgstr "Стање: уредиво" 390msgstr "Стање: уредиво"
408 391
409#: src/lib/elementary/elm_clock.c:749 392#: src/lib/elementary/elm_clock.c:682
410msgid "Clock" 393msgid "Clock"
411msgstr "Сат" 394msgstr "Сат"
412 395
413#: src/lib/elementary/elm_colorselector.c:939 396#: src/lib/elementary/elm_colorselector.c:914
414msgid "Pick a color" 397msgid "Pick a color"
415msgstr "" 398msgstr "Изаберите боју"
416 399
417#: src/lib/elementary/elm_colorselector.c:977 400#: src/lib/elementary/elm_colorselector.c:952
418msgid "R:" 401msgid "R:"
419msgstr "" 402msgstr "Ц:"
420 403
421#: src/lib/elementary/elm_colorselector.c:979 404#: src/lib/elementary/elm_colorselector.c:954
422msgid "G:" 405msgid "G:"
423msgstr "" 406msgstr "З:"
424 407
425#: src/lib/elementary/elm_colorselector.c:981 408#: src/lib/elementary/elm_colorselector.c:956
426msgid "B:" 409msgid "B:"
427msgstr "" 410msgstr "М:"
428 411
429#: src/lib/elementary/elm_colorselector.c:983 412#: src/lib/elementary/elm_colorselector.c:958
430msgid "A:" 413msgid "A:"
431msgstr "" 414msgstr "П:"
432 415
433#: src/lib/elementary/elm_colorselector.c:1707 416#: src/lib/elementary/elm_colorselector.c:1681
434msgid "color selector palette item" 417msgid "color selector palette item"
435msgstr "ставка избирача палете боја" 418msgstr "ставка избирача палете боја"
436 419
437#. TRANSLATORS: This string is special and defines if the language 420#: src/lib/elementary/elm_config.c:3808
438#. by default is a Left To Right or Right To Left language. Most
439#. languages are LTR and thus the default string is "default:LTR"
440#. but if this is a right-to-left language like arabic, Farsi,
441#. Hebrew, etc. then change this string to be "default:RTL"
442#.
443#: src/lib/elementary/elm_config.c:4158
444msgid "default:LTR" 421msgid "default:LTR"
445msgstr "default:LTR" 422msgstr "задато:слева на десно"
446 423
447#: src/lib/elementary/elm_dayselector.c:437 424#: src/lib/elementary/elm_dayselector.c:401
448msgid "day selector item" 425msgid "day selector item"
449msgstr "ставка одабирач дана" 426msgstr "ставка одабирач дана"
450 427
451#: src/lib/elementary/elm_diskselector.c:701 428#: src/lib/elementary/elm_diskselector.c:700
452msgid "diskselector item" 429msgid "diskselector item"
453msgstr "ставка одабира диска" 430msgstr "ставка одабира диска"
454 431
455#: src/lib/elementary/elm_entry.c:1749 432#: src/lib/elementary/elm_entry.c:1709
456msgid "Cut" 433msgid "Cut"
457msgstr "Исеци" 434msgstr "Исеци"
458 435
459#: src/lib/elementary/elm_entry.c:1752 436#: src/lib/elementary/elm_entry.c:1712
460msgid "Copy" 437msgid "Copy"
461msgstr "Умножи" 438msgstr "Умножи"
462 439
463#: src/lib/elementary/elm_entry.c:1756 src/lib/elementary/elm_entry.c:1778 440#: src/lib/elementary/elm_entry.c:1716 src/lib/elementary/elm_entry.c:1738
464msgid "Paste" 441msgid "Paste"
465msgstr "Прилепи" 442msgstr "Прилепи"
466 443
467#: src/lib/elementary/elm_entry.c:1771 444#: src/lib/elementary/elm_entry.c:1731
468msgid "Select" 445msgid "Select"
469msgstr "Изаберите" 446msgstr "Изаберите"
470 447
471#: src/lib/elementary/elm_entry.c:3937 448#: src/lib/elementary/elm_entry.c:3826
472msgid "Entry" 449msgid "Entry"
473msgstr "Улаз" 450msgstr "Улаз"
474 451
452#: src/lib/elementary/elm_gengrid.c:1500
453msgid "Gengrid Item"
454msgstr "Ставка родне мреже"
455
475#: src/lib/elementary/elm_index.c:95 456#: src/lib/elementary/elm_index.c:95
476msgid "Index" 457msgid "Index"
477msgstr "Садржина" 458msgstr "Садржина"
@@ -480,99 +461,98 @@ msgstr "Садржина"
480msgid "Index Item" 461msgid "Index Item"
481msgstr "Ставка садржине" 462msgstr "Ставка садржине"
482 463
483#: src/lib/elementary/elm_label.c:403 464#: src/lib/elementary/elm_label.c:405
484msgid "Label" 465msgid "Label"
485msgstr "Натпис" 466msgstr "Натпис"
486 467
487#: src/lib/elementary/elm_panel.c:84 468#: src/lib/elementary/elm_panel.c:82
488msgid "state: opened" 469msgid "state: opened"
489msgstr "стање: отворено" 470msgstr "стање: отворено"
490 471
491#: src/lib/elementary/elm_panel.c:85 472#: src/lib/elementary/elm_panel.c:83
492msgid "state: closed" 473msgid "state: closed"
493msgstr "стање: затворено" 474msgstr "стање: затворено"
494 475
495#: src/lib/elementary/elm_panel.c:127 476#: src/lib/elementary/elm_panel.c:123
496msgid "A panel is open" 477msgid "A panel is open"
497msgstr "Полица је отворена" 478msgstr "Полица је отворена"
498 479
499#: src/lib/elementary/elm_panel.c:129 480#: src/lib/elementary/elm_panel.c:125
500msgid "Double tap to close panel menu" 481msgid "Double tap to close panel menu"
501msgstr "Двапут додирните за затварање изборника полице" 482msgstr "Двапут додирните за затварање изборника полице"
502 483
503#: src/lib/elementary/elm_panel.c:181 484#: src/lib/elementary/elm_panel.c:177
504msgid "panel button" 485msgid "panel button"
505msgstr "дугме полице" 486msgstr "дугме полице"
506 487
507#: src/lib/elementary/efl_ui_progressbar.c:397 488#: src/lib/elementary/efl_ui_progressbar.c:328
508msgid "progressbar" 489msgid "progressbar"
509msgstr "трака напретка" 490msgstr "трака напретка"
510 491
511#: src/lib/elementary/efl_ui_radio.c:231 492#: src/lib/elementary/efl_ui_radio.c:228
512msgid "Radio" 493msgid "Radio"
513msgstr "Искључујуће дугме" 494msgstr "Искључујуће дугме"
514 495
515#: src/lib/elementary/elm_segment_control.c:528 496#: src/lib/elementary/elm_segment_control.c:529
516#: src/lib/elementary/elm_toolbar.c:2296 497#: src/lib/elementary/elm_toolbar.c:2337
517msgid "State: Selected" 498msgid "State: Selected"
518msgstr "Стање: означено" 499msgstr "Стање: означено"
519 500
520#: src/lib/elementary/elm_segment_control.c:530 501#: src/lib/elementary/elm_segment_control.c:531
521msgid "State: Unselected" 502msgid "State: Unselected"
522msgstr "Стање: неозначено" 503msgstr "Стање: неозначено"
523 504
524#: src/lib/elementary/elm_segment_control.c:544 505#: src/lib/elementary/elm_segment_control.c:545
525msgid "Segment Control Item" 506msgid "Segment Control Item"
526msgstr "Ставка провере дела" 507msgstr "Ставка провере дела"
527 508
528#: src/lib/elementary/efl_ui_slider.c:704 509#: src/lib/elementary/efl_ui_slider.c:1189
529msgid "slider" 510msgid "slider"
530msgstr "клизач" 511msgstr "клизач"
531 512
532#: src/lib/elementary/elm_spinner.c:1071 513#: src/lib/elementary/efl_ui_spinner.c:1050
533msgid "incremented" 514msgid "incremented"
534msgstr "" 515msgstr "растуће"
535 516
536#: src/lib/elementary/elm_spinner.c:1077 517#: src/lib/elementary/efl_ui_spinner.c:1056
537msgid "decremented" 518msgid "decremented"
538msgstr "" 519msgstr "опадајуће"
539 520
540#: src/lib/elementary/elm_spinner.c:1110 src/lib/elementary/elm_spinner.c:1177 521#: src/lib/elementary/efl_ui_spinner.c:1089
522#: src/lib/elementary/efl_ui_spinner.c:1156
541msgid "spinner" 523msgid "spinner"
542msgstr "избирач са стрелицама" 524msgstr "избирач са стрелицама"
543 525
544#: src/lib/elementary/elm_spinner.c:1119 src/lib/elementary/elm_spinner.c:1160 526#: src/lib/elementary/efl_ui_spinner.c:1098
527#: src/lib/elementary/efl_ui_spinner.c:1139
545msgid "spinner increment button" 528msgid "spinner increment button"
546msgstr "стрелица избирача увећaња" 529msgstr "стрелица избирача увећaња"
547 530
548#: src/lib/elementary/elm_spinner.c:1122 src/lib/elementary/elm_spinner.c:1169 531#: src/lib/elementary/efl_ui_spinner.c:1101
532#: src/lib/elementary/efl_ui_spinner.c:1148
549msgid "spinner decrement button" 533msgid "spinner decrement button"
550msgstr "стрелица избирача смањења" 534msgstr "стрелица избирача смањења"
551 535
552#: src/lib/elementary/elm_spinner.c:1124 536#: src/lib/elementary/efl_ui_spinner.c:1103
553#, fuzzy
554msgid "spinner text" 537msgid "spinner text"
555msgstr "бач а еим" 538msgstr "истае м"
556 539
557#: src/lib/elementary/elm_toolbar.c:1753 src/lib/elementary/elm_toolbar.c:2355 540#: src/lib/elementary/elm_toolbar.c:1792 src/lib/elementary/elm_toolbar.c:2399
558msgid "Selected" 541msgid "Selected"
559msgstr "Изабрано" 542msgstr "Изабрано"
560 543
561#: src/lib/elementary/elm_toolbar.c:2292 544#: src/lib/elementary/elm_toolbar.c:2333
562msgid "Separator" 545msgid "Separator"
563msgstr "Одвајач" 546msgstr "Одвајач"
564 547
565#: src/lib/elementary/elm_toolbar.c:2298 548#: src/lib/elementary/elm_toolbar.c:2339
566msgid "Has menu" 549msgid "Has menu"
567msgstr "Има изборник" 550msgstr "Има изборник"
568 551
569#: src/lib/elementary/elm_toolbar.c:2350 552#: src/lib/elementary/elm_toolbar.c:2394
570msgid "Unselected" 553msgid "Unselected"
571msgstr "Неозначено" 554msgstr "Неозначено"
572 555
573#: src/lib/elementary/elm_toolbar.c:2367 556#: src/lib/elementary/elm_toolbar.c:2411
574msgid "Toolbar Item" 557msgid "Toolbar Item"
575msgstr "Ставка траке алата" 558msgstr "Ставка траке алата"
576
577#~ msgid "Gengrid Item"
578#~ msgstr "Ставка родне мреже"
diff --git a/src/bin/efl_canvas_wl/efl_canvas_wl_test.c b/src/bin/efl_canvas_wl/efl_canvas_wl_test.c
index 4bb7e616af..6bedb9ce47 100644
--- a/src/bin/efl_canvas_wl/efl_canvas_wl_test.c
+++ b/src/bin/efl_canvas_wl/efl_canvas_wl_test.c
@@ -63,8 +63,8 @@ main(int argc, char *argv[])
63 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); 63 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
64 64
65 o = efl_add(EFL_CANVAS_WL_CLASS, win); 65 o = efl_add(EFL_CANVAS_WL_CLASS, win);
66 efl_canvas_wl_aspect_set(o, 1); 66 efl_canvas_wl_aspect_propagate_set(o, 1);
67 efl_canvas_wl_minmax_set(o, 1); 67 efl_canvas_wl_minmax_propagate_set(o, 1);
68 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 68 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
69 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 69 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
70 evas_object_event_callback_add(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS, hints_changed, win); 70 evas_object_event_callback_add(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS, hints_changed, win);
diff --git a/src/lib/efl_canvas_wl/Efl_Canvas_Wl.h b/src/lib/efl_canvas_wl/Efl_Canvas_Wl.h
index 0fae48a3a9..b0c0772ab8 100644
--- a/src/lib/efl_canvas_wl/Efl_Canvas_Wl.h
+++ b/src/lib/efl_canvas_wl/Efl_Canvas_Wl.h
@@ -45,211 +45,15 @@ typedef struct Efl_Canvas_Wl_Xkb_State Efl_Canvas_Wl_Xkb_State;
45#include <efl_canvas_wl_surface.eo.h> 45#include <efl_canvas_wl_surface.eo.h>
46#include <efl_canvas_wl.eo.h> 46#include <efl_canvas_wl.eo.h>
47/** 47/**
48 * @defgroup Efl_Wl_Group EFL Wayland
49 *
50 * A multiseat xdg-shell compliant Wayland compositor in an Evas object.
51 * All toplevel windows will be sized to the size of the compositor object.
52 * @since 1.20
53 * @{
54 */
55#if 0
56/**
57 * Add a compositor widget to the given canvas.
58 *
59 * The following smart callbacks will trigger on the compositor object:
60 * "toplevel_added" - A toplevel surface has been added; event info is Evas_Object *surface @since 1.24
61 * "child_added" - A toplevel surface with a parent has been added; event info is Evas_Object *surface
62 * "popup_added" - A popup surface has been added; event info is Evas_Object *surface
63 * "seat_added" - A compositor seat has been added; event info is Eo *dev
64 *
65 * @param e The canvas
66 * @return The compositor object, @c NULL on failure
67 */
68EAPI Evas_Object *efl_canvas_wl_add(Evas *e);
69
70/**
71 * Run a command in the compositor widget.
72 *
73 * @note If GL is available, the ELM_ACCEL environment variable will be
74 * set to "gl" while executing the command.
75 *
76 * @param obj The compositor widget
77 * @param cmd The command to run
78 * @return The Ecore_Exe from the executed process, @c NULL on failure
79 */
80EAPI Ecore_Exe *efl_canvas_wl_run(Evas_Object *obj, const char *cmd);
81
82/**
83 * Run a command in the compositor widget with specified flags.
84 *
85 * @note If GL is available, the ELM_ACCEL environment variable will be
86 * set to "gl" while executing the command.
87 *
88 * @param obj The compositor widget
89 * @param cmd The command to run
90 * @param flags The flags to use
91 * @return The Ecore_Exe from the executed process, @c NULL on failure
92 */
93Ecore_Exe *efl_canvas_wl_flags_run(Evas_Object *obj, const char *cmd, Ecore_Exe_Flags flags);
94
95/**
96 * Add a process to the list of allowed clients for the compositor widget
97 *
98 * @param obj The compositor widget
99 * @param pid The process to allow
100 * @since 1.21
101 */
102EAPI void efl_canvas_wl_pid_add(Evas_Object *obj, int32_t pid);
103
104/**
105 * Remove a process from the list of allowed clients for the compositor widget
106 *
107 * @param obj The compositor widget
108 * @param pid The process to deny
109 * @since 1.21
110 */
111EAPI void efl_canvas_wl_pid_del(Evas_Object *obj, int32_t pid);
112
113/**
114 * Put the bottom-most toplevel window on top and apply focus to it
115 *
116 * @param obj The compositor widget
117 * @return EINA_TRUE if the window stacking was changed
118 */
119EAPI Eina_Bool efl_canvas_wl_surface_next(Evas_Object *obj);
120
121/**
122 * Put the second top-most toplevel window on top and apply focus to it
123 *
124 * @param obj The compositor widget
125 * @return EINA_TRUE if the window stacking was changed
126 */
127EAPI Eina_Bool efl_canvas_wl_surface_prev(Evas_Object *obj);
128
129/**
130 * Set rotation and flip for the compositor's output
131 *
132 * @param obj The compositor widget
133 * @param rot The rotation to apply
134 * @param rtl If set, the output will apply a flip around the Y axis
135 * @note rtl is equivalent to WL_OUTPUT_TRANSFORM_FLIPPED and rotations are applied
136 * on top
137 */
138EAPI void efl_canvas_wl_rotate(Evas_Object *obj, Efl_Wl_Rotation rot, Eina_Bool rtl);
139
140/**
141 * Set the scale factor for the compositor's output
142 *
143 * @param obj The compositor widget
144 * @param scale The scale factor to set
145 */
146EAPI void efl_canvas_wl_scale_set(Evas_Object *obj, double scale);
147
148/**
149 * Transfer aspect hints from top-most surface onto the efl_canvas_wl object
150 *
151 * @param obj The compositor widget
152 * @param set Whether to enable aspect setting
153 * @since 1.21
154 */
155EAPI void efl_canvas_wl_aspect_set(Evas_Object *obj, Eina_Bool set);
156
157/**
158 * Transfer min/max hints from top-most surface onto the efl_canvas_wl object
159 *
160 * @param obj The compositor widget
161 * @param set Whether to enable min/max setting
162 * @since 1.21
163 */
164EAPI void efl_canvas_wl_minmax_set(Evas_Object *obj, Eina_Bool set);
165
166/**
167 * Add an externally-managed global to the compositor
168 * @note The external implementation is expected to restrict access to authorized
169 * clients
170 * @see wl_global_create() docs
171 *
172 * @param obj The compositor widget
173 * @param interface The Wayland protocol interface struct of the protocol's global
174 * @param version The version of the global to use
175 * @param data User data to use with this interface
176 * @param bind_cb The callback which should be triggered when the global is bound by a client
177 * @return The created global (struct wl_global), or NULL on failure
178 * @since 1.21
179 */
180EAPI void *efl_canvas_wl_global_add(Evas_Object *obj, const void *interface, uint32_t version, void *data, void *bind_cb);
181
182/**
183 * Extract a child surface from the compositor
184 *
185 * An extracted surface can be freely manipulated by external code.
186 * @note size hints must be respected, and the extracted object must not be externally deleted
187 *
188 * @param surface The surface to extract
189 * @return True if the surface was successfully extracted
190 * @since 1.21
191 */
192EAPI Eina_Bool efl_canvas_wl_surface_extract(Evas_Object *surface);
193
194/**
195 * Return the pid for the surface's client
196 *
197 * Get the pid of the underlying client that created the surface.
198 *
199 * @param surface The surface to extract
200 * @return The pid of the surface, or -1 on failure
201 * @since 1.24
202 */
203EAPI int32_t efl_canvas_wl_surface_pid_get(Evas_Object *surface);
204#endif
205/**
206 * Get the Evas_Object for an extracted wl_surface resource created by an efl_canvas_wl object 48 * Get the Evas_Object for an extracted wl_surface resource created by an efl_canvas_wl object
207 * 49 *
208 * @note Passing anything other than a valid wl_surface resource from an efl_canvas_wl object will guarantee a crash. 50 * @note Passing anything other than a valid wl_surface resource from an efl_canvas_wl object will guarantee a crash.
209 * 51 *
210 * @param surface_resource The wl_resource for a wl_surface 52 * @param surface_resource The wl_resource for a wl_surface
211 * @return The Evas_Object of the surface, NULL on failure 53 * @return The Evas_Object of the surface, NULL on failure
212 * @since 1.21 54 * @since 1.24
213 */ 55 */
214EAPI Evas_Object *efl_canvas_wl_extracted_surface_object_find(void *surface_resource); 56EAPI Evas_Object *efl_canvas_wl_extracted_surface_object_find(void *surface_resource);
215#if 0
216/**
217 * Get the Evas_Object for an extracted surface's parent, or NULL if the parent is not extracted
218 *
219 * @note Passing anything other than a valid, extracted surface guarantees a crash.
220 *
221 * @param surface The extracted surface for a wl_surface
222 * @return The Evas_Object of the parent surface, NULL on failure or if there is no parent
223 * @since 1.21
224 */
225EAPI Evas_Object *efl_canvas_wl_extracted_surface_extracted_parent_get(Evas_Object *surface);
226
227/**
228 * Set external xkbcommon resources to be used read-only by the compositor object
229 *
230 * Use this function if you have available the necessary xkbcommon objects which are used
231 * to handle keyboard states in a compositor. The passed objects will not be modified or copied,
232 * so this function must be called again in the case that the compositor widget outlives the
233 * lifetime of any of the passed pointers.
234 *
235 * @param obj The compositor widget
236 * @param seat The seat to set the keymap for, NULL to set the keymap for all seats
237 * @param keymap The xkb_keymap object to use
238 * @param state The xkb_state object to use
239 * @param str The string containing the keymap
240 * @param wl_key_array A pointer to the wl_array in which keys are stored
241 * @since 1.21
242 */
243EAPI void efl_canvas_wl_seat_keymap_set(Evas_Object *obj, Eo *seat, void *state, char *str, void *wl_key_array);
244
245/**
246 * Set the key repeat rate for a seat in the compositor
247 *
248 * @param obj The compositor widget
249 * @since 1.21
250 */
251EAPI void efl_canvas_wl_seat_key_repeat_set(Evas_Object *obj, Eo *seat, int repeat_rate, int repeat_delay);
252#endif
253#undef EAPI 57#undef EAPI
254#define EAPI 58#define EAPI
255#undef EAPI_WEAK 59#undef EAPI_WEAK
diff --git a/src/lib/efl_canvas_wl/efl_canvas_wl.c b/src/lib/efl_canvas_wl/efl_canvas_wl.c
index 997703299f..734378fcff 100644
--- a/src/lib/efl_canvas_wl/efl_canvas_wl.c
+++ b/src/lib/efl_canvas_wl/efl_canvas_wl.c
@@ -5690,13 +5690,13 @@ _efl_canvas_wl_efl_gfx_entity_scale_set(Eo *obj EINA_UNUSED, Comp *c, double sca
5690} 5690}
5691 5691
5692EOLIAN static Eina_Bool 5692EOLIAN static Eina_Bool
5693_efl_canvas_wl_aspect_get(const Eo *obj EINA_UNUSED, Comp *c) 5693_efl_canvas_wl_aspect_propagate_get(const Eo *obj EINA_UNUSED, Comp *c)
5694{ 5694{
5695 return c->aspect; 5695 return c->aspect;
5696} 5696}
5697 5697
5698EOLIAN static void 5698EOLIAN static void
5699_efl_canvas_wl_aspect_set(Eo *obj, Comp *c, Eina_Bool set) 5699_efl_canvas_wl_aspect_propagate_set(Eo *obj, Comp *c, Eina_Bool set)
5700{ 5700{
5701 if (c->aspect == (!!set)) return; 5701 if (c->aspect == (!!set)) return;
5702 c->aspect = !!set; 5702 c->aspect = !!set;
@@ -5707,13 +5707,13 @@ _efl_canvas_wl_aspect_set(Eo *obj, Comp *c, Eina_Bool set)
5707} 5707}
5708 5708
5709EOLIAN static Eina_Bool 5709EOLIAN static Eina_Bool
5710_efl_canvas_wl_minmax_get(const Eo *obj EINA_UNUSED, Comp *c) 5710_efl_canvas_wl_minmax_propagate_get(const Eo *obj EINA_UNUSED, Comp *c)
5711{ 5711{
5712 return c->minmax; 5712 return c->minmax;
5713} 5713}
5714 5714
5715EOLIAN static void 5715EOLIAN static void
5716_efl_canvas_wl_minmax_set(Eo *obj, Comp *c, Eina_Bool set) 5716_efl_canvas_wl_minmax_propagate_set(Eo *obj, Comp *c, Eina_Bool set)
5717{ 5717{
5718 if (c->minmax == (!!set)) return; 5718 if (c->minmax == (!!set)) return;
5719 c->minmax = !!set; 5719 c->minmax = !!set;
diff --git a/src/lib/efl_canvas_wl/efl_canvas_wl.eo b/src/lib/efl_canvas_wl/efl_canvas_wl.eo
index 9924ce9a1f..4481ef4f12 100644
--- a/src/lib/efl_canvas_wl/efl_canvas_wl.eo
+++ b/src/lib/efl_canvas_wl/efl_canvas_wl.eo
@@ -23,87 +23,147 @@ enum @beta Efl.Canvas.Wl.Rotation
23 23
24class @beta Efl.Canvas.Wl extends Efl.Canvas.Group 24class @beta Efl.Canvas.Wl extends Efl.Canvas.Group
25{ 25{
26 [[ 26 [[A multiseat xdg-shell compliant Wayland compositor which runs in a canvas object.
27
28 All toplevel windows will be sized to the size of the compositor object unless extracted with
29 @Efl.Canvas.Wl_Surface.extract.
30
31 Only clients executed with @Efl.Canvas.Wl.run or added with @.allowed_pid_add will
32 be permitted to connect to this compositor.
33
34 If no surface is activated at the time of the first toplevel surface's first buffer commit, this
35 first surface will automatically be activated so long as its geometry is not externally modified
36 during this time. If regularly modifying geometry is necessary, surfaces should be manually activated
37 with the @.active_surface property.
38
27 @since 1.24 39 @since 1.24
28 ]] 40 ]]
29 data: Comp; 41 data: Comp;
30 methods { 42 methods {
31 run { 43 run {
32 [[This runs a command in the compositor using the @Efl.Exe_Flags.term_with_parent flag. 44 [[
45 Run a specified command in the compositor widget.
46 If GL is available, the ELM_ACCEL environment variable will be set to "gl" while executing the command.
33 ]] 47 ]]
34 params { 48 params {
35 cmd: string; 49 cmd: string; [[The command to execute.]]
36 } 50 }
37 return: Efl.Exe; 51 return: Efl.Exe; [[The exe object for the executed process. $NULL on failure.]]
38 } 52 }
39 @property exec_flags { 53 @property exec_flags {
54 [[The flags to be used when running commands with @Efl.Canvas.Wl.run.
55 Changing this value will only affect commands run after this call.
56
57 The default is @Efl.Exe_Flags.term_with_parent.
58 ]]
40 values { 59 values {
41 flags: Efl.Exe_Flags; 60 flags: Efl.Exe_Flags; [[A bitmask of flags.]]
42 } 61 }
43 } 62 }
44 allowed_pid_add { 63 allowed_pid_add {
64 [[Add a process to the list of allowed clients for the compositor widget.
65
66 Once called, this client will be capable of connecting to the internal compositor
67 even if it was not executed by the widget.
68 ]]
45 params { 69 params {
46 pid: int; 70 pid: int; [[The pid to add.]]
47 } 71 }
48 } 72 }
49 allowed_pid_del { 73 allowed_pid_del {
74 [[Remove a process from the list of allowed clients for the compositor widget.
75
76 Once called, this client will be incapable of connecting to the internal compositor
77 even if it was executed by the widget.
78 ]]
50 params { 79 params {
51 pid: int; 80 pid: int; [[The pid to remove.]]
52 } 81 }
53 } 82 }
54 surface_next { 83 surface_next {
55 return: Efl.Canvas.Wl.Surface; 84 [[Activate and raise the bottom-most toplevel surface.]]
85 return: Efl.Canvas.Wl_Surface; [[The surface that was activated, or $NULL if no change was made.]]
56 } 86 }
57 surface_prev { 87 surface_prev {
58 return: Efl.Canvas.Wl.Surface; 88 [[Activate and raise the second top-most toplevel surface.]]
89 return: Efl.Canvas.Wl_Surface; [[The surface that was activated, or $NULL if no change was made.]]
59 } 90 }
60 @property active_surface { 91 @property active_surface {
92 [[This is the currently activated surface in the compositor widget.
93 Only one surface can be activated at a time.
94 ]]
61 get {} 95 get {}
62 set { 96 set {
63 return: bool; 97 return: bool; [[Returns $true if a change was successfully made.]]
64 } 98 }
65 values { 99 values {
66 surface: Efl.Canvas.Wl.Surface; 100 surface: Efl.Canvas.Wl_Surface; [[The activated surface.]]
67 } 101 }
68 } 102 }
69 @property aspect { 103 @property aspect_propagate {
104 [[When set to $true, the compositor will propagate the aspect ratio of the top-most
105 surface to the @Efl.Gfx.Hint.hint_aspect of the compositor widget.
106 ]]
70 values { 107 values {
71 set: bool; 108 set: bool; [[Whether to propagate the hint.]]
72 } 109 }
73 } 110 }
74 @property minmax { 111 @property minmax_propagate {
112 [[When set to $true, the compositor will propagate the min and max hints of the top-most
113 surface to the @Efl.Gfx.Hint.hint_size_min and @Efl.Gfx.Hint.hint_size_max of the compositor widget.
114 ]]
75 values { 115 values {
76 set: bool; 116 set: bool; [[Whether to propagate the hints.]]
77 } 117 }
78 } 118 }
79 @property rotation { 119 @property rotation {
120 [[Set the rotation and flip for the compositor's internal output, which is passed to clients.
121
122 Note that the rotation provided here is counter-clockwise.
123 ]]
80 values { 124 values {
81 rotation: Efl.Canvas.Wl.Rotation; 125 rotation: Efl.Canvas.Wl.Rotation; [[The rotation to apply to the internal output.]]
82 rtl: bool; 126 rtl: bool; [[The horizontal flip to apply to the internal output.]]
83 } 127 }
84 } 128 }
85 global_add { 129 global_add {
130 [[Add a new wl_global to the internal compositor.
131
132 Use this to add implementations of custom extensions for use in the compositor.
133 Globals are removed with wl_global_destroy in libwayland.
134
135 Read Wayland documentation for more info.
136 ]]
86 params { 137 params {
87 interface: const(Efl.Canvas.Wl_Wl_Interface) @by_ref; 138 interface: const(Efl.Canvas.Wl_Wl_Interface) @by_ref; [[The wl_interface of callbacks for the protocol.]]
88 version: uint; 139 version: uint; [[The version of the protocol.]]
89 data: Efl.Canvas.Wl_Wl_Interface_Data @by_ref; 140 data: Efl.Canvas.Wl_Wl_Interface_Data @by_ref; [[The data to be passed to the callback functions.]]
90 bind_cb: Efl.Canvas.Wl_Wl_Interface_Bind_Cb @by_ref; 141 bind_cb: Efl.Canvas.Wl_Wl_Interface_Bind_Cb @by_ref; [[The callback to trigger when a client has bound this global.]]
91 } 142 }
92 return: Efl.Canvas.Wl_Wl_Global @by_ref; 143 return: Efl.Canvas.Wl_Wl_Global @by_ref; [[The $wl_global or $NULL on failure.]]
93 } 144 }
94 seat_keymap_set { 145 seat_keymap_set {
146 [[Sets the keymap for the internal compositor's seat.
147
148 This is useful when nesting the compositor widget inside another compositor in order to reuse the existing keymap and state.
149 ]]
95 params { 150 params {
96 seat: Efl.Input.Device; 151 seat: Efl.Input.Device; [[The seat to set the keymap of, or $NULL for all seats.]]
97 state: Efl.Canvas.Wl_Xkb_State @by_ref; 152 state: Efl.Canvas.Wl_Xkb_State @by_ref; [[The $xkb_state to apply.]]
98 keymap_str: string; 153 keymap_str: string; [[The keymap type as a string, as reported by libxkbcommon.
99 key_array: Efl.Canvas.Wl_Wl_Array @by_ref; 154 The lifetime of the passed string must exceed the lifetime of the compositor widget.
155 ]]
156 key_array: Efl.Canvas.Wl_Wl_Array @by_ref; [[The current $wl_array of keys.]]
100 } 157 }
101 } 158 }
102 seat_key_repeat_set { 159 seat_key_repeat_set {
160 [[Modify the key repeat rate and delay of the internal compositor for a given seat.
161 This is the value sent to clients.
162 ]]
103 params { 163 params {
104 seat: Efl.Input.Device; 164 seat: Efl.Input.Device; [[The seat to set the repeat rate and delay of, or $NULL for all seats.]]
105 repeat_rate: int; 165 repeat_rate: int; [[The repeat rate to set in number of times per second keys should repeat.]]
106 repeat_delay: int; 166 repeat_delay: int; [[The delay before repeating should begin in milliseconds.]]
107 } 167 }
108 } 168 }
109 } 169 }
@@ -115,9 +175,9 @@ class @beta Efl.Canvas.Wl extends Efl.Canvas.Group
115 Efl.Gfx.Entity.scale { get; set; } 175 Efl.Gfx.Entity.scale { get; set; }
116 } 176 }
117 events { 177 events {
118 toplevel,added: Efl.Canvas.Wl.Surface; [[]] 178 toplevel,added: Efl.Canvas.Wl_Surface; [[Contains the toplevel surface which was added.]]
119 child,added: Efl.Canvas.Wl.Surface; [[]] 179 child,added: Efl.Canvas.Wl_Surface; [[Contains the toplevel child surface which was added.]]
120 popup,added: Efl.Canvas.Wl.Surface; [[]] 180 popup,added: Efl.Canvas.Wl_Surface; [[Contains the popup surface which was added.]]
121 seat,added: Efl.Input.Device; [[The seat object added.]] 181 seat,added: Efl.Input.Device; [[Contains the seat object that was added.]]
122 } 182 }
123} 183}
diff --git a/src/lib/efl_canvas_wl/efl_canvas_wl_surface.eo b/src/lib/efl_canvas_wl/efl_canvas_wl_surface.eo
index f2a351becc..d2646f8431 100644
--- a/src/lib/efl_canvas_wl/efl_canvas_wl_surface.eo
+++ b/src/lib/efl_canvas_wl/efl_canvas_wl_surface.eo
@@ -1,27 +1,61 @@
1class @beta Efl.Canvas.Wl.Surface extends Efl.Canvas.Group 1class @beta Efl.Canvas.Wl_Surface extends Efl.Canvas.Group
2{ 2{
3 [[@since 1.24]] 3 [[A canvas object representing a Wayland toplevel or popup surface.
4
5 This object's geometry properties reflect the properties of the underlying surface. If
6 the client is using a protocol to export its size hints, those hints will be directly
7 applied to this object any time they change in the application.
8
9 Changes to geometry and visibility of this object must not be made while @.extracted
10 is $false.
11
12 Changes to size of this object will be immediately propagated to the underlying application.
13
14 Hiding this object will have differing effects based on the surface's xdg-shell role.
15 If the surface is a popup, it will be sent the 'done' protocol event which will close it.
16 If the surface is a toplevel, it will be deactivated if it was active.
17
18 This object's lifetime is bound to the lifetime of the underlying surface or the compositor widget.
19
20 This object must not be manually deleted.
21 @since 1.24
22 ]]
4 data: Comp_Surface; 23 data: Comp_Surface;
5 methods { 24 methods {
6 extract { 25 extract {
7 return: bool; 26 [[Extract a surface from the compositor widget.
27
28 Call this prior to making any calls which directly modify the geometry of
29 the surface. Once extracted, the compositor will no longer attempt to automatically
30 apply geometry or stacking changes to the surface.
31
32 Once extracted, a surface cannot be un-extracted.
33 ]]
34 return: bool; [[Returns $true if the surface was successfully extracted.]]
8 } 35 }
9 @property pid { 36 @property pid {
37 [[The process id of the surface's application.]]
10 get {} 38 get {}
11 values { 39 values {
12 pid: int; 40 pid: int; [[The process id, or -1 if the surface has been asynchronously destroyed.]]
13 } 41 }
14 } 42 }
15 @property parent_surface { 43 @property parent_surface {
44 [[The parent surface of the given surface. This value is $NULL for toplevel surfaces without a parent.
45
46 For popup surfaces, this may be another popup or a toplevel.
47 For toplevel surfaces, this will always be another toplevel or $NULL.
48 ]]
16 get {} 49 get {}
17 values { 50 values {
18 parent: Efl.Canvas.Wl.Surface; 51 parent: Efl.Canvas.Wl_Surface; [[The parent surface. $NULL if no parent exists or the surface was asynchronously destroyed.]]
19 } 52 }
20 } 53 }
21 @property extracted { 54 @property extracted {
55 [[The extracted state of the surface.]]
22 get {} 56 get {}
23 values { 57 values {
24 extracted: bool; 58 extracted: bool; [[$true if @.extract was successfully called previously.]]
25 } 59 }
26 } 60 }
27 } 61 }
diff --git a/src/lib/evas/common/evas_convert_gry_8.c b/src/lib/evas/common/evas_convert_gry_8.c
index 30993ce498..bef3b39de0 100644
--- a/src/lib/evas/common/evas_convert_gry_8.c
+++ b/src/lib/evas/common/evas_convert_gry_8.c
@@ -25,7 +25,7 @@ void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst,
25 b = (B_VAL(src_ptr)); 25 b = (B_VAL(src_ptr));
26 26
27 // Y = 0.299 * R + 0.587 * G + 0.114 * B; 27 // Y = 0.299 * R + 0.587 * G + 0.114 * B;
28 gry8 = ((r * 19595) + (g * 38469) + (b * 7471)) >> 16; 28 gry8 = ((r * 19596) + (g * 38470) + (b * 7472)) >> 16;
29 29
30 *dst_ptr = gry8; 30 *dst_ptr = gry8;
31 31
@@ -54,7 +54,7 @@ void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst,
54 b = (B_VAL(src_ptr)); 54 b = (B_VAL(src_ptr));
55 55
56 // Y = 0.299 * R + 0.587 * G + 0.114 * B; 56 // Y = 0.299 * R + 0.587 * G + 0.114 * B;
57 gry8 = ((r * 19595) + (g * 38469) + (b * 7471)) >> 16; 57 gry8 = ((r * 19596) + (g * 38470) + (b * 7472)) >> 16;
58 58
59 if (((gry8 - gry8 * 255 / 4) >= dith) && (gry8 < 0x07)) gry8++; 59 if (((gry8 - gry8 * 255 / 4) >= dith) && (gry8 < 0x07)) gry8++;
60 60
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.c b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
index 29745843bb..4a1239637f 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
@@ -162,7 +162,6 @@ _efl_canvas_gesture_manager_efl_object_constructor(Eo *obj, Efl_Canvas_Gesture_M
162 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_ROTATE_CLASS, obj)); 162 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_ROTATE_CLASS, obj));
163 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_ZOOM_CLASS, obj)); 163 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_ZOOM_CLASS, obj));
164 /* realistically this will never fail, but the whole gesture layer breaks if this is 0 */ 164 /* realistically this will never fail, but the whole gesture layer breaks if this is 0 */
165 finger_size = efl_config_int_get(config, "glayer_tap_finger_size");
166 if (!getenv("EFL_RUN_IN_TREE")) 165 if (!getenv("EFL_RUN_IN_TREE"))
167 finger_size = efl_config_int_get(config, "glayer_tap_finger_size"); 166 finger_size = efl_config_int_get(config, "glayer_tap_finger_size");
168 if (finger_size < 1) finger_size = 10; 167 if (finger_size < 1) finger_size = 10;