},
[CNP_ATOM_UTF8STRING] = {
"UTF8_STRING",
- ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP,
+ ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
text_converter,
NULL,
notify_handler_text,
},
[CNP_ATOM_STRING] = {
"STRING",
- ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP,
+ ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
text_converter,
NULL,
notify_handler_text,
},
[CNP_ATOM_TEXT] = {
"TEXT",
- ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP,
+ ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
text_converter,
NULL,
NULL,
},
[CNP_ATOM_text_plain_utf8] = {
"text/plain;charset=ut-8",
- ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP,
+ ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
text_converter,
NULL,
NULL,
},
[CNP_ATOM_text_plain] = {
"text/plain",
- ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP,
+ ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
text_converter,
NULL,
NULL,
if ((unsigned int)selection >= (unsigned int)ELM_SEL_MAX) return EINA_FALSE;
if (!_elm_cnp_init_count) _elm_cnp_init();
- if (!selbuf && format != ELM_SEL_FORMAT_IMAGE)
+ if ((!selbuf) && (format != ELM_SEL_FORMAT_IMAGE))
return elm_selection_clear(selection, widget);
sel = selections + selection;
sel = selections + selection;
/* No longer this selection: Consider it gone! */
- if (!sel->active || sel->widget != widget) return EINA_TRUE;
+ if ((!sel->active) || (sel->widget != widget)) return EINA_TRUE;
sel->active = 0;
sel->widget = NULL;
for (i = 0 ; i < CNP_N_ATOMS ; i ++)
{
- if (strcmp(ev->target, atoms[i].name) == 0)
+ if (!strcmp(ev->target, atoms[i].name))
{
if (atoms[i].notify){
cnp_debug("Found something: %s\n", atoms[i].name);
}
static Eina_Bool
-png_converter(char *target __UNUSED__, void *data, int size,
- void **data_ret __UNUSED__, int *size_ret __UNUSED__,
- Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
+png_converter(char *target __UNUSED__, void *data __UNUSED__,
+ int size __UNUSED__, void **data_ret __UNUSED__,
+ int *size_ret __UNUSED__, Ecore_X_Atom *ttype __UNUSED__,
+ int *typesize __UNUSED__)
{
cnp_debug("Png converter called\n");
return EINA_TRUE;
if (!(atoms[j].formats & sel->requestformat)) continue;
for (i = 0 ; i < targets->data.length ; i ++)
{
- if (atoms[j].atom == atomlist[i] && atoms[j].notify)
+ if ((atoms[j].atom == atomlist[i]) && (atoms[j].notify))
{
cnp_debug("Atom %s matches\n",atoms[j].name);
goto done;
if (!(atoms[j].formats & sel->requestformat)) continue;
for (i = 0 ; i < targets->data.length ; i ++)
{
- if (atoms[j].atom == atomlist[i] && atoms[j].response){
+ if ((atoms[j].atom == atomlist[i]) && (atoms[j].response)){
/* Found a match: Use it */
goto found;
}
return 0;
}
cnp_debug("Got %s\n",p);
- if (strncmp(p,"file://",7) != 0)
+ if (strncmp(p, "file://", 7))
{
/* Try and continue if it looks sane */
if (*p != '/') return 0;
else
p += strlen("file://");
- if (!strstr(p,".png") && !strstr(p,".jpg"))
+ if ((!strstr(p,".png")) && (!strstr(p,".jpg")))
{
cnp_debug("No png, ignoring\n");
if (savedtypes.textreq) savedtypes.textreq = 0;
sel = selections + *(int *)data;
if (!sel->active) return EINA_TRUE;
- if (sel->format == ELM_SEL_FORMAT_MARKUP){
+ if (sel->format == ELM_SEL_FORMAT_MARKUP ||
+ sel->format == ELM_SEL_FORMAT_HTML)
+ {
*data_ret = remove_tags(sel->selbuf, size_ret);
- } else if (sel->format == ELM_SEL_FORMAT_TEXT || sel->format == ELM_SEL_FORMAT_HTML){
+ }
+ else if (sel->format == ELM_SEL_FORMAT_TEXT)
+ {
*data_ret = strdup(sel->selbuf);
*size_ret = strlen(sel->selbuf);
- } else if (sel->format == ELM_SEL_FORMAT_IMAGE){
+ }
+ else if (sel->format == ELM_SEL_FORMAT_IMAGE)
+ {
cnp_debug("Image %s\n",evas_object_type_get(sel->widget));
cnp_debug("Elm type: %s\n",elm_object_widget_type_get(sel->widget));
evas_object_image_file_get(elm_photocam_internal_image_get(sel->widget), (const char **)data_ret, NULL);
if (!*data_ret) *data_ret = strdup("No file");
else *data_ret = strdup(*data_ret);
*size_ret = strlen(*data_ret);
- }
+ }
return EINA_TRUE;
}
EINA_LIST_FOREACH(pastedimages, l, pi)
{
cnp_debug("is it %s?\n",pi->tag);
- if (strcmp(pi->tag,item) == 0){
+ if (!strcmp(pi->tag, item)){
/* Found it */
Evas_Object *o;
o = evas_object_image_filled_add(evas_object_evas_get(entry));
if (!entry) return false;
type = elm_widget_type_get(entry);
printf("type is %s\n",type);
- if (!type || strcmp(type,"entry") != 0) return false;
+ if ((!type) || (strcmp(type, "entry"))) return false;
v = evas_object_data_get(entry, PROVIDER_SET);
if (!v)
while (*p)
{
- if (*p != '<' && *p != '&'){
+ if ((*p != '<') && (*p != '&')){
*q ++ = *p ++;
} else if (*p == '<') {
- if (p[1] == 'b' && p[2] == 'r' &&
- (p[3] == ' ' || p[3] == '/' || p[3] == '>'))
+ if ((p[1] == 'b') && (p[2] == 'r') &&
+ ((p[3] == ' ') || (p[3] == '/') || (p[3] == '>')))
*q++ = '\n';
- while (*p && *p != '>') p ++;
+ while ((*p) && (*p != '>')) p ++;
p ++;
} else if (*p == '&') {
p ++;
if (inlen >= 0)
endp = start + inlen;
/* First pass: Count characters */
- for (l = 0, p = start ; (!endp || (p < endp)) && *p ; p ++)
+ for (l = 0, p = start ; ((!endp) || (p < endp)) && (*p) ; p ++)
{
for (i = 0 ; i < N_ESCAPES ; i ++)
{
static Eina_Bool
-_dnd_enter(void *data, int etype, void *ev)
+_dnd_enter(void *data __UNUSED__, int etype __UNUSED__, void *ev)
{
Ecore_X_Event_Xdnd_Enter *enter = ev;
int i;
/* Skip it */
- if (!enter || !enter->num_types || !enter->types) return EINA_TRUE;
+ if ((!enter) || (!enter->num_types) || (!enter->types)) return EINA_TRUE;
cnp_debug("Types\n");
savedtypes.ntypes = enter->num_types;
}
static Eina_Bool
-_dnd_drop(void *data, int etype, void *ev)
+_dnd_drop(void *data __UNUSED__, int etype __UNUSED__, void *ev)
{
struct _Ecore_X_Event_Xdnd_Drop *drop;
struct dropable *dropable;
break;
}
/* didn't find a window */
- if (l == NULL)
+ if (!l)
return true;
{
dropable = l->data;
evas_object_geometry_get(dropable->obj, &x, &y, &w, &h);
- if (savedtypes.x >= x && savedtypes.y >= y &&
- savedtypes.x < x + w && savedtypes.y < y + h)
+ if ((savedtypes.x >= x) && (savedtypes.y >= y) &&
+ (savedtypes.x < x + w) && (savedtypes.y < y + h))
break; /* found! */
}
{
for (j = 0 ; j < savedtypes.ntypes ; j ++)
{
- if (strcmp(savedtypes.types[j], atoms[i].name) == 0)
+ if (!strcmp(savedtypes.types[j], atoms[i].name))
{
goto found;
}
return true;
}
static Eina_Bool
-_dnd_position(void *data, int etype, void *ev)
+_dnd_position(void *data __UNUSED__, int etype __UNUSED__, void *ev)
{
struct _Ecore_X_Event_Xdnd_Position *pos;
Ecore_X_Rectangle rect;
* appropriately.
*/
static Eina_Bool
-_dnd_status(void *data, int etype, void *ev)
+_dnd_status(void *data __UNUSED__, int etype __UNUSED__, void *ev)
{
struct _Ecore_X_Event_Xdnd_Status *status = ev;
if (!_elm_cnp_init_count) _elm_cnp_init();
/* Is this the first? */
- first = (drops == NULL) ? 1 : 0;
+ first = (!drops) ? 1 : 0;
drop = calloc(1,sizeof(struct dropable));
if (!drop) return false;
(Evas_Object_Event_Cb)elm_drop_target_del);
free(drop);
/* If still drops there: All fine.. continue */
- if (drops != NULL) return true;
+ if (drops) return true;
cnp_debug("Disabling DND\n");
xwin = (Ecore_X_Window)ecore_evas_window_get(ecore_evas_ecore_evas_get(
static void
-_drag_mouse_up(void *un, Evas *e, Evas_Object *obj, void *data)
+_drag_mouse_up(void *un __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *data __UNUSED__)
{
evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_UP, _drag_mouse_up);
ecore_x_dnd_drop();
static struct tmpinfo *
elm_cnp_tempfile_create(int size){
struct tmpinfo *info;
- char *tmppath;
+ const char *tmppath;
int len;
info = malloc(sizeof(struct tmpinfo));