Commit Graph

170 Commits

Author SHA1 Message Date
Vincent Torri c69cd7ec27 use size_t when it does not hurt
SVN revision: 55548
2010-12-14 06:19:30 +00:00
Vincent Torri 3aedf59c9b declare variables at the beginning of the block
SVN revision: 55545
2010-12-14 05:42:25 +00:00
Tom Hacohen d3b5301bbd Edje entry: Fixed bug with preedit string. The text was committed to the current cursor position instead of the preedit cursor position (which may be different if you click the mouse somewhere in the tetx). Patch by Jihoon Kim.
SVN revision: 55080
2010-11-30 11:06:22 +00:00
Tom Hacohen 2f30d52b93 Edje entry: Fix support mouse down/up/move filter events.
Passing the correct data to _edje_entry_imf_event_delete_surrounding_cb and _edje_entry_imf_retrieve_surrounding_cb
Fix indentation.
Patch by Jihoon Kim.

SVN revision: 54365
2010-11-09 13:36:52 +00:00
Jihoon Kim a69afcfb91 From: Jihoon Kim <jihoon48.kim@samsung.com>
Entry widget has not processed the key event of keypad such as KP_Left,
KP_Right, KP_Home, KP_End, and so on.
In this patch, those key events is processed.



SVN revision: 54359
2010-11-09 07:54:13 +00:00
Tom Hacohen aecc018012 Edje entry: Fixed _edje_entry_imf_event_delete_surrounding_cb to actually delete, which it wasn't doing. Patch by Jihoon Kim.
SVN revision: 53709
2010-10-21 08:23:45 +00:00
Tom Hacohen 7c586714ef Edje entry: Init preedit_len on focus out. Rename 'composition' to 'preedit' in the preedit handling. Patch by Jihoon Kim.
SVN revision: 53651
2010-10-20 10:34:26 +00:00
Tom Hacohen 958b6c7569 Edje entry: Fixed a memory leak. Removed an unwanted selection clear, and renamed preedit strings functions to have a more adequate name. - Patch by Jihoon Kim.
SVN revision: 53390
2010-10-14 07:50:32 +00:00
Tom Hacohen 96185ffaf5 Edje entry: removed some unwanted commented out code.
SVN revision: 53306
2010-10-12 14:13:22 +00:00
Tom Hacohen 0579401cb3 Edje entry: Fixed the hack that was used in edje_entry for drawing anchors (the hack was there because of a bug in textblock which is now fixed).
SVN revision: 53107
2010-10-06 18:23:01 +00:00
Carsten Haitzler 57d15d3ef8 actually hook in filter callbacks - have 2 types and pass in enum to
each as to what text they are seeing to filter. fix up other typdef
uses.



SVN revision: 52975
2010-10-02 03:34:00 +00:00
Christopher Michael 9916578131 And use Eina_Bool return values too.
SVN revision: 52833
2010-09-28 00:25:54 +00:00
Christopher Michael b7b1a25c41 Fix edje entry callback to use Eina_Bool like ecore_imf is expecting.
SVN revision: 52832
2010-09-28 00:24:44 +00:00
Vincent Torri 1e1bb3b6a4 Put everything in edje_private. It should fix a compilation
bug on Windows

SVN revision: 52736
2010-09-25 17:10:33 +00:00
Tom Hacohen f1f122bd72 Edje entry: Fixed a lot of formatting issues. Patch by Jihoon Kim.
SVN revision: 52461
2010-09-19 08:08:17 +00:00
Carsten Haitzler 2303255182 dont get item anchors so often!
SVN revision: 52187
2010-09-13 12:08:19 +00:00
Tom Hacohen 527a3f3579 Edje entry: Fixed a selection bug with IMF enabled and fix a couple of indentation issues, and a saftey check.
Patch by Jihoon Kim.

SVN revision: 52165
2010-09-12 08:15:35 +00:00
Tom Hacohen 3e1ddfdbad Edje entry: fix the usage of the new evas_textblock_cursor_geometry_get function.
SVN revision: 51980
2010-09-08 07:29:00 +00:00
Brett Nash 4bf9ee3df3 Merge branch 'elmdnd'
Conflicts:
	trunk/TMP/st/elementary/.gitignore

SVN revision: 51935
2010-09-07 06:56:16 +00:00
Tom Hacohen b12585ec57 Edje entry: started using the new evas_textblock_cursor_content_get.
SVN revision: 51899
2010-09-05 08:29:52 +00:00
Tom Hacohen 7258468265 Edje entry: Enabled Ecore_IMF.
Fixed formatting issues.
Fixed typos.
Fixed clearing of selection when pressing a key in a software keyboard.
Patch by Jihoon Kim and small adjustments by myself. Thanks a lot.

SVN revision: 51897
2010-09-05 07:20:47 +00:00
Tom Hacohen 87d2c74d3e Edje entry: Fixed setting cursor on mouse click.
SVN revision: 51841
2010-09-02 13:52:14 +00:00
Tom Hacohen ffe4d9bbe2 Edje entry: Started using evas_textblock_cursor_geometry_get for cursor position instead of char_geometry_get.
SVN revision: 51835
2010-09-02 11:50:52 +00:00
Tom Hacohen 293692f2ba Edje entry: Fixed drawing of anchors.
SVN revision: 51647
2010-08-25 14:54:08 +00:00
Lucas De Marchi 5a8a8c9014 Convert (hopefully) all comparisons to NULL
Apply badzero.cocci, badnull.coci and badnull2.cocci

This should convert all cases where there's a comparison to NULL to simpler
forms. This patch applies the following transformations:

code before patch               ||code after patch
===============================================================

return a == NULL;                 return !a;

return a != NULL;                 return !!a;

func(a == NULL);                  func(!a);

func(a != NULL);                  func(!!a);

b = a == NULL;                    b = !a;

b = a != NULL;                    b = !!a;

b = a == NULL ? c : d;            b = !a ? c : d;

b = a != NULL ? c : d;            b = a ? c : d;


other cases:

a == NULL                         !a
a != NULL                         a




SVN revision: 51487
2010-08-21 13:52:25 +00:00
Christopher Michael 251834fcd1 Add UNUSED where needed.
Cleanup some formatting.



SVN revision: 51398
2010-08-19 14:57:23 +00:00
Cedric BAIL b6f316407f * edje: less warnings by Albin Tonnerre.
SVN revision: 51249
2010-08-17 12:15:04 +00:00
Cedric BAIL 2623367732 * edje: fix some memleak issue.
SVN revision: 51033
2010-08-12 12:58:54 +00:00
Tom Hacohen 3f26549b17 Edje: Fixed going to the start of the line.
SVN revision: 50989
2010-08-11 09:40:21 +00:00
Tom Hacohen f0a716f970 Edje: Fixed edje_object_part_text_cursor_content_get to handle non-english.
Thanks to Brian Wang for reporting.

SVN revision: 50953
2010-08-10 07:16:45 +00:00
Tom Hacohen 48180c9859 edje: Updated edje to conform with recent textblock changes.
'Return' now inserts a Paragraph Separator.
'Shift + Return' now inserts a New Line.

SVN revision: 50931
2010-08-09 16:25:45 +00:00
Lucas De Marchi 0a4617ae38 FORMATTING
* Remove vim modelines:
 find . -name '*.[chx]' -exec sed -i '/\/\*$/ {N;N;/ \* vim:ts/d}' \{\} \;
 find . -name '*.[chx]' -exec sed -i '/\/[\*\/] *vim:/d' \{\} \;

* Remove leading blank lines:
 find . -name '*.[cxh]' -exec sed -i '/./,$!d'

If you use vim, use this in your .vimrc:
set ts=8 sw=3 sts=8 expandtab cino=>5n-3f0^-2{2(0W1st0



SVN revision: 50816
2010-08-04 16:57:32 +00:00
Mike Blumenkrantz 31743ae6de comment out unused variables
SVN revision: 50705
2010-07-31 05:01:54 +00:00
Cedric BAIL e773bc9246 * edje: change memory layout that will become the new file format.
NOTE: I tried this change with all the apps and theme I had, but maybe
	i missed some bug. Please report any strange behaviour.


SVN revision: 50641
2010-07-29 12:02:36 +00:00
Cedric BAIL 73ac5cdc95 * edje: remove warning due to API change in Ecore.
SVN revision: 49830
2010-06-24 16:16:50 +00:00
Cedric BAIL abdf415cc5 * edje: prevent uninitialized data to spread.
WARNING: I don't know why in the first it doesn't map correctly to
	an object. So if someone with more knowledge on this piece of code
	could give it a look.


SVN revision: 49613
2010-06-10 15:37:50 +00:00
Fabiano Fidêncio 40563f8aef From: Fabiano Fidêncio <fidencio@profusion.mobi>
Changing return of Eina_Bool functions that were not EINA_TRUE or
EINA_FALSE in Edje.



SVN revision: 49469
2010-06-05 13:07:08 +00:00
Carsten Haitzler cc621a2685 not fully done string insert approval cb for entry
SVN revision: 49276
2010-05-29 06:40:56 +00:00
Bruno Dilly 66c015f3cc Fix _edje_entry_cursor_end function.
This fix the issue with elementary cursor end set function.
The cursor is now after the last textblock node, and not before it, as
it was until now.



SVN revision: 49242
2010-05-27 22:18:37 +00:00
Iván Briano 0346030c17 Always allow selections for entries when select_mode is default
SVN revision: 48434
2010-04-29 19:56:59 +00:00
Carsten Haitzler 685fadf869 item provider callback... add!
SVN revision: 48329
2010-04-26 14:55:45 +00:00
Carsten Haitzler 2d349c2d7b and dont mix anchors and items - for now. for now now way to "get" all the
items. mulling over how an item href name will map to having an evas object
attached/supplied (once there, its' easy to just control the object like href
objects, selection and cursor objects are).



SVN revision: 48311
2010-04-25 13:57:41 +00:00
Carsten Haitzler 39de4a6db7 support items... yo... mostly.
SVN revision: 48307
2010-04-25 13:06:58 +00:00
Carsten Haitzler d5f84085b5 and fix up.down arrow on intermediate lines with overflow
SVN revision: 48076
2010-04-17 16:19:28 +00:00
Carsten Haitzler 7700e78d19 char wrap - click to go to end works.
SVN revision: 48074
2010-04-17 15:50:27 +00:00
Gustavo Sverzut Barbieri 71d603c360 new program action PARAM_COPY, awesome crazy stuff! :-)
Edje got a new program action called PARAM_COPY in the form:

   action: PARAM_COPY "src_part" "src_param" "dst_part" "dst_param";

This will copy the parameter "src_param" from part "src_part" to
parameter "dst_param" of part "dst_part".

So far so good, why the "crazy" in the first line? Because this also:
  * do type conversion!
  * set properties of native parts, not just EXTERNAL!

The type conversion allows one to get an integer and display that in a
text property, or get an string and convert into a float.

The set of native parts is quite simple, basically a map of Edje.h
edje_object_part_*_set(). With that one can set the string to be used
by a TEXT, or set drag page/step/size/value! (page/step increments are
not supported at the moment, if it is worth, they may be supported in
future).

Sample EDC:

{{{

  // test.edc, compile with edje_cc and run with edje_player

   externals {
      external: "elm";
   }
   collections {
      group { name: "main";
         parts {
            part { name: "bg"; type: RECT;
               description { state: "default" 0.0;
                  color: 255 255 255 255;
               }
            }
            part { name: "entry"; type: EXTERNAL;
               source: "elm/scrolled_entry";
               description { state: "default" 0.0;
                  rel2.relative: 1.0 0.5;
               }
            }
            part { name: "display"; type: TEXT;
               description { state: "default" 0.0;
                  color: 0 128 0 255;
                  rel1.relative: 0.0 0.5;
                  text { font: "Sans"; size: 16; }
               }
            }
            programs {
               program {
                  signal: "changed";
                  source: "entry";
                  action: PARAM_COPY "entry" "text" "display" "text";
               }
            }
         }
      }
   }

}}}



SVN revision: 47500
2010-03-27 01:26:10 +00:00
Carsten Haitzler 66881b93ee password mode - dont allow selections
SVN revision: 47466
2010-03-26 04:42:39 +00:00
Carsten Haitzler a3281c13be fix markup insert to be the same as normal text entry code - except given
text markup.



SVN revision: 47465
2010-03-26 04:22:30 +00:00
Carsten Haitzler b0af679619 fix entry delete.
SVN revision: 47443
2010-03-25 08:17:51 +00:00
Carsten Haitzler 82fabb0f16 bug--
SVN revision: 47275
2010-03-16 04:10:03 +00:00
Carsten Haitzler 089e7842db bug--
SVN revision: 47267
2010-03-16 00:57:04 +00:00
Carsten Haitzler 9ba5929163 bug--
SVN revision: 47232
2010-03-15 09:45:02 +00:00
Carsten Haitzler e8906368d5 and emit signals on cursor changes etc.
SVN revision: 47231
2010-03-15 03:02:14 +00:00
Carsten Haitzler 6e66ed5a65 more bug --
SVN revision: 47202
2010-03-14 12:24:54 +00:00
Carsten Haitzler 9c495f390d one more end of line cursor issue fixed.
SVN revision: 47175
2010-03-13 13:25:40 +00:00
Carsten Haitzler 557434639e we have printf debugging right now - in the middle of chasing entry issues,
so keeep this in.



SVN revision: 47133
2010-03-11 14:28:44 +00:00
Carsten Haitzler 3492583ed4 also do imf stuff on cursor fiddling api's
SVN revision: 47132
2010-03-11 10:16:32 +00:00
Carsten Haitzler d4d781227e disable the extar newline stuff... seems to be ok without. i'm sure i put it
in for a reason... hrrrm..



SVN revision: 47129
2010-03-11 08:07:55 +00:00
Carsten Haitzler cbde94b4e3 calls for entry users to use.
SVN revision: 47126
2010-03-11 06:34:20 +00:00
Carsten Haitzler c20360eaea aaaah there it is! fix 1 small bug - sel all in edje entry - more there. will
fix.



SVN revision: 47103
2010-03-10 13:32:49 +00:00
Gustavo Sverzut Barbieri 1ad4337878 proper shutdown of entries.
* must disconnect connected callbacks, particularly those to
   canvas. The object we previously connect will die anyway, but
   canvas continues alive, dispatching its
   EVAS_CALLBACK_CANVAS_FOCUS_IN and EVAS_CALLBACK_CANVAS_FOCUS_OUT,
   causing nasty segmentation faults!

 * must call _edje_clean_objects() *AFTER* the entry is shut
   down. Otherwise ed->evas will be NULL and
   evas_event_callback_del_full() will fail. I left extra checks on
   those, since this call will return the given data (in our case
   "ed") and NULL when callback connection was not found.

 * flag existence of entries and if they were already initalized and
   shutdown before, avoid redoing such work.

This fixes a stupid crash that bugged editje for a while now.



SVN revision: 46263
2010-02-17 23:43:31 +00:00
Iván Briano 4419ccc84d Move to new canvas callbacks signature
SVN revision: 46210
2010-02-16 13:43:44 +00:00
김지훈 66df4d6c61 From: 김지훈 <jihoon48.kim@samsung.com>
This is edje_entry.c patch for supporting to switch the focus of ecore_imf
when the other window is clicked.



SVN revision: 46050
2010-02-10 15:12:35 +00:00
Boris Faure 93dc9bb769 edje: remove useless code (Composing is done in xlib, in ecore_x, you need
to compile ecore with --enable-xim)

SVN revision: 45605
2010-01-26 22:34:52 +00:00
Carsten Haitzler f5fe48fe5d fix from jihoon!
SVN revision: 45425
2010-01-22 04:39:50 +00:00
Sebastian Dransfeld 3a0af1226e make clang happy
SVN revision: 45194
2010-01-15 19:57:17 +00:00
Carsten Haitzler 85bef8469a patch from sehwan@samsung.com for small issues in evas/edje
SVN revision: 45056
2010-01-12 01:50:00 +00:00
Cedric BAIL b3c373b571 * edje: Some more warning cleanup.
SVN revision: 44632
2009-12-21 16:24:39 +00:00
Cedric BAIL b32c9a3eae * edje: Add Fixed Point Math support to Edje.
You can try it by passing --enable-fixed-point to the configure. It
	will produce an ABI/API compatible Edje library that use internally
	Eina_F32p32 instead of double. It will load Eina_F32p32 instead of
	double from eet file (thanks to eet ability to convert them on the
	fly), so edje file are compatible between fixed point and floating
	point version.

	This patch touch almost all internal calc of Edje, I did test it with
	elementary_test, enlightenment and all my test apps, but it could
	certainly break some of your preferred Edje file. If you see any
	unexpected behaviour please report them to me as soon as possible.

	Note: For devs, I put few macros in edje_private.h that should now
	be used when doing calc in Edje, please use them so that Fixed Point
	doesn't break in the futur.


SVN revision: 44323
2009-12-09 15:44:54 +00:00
Carsten Haitzler 4d42a6d2db warnings--
SVN revision: 44306
2009-12-09 05:46:02 +00:00
Carsten Haitzler 6f1873f87d add lots of cursor con trol api's
SVN revision: 44087
2009-12-01 11:02:46 +00:00
Carsten Haitzler 8a202ffe04 remove excessive backspace
SVN revision: 42183
2009-09-02 12:49:09 +00:00
Vincent Torri 5fd9a46869 small cleanup
SVN revision: 41958
2009-08-24 17:20:33 +00:00
Vincent Torri 8b2bd0c079 * remove unused parameters (except in edje_lua.c, as i don't know the current status)
* remove unused variables


SVN revision: 41957
2009-08-24 16:40:42 +00:00
Carsten Haitzler 02fef22de9 move adding of events if entry only if entry part exists.
SVN revision: 41103
2009-06-18 14:01:26 +00:00
Cedric BAIL b405fecf1e * edje: Remove last set of Evas_Hash, and move to Eina_Bool.
SVN revision: 41068
2009-06-17 11:10:32 +00:00
Carsten Haitzler c3b8b4ee14 revertg big R to L patches because they break cursors and selection.... BACK
boy BACK!



SVN revision: 40783
2009-05-22 21:12:32 +00:00
Carsten Haitzler a68c953591 fix input method composition plus fuxes to match textblock
SVN revision: 40641
2009-05-14 12:53:56 +00:00
Vincent Torri b56951c385 * fix build when ecore_imf is not available. Patch by Lars Munch
* formatting


SVN revision: 40632
2009-05-13 22:11:06 +00:00
Carsten Haitzler 8758acd64d ecore_imf input method support for edjeentry - on-screen kbds only at the
moment. will fix for kbd input. no ecore_imf module tho... yet



SVN revision: 40619
2009-05-13 13:29:30 +00:00
Carsten Haitzler 75e9c7fa98 fix calc - do not reset calc_only flag! it wanst set by the calc_do!
SVN revision: 40326
2009-04-23 12:42:53 +00:00
Carsten Haitzler 338881b454 edje explicit selection mode is saner now. done - for now. workable.
SVN revision: 39628
2009-03-22 13:50:53 +00:00
Carsten Haitzler 4218f905f5 add more util calls for enty manipulation
SVN revision: 39600
2009-03-20 15:07:39 +00:00
Carsten Haitzler 2afadb527b working on edje entry to allow more selection controls. not 100% done yet.
SVN revision: 39578
2009-03-19 13:36:10 +00:00
Gustavo Sverzut Barbieri bddbbbb8a5 Fix null dereference.
By Luis Felipe Strano, spotted by clang.



SVN revision: 39560
2009-03-18 21:27:38 +00:00
Carsten Haitzler c2f8ca5ccd fix copy & paste bug!
SVN revision: 39022
2009-02-15 02:55:56 +00:00
Carsten Haitzler 71bd02f251 changed signal on backspace
SVN revision: 38807
2009-01-27 06:17:35 +00:00
Jaime Thomas 81c3548670 Actually, this is probably what was intended.
SVN revision: 38145
2008-12-14 17:09:46 +00:00
Jaime Thomas 364c05f124 Let mouse selections work again.
SVN revision: 38144
2008-12-14 17:07:51 +00:00
Gustavo Sverzut Barbieri 2f8f874b20 Shut up a bunch of warnings and fix some real errors.
SVN revision: 37954
2008-12-06 03:08:17 +00:00
Carsten Haitzler 44c07b8fc9 middle mouse does a paste request now.. unix stylin'
SVN revision: 37705
2008-11-19 06:22:12 +00:00
Carsten Haitzler 965b3be9db fix selection get
SVN revision: 37703
2008-11-19 02:14:50 +00:00
Carsten Haitzler d5bc0e8546 add calls to select all/none
SVN revision: 37700
2008-11-18 08:45:27 +00:00
Carsten Haitzler a867b99db0 make click below text put cursor at end
SVN revision: 37690
2008-11-17 06:17:09 +00:00
Carsten Haitzler 38f06f34e8 track subobjs (used by entry only for now) and emit signals to them too
SVN revision: 37688
2008-11-17 05:54:01 +00:00
Carsten Haitzler 5813cfd630 leak--
SVN revision: 37262
2008-10-28 04:58:39 +00:00
Vincent Torri 0d8b00fdeb * move standard header files to source files
* remove gendoc


SVN revision: 37158
2008-10-26 17:18:19 +00:00
Carsten Haitzler 18c8160744 ret null - not nothing.
SVN revision: 37131
2008-10-26 11:04:53 +00:00
Carsten Haitzler f14804f514 fix leak in entry anchors
SVN revision: 37083
2008-10-25 02:14:48 +00:00
Sebastian Dransfeld 71f14d8463 formatting
SVN revision: 37045
2008-10-24 07:08:08 +00:00