forked from enlightenment/efl
ecore_cocoa: simplify clipboard functions naming
ecore_cocoa_selection_clipboard_xxxx() have been renamed into ecore_cocoa_clipboard_xxxx() and they have nothing to do with selection, only with clipboard. Since the API is not stable yet, I can change it.
This commit is contained in:
parent
7ada74abcd
commit
f53a739e0e
|
@ -472,7 +472,7 @@ EAPI Ecore_Cocoa_Object *ecore_cocoa_window_get(const Ecore_Cocoa_Window *window
|
||||||
* @param type
|
* @param type
|
||||||
* @return EINA_TRUE on success, EINA_FALSE on failure
|
* @return EINA_TRUE on success, EINA_FALSE on failure
|
||||||
*/
|
*/
|
||||||
EAPI Eina_Bool ecore_cocoa_selection_clipboard_set(const void *data,
|
EAPI Eina_Bool ecore_cocoa_clipboard_set(const void *data,
|
||||||
int size,
|
int size,
|
||||||
Ecore_Cocoa_Cnp_Type type);
|
Ecore_Cocoa_Cnp_Type type);
|
||||||
|
|
||||||
|
@ -487,15 +487,15 @@ EAPI Eina_Bool ecore_cocoa_selection_clipboard_set(const void *data,
|
||||||
* @c retrieved_types will contain ECORE_COCOA_CNP_TYPE_STRING and the data
|
* @c retrieved_types will contain ECORE_COCOA_CNP_TYPE_STRING and the data
|
||||||
* will be a C string (char*) that must be freed after use.
|
* will be a C string (char*) that must be freed after use.
|
||||||
*/
|
*/
|
||||||
EAPI void *ecore_cocoa_selection_clipboard_get(int *size,
|
EAPI void *ecore_cocoa_clipboard_get(int *size,
|
||||||
Ecore_Cocoa_Cnp_Type type,
|
Ecore_Cocoa_Cnp_Type type,
|
||||||
Ecore_Cocoa_Cnp_Type *retrieved_types)
|
Ecore_Cocoa_Cnp_Type *retrieved_types)
|
||||||
EINA_WARN_UNUSED_RESULT;
|
EINA_WARN_UNUSED_RESULT;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Deletes the contents of the Cocoa clipboard
|
* Deletes the contents of the Cocoa clipboard
|
||||||
*/
|
*/
|
||||||
EAPI void ecore_cocoa_selection_clipboard_clear(void);
|
EAPI void ecore_cocoa_clipboard_clear(void);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the Cocoa cursor for a given Cocoa window
|
* Set the Cocoa cursor for a given Cocoa window
|
||||||
|
|
|
@ -10,9 +10,9 @@
|
||||||
#import "ecore_cocoa_app.h"
|
#import "ecore_cocoa_app.h"
|
||||||
|
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
ecore_cocoa_selection_clipboard_set(const void *data,
|
ecore_cocoa_clipboard_set(const void *data,
|
||||||
int size,
|
int size,
|
||||||
Ecore_Cocoa_Cnp_Type type)
|
Ecore_Cocoa_Cnp_Type type)
|
||||||
{
|
{
|
||||||
NSMutableArray *objects;
|
NSMutableArray *objects;
|
||||||
NSString *str = nil;
|
NSString *str = nil;
|
||||||
|
@ -62,9 +62,9 @@ ecore_cocoa_selection_clipboard_set(const void *data,
|
||||||
|
|
||||||
|
|
||||||
EAPI void *
|
EAPI void *
|
||||||
ecore_cocoa_selection_clipboard_get(int *size,
|
ecore_cocoa_clipboard_get(int *size,
|
||||||
Ecore_Cocoa_Cnp_Type type,
|
Ecore_Cocoa_Cnp_Type type,
|
||||||
Ecore_Cocoa_Cnp_Type *retrieved_types)
|
Ecore_Cocoa_Cnp_Type *retrieved_types)
|
||||||
{
|
{
|
||||||
NSMutableArray *classes;
|
NSMutableArray *classes;
|
||||||
void *data;
|
void *data;
|
||||||
|
@ -167,7 +167,7 @@ fail:
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
ecore_cocoa_selection_clipboard_clear(void)
|
ecore_cocoa_clipboard_clear(void)
|
||||||
{
|
{
|
||||||
[[NSPasteboard generalPasteboard] clearContents];
|
[[NSPasteboard generalPasteboard] clearContents];
|
||||||
}
|
}
|
||||||
|
|
|
@ -4059,7 +4059,7 @@ _job_pb_cb(void *data)
|
||||||
|
|
||||||
/* Pass to cocoa clipboard */
|
/* Pass to cocoa clipboard */
|
||||||
type = _elm_sel_format_to_ecore_cocoa_cnp_type(sel->requestformat);
|
type = _elm_sel_format_to_ecore_cocoa_cnp_type(sel->requestformat);
|
||||||
pbdata = ecore_cocoa_selection_clipboard_get(&pbdata_len, type, &get_type);
|
pbdata = ecore_cocoa_clipboard_get(&pbdata_len, type, &get_type);
|
||||||
|
|
||||||
ddata.format = ELM_SEL_FORMAT_NONE;
|
ddata.format = ELM_SEL_FORMAT_NONE;
|
||||||
if (get_type & ECORE_COCOA_CNP_TYPE_STRING)
|
if (get_type & ECORE_COCOA_CNP_TYPE_STRING)
|
||||||
|
@ -4123,7 +4123,7 @@ _cocoa_elm_cnp_selection_set(Ecore_Cocoa_Window *win,
|
||||||
sel->selbuf[buflen] = 0;
|
sel->selbuf[buflen] = 0;
|
||||||
sel->buflen = buflen;
|
sel->buflen = buflen;
|
||||||
type = _elm_sel_format_to_ecore_cocoa_cnp_type(format);
|
type = _elm_sel_format_to_ecore_cocoa_cnp_type(format);
|
||||||
ecore_cocoa_selection_clipboard_set(selbuf, buflen, type);
|
ecore_cocoa_clipboard_set(selbuf, buflen, type);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ok;
|
return ok;
|
||||||
|
@ -4160,7 +4160,7 @@ _cocoa_elm_cnp_selection_clear(Evas_Object *obj EINA_UNUSED,
|
||||||
sel->loss_data = NULL;
|
sel->loss_data = NULL;
|
||||||
ELM_SAFE_FREE(sel->selbuf, free);
|
ELM_SAFE_FREE(sel->selbuf, free);
|
||||||
sel->buflen = 0;
|
sel->buflen = 0;
|
||||||
ecore_cocoa_selection_clipboard_clear();
|
ecore_cocoa_clipboard_clear();
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue