bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm_test: Fixed formatting. tab to space. 

Changed tab to space before working on the code.
Kinda surprised by the number of tabs we had.
This commit is contained in:
Daniel Juyung Seo 2013-10-14 14:40:35 +09:00
parent 1c13965658
commit 6397761c6a
28 changed files with 264 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/elementary/src/bin/elementary_codegen.c
View File

@ -100,10 +100,10 @@ static FILE *header_fd = NULL;
" return elm_layout_content_unset(o, \"%s\");\n" \
"}\n\n"
#define H_CODEGEN_PART_CONTENT_SET \
#define H_CODEGEN_PART_CONTENT_SET \
"void %s_%s_set(Evas_Object *o, Evas_Object *value);\n"
#define H_CODEGEN_PART_TEXT_SET \
#define H_CODEGEN_PART_TEXT_SET \
"void %s_%s_set(Evas_Object *o, const char *value);\n"
#define H_CODEGEN_PART_CONTENT_UNSET \
@ -116,7 +116,7 @@ static FILE *header_fd = NULL;
" return elm_layout_content_get(o, \"%s\");\n" \
"}\n\n"
#define H_CODEGEN_PART_CONTENT_GET \
#define H_CODEGEN_PART_CONTENT_GET \
"Evas_Object *%s_%s_get(const Evas_Object *o);\n"
#define C_CODEGEN_PART_TEXT_GET \
@ -126,7 +126,7 @@ static FILE *header_fd = NULL;
" return elm_layout_text_get(o, \"%s\");\n" \
"}\n\n"
#define H_CODEGEN_PART_TEXT_GET \
#define H_CODEGEN_PART_TEXT_GET \
"const char *%s_%s_get(const Evas_Object *o);\n"
#define C_CODEGEN_PART_BOX_APPEND \
@ -234,7 +234,7 @@ static FILE *header_fd = NULL;
" elm_layout_signal_emit(o, \"%s\", \"%s\");\n" \
"}\n\n"
#define H_CODEGEN_PROGRAM_EMIT \
#define H_CODEGEN_PROGRAM_EMIT \
"void %s_%s_emit(Evas_Object *o);\n"
#define C_CODEGEN_PROGRAM_CALLBACK_ADD \

4
legacy/elementary/src/bin/elm_prefs_cc_handlers.c
View File

@ -241,9 +241,9 @@ static void st_collection_page_autosave(void);
@li SWALLOW - Swallows an Evas_Object.
@li SAVE - Button that will get all the values bounded to items and
save it on CFG file.
@li ACTION - Button that will emit a signal to .C file and call a
@li ACTION - Button that will emit a signal to .C file and call a
smart callback.
@li RESET - Button that will return all the values bounded to items
@li RESET - Button that will return all the values bounded to items
as default declared on .EPC file.
@endproperty

6
legacy/elementary/src/bin/elm_prefs_cc_parse.c
View File

@ -925,10 +925,10 @@ check_min_arg_count(int min_required_args)
if (num_args < min_required_args)
{
ERR("%s:%i got %i arguments, but expected at least %i",
file_in, line - 1, num_args, min_required_args);
ERR("%s:%i got %i arguments, but expected at least %i",
file_in, line - 1, num_args, min_required_args);
err_show();
exit(-1);
exit(-1);
}
}

82
legacy/elementary/src/bin/quicklaunch.c
View File

@ -66,8 +66,8 @@ post_fork(void *data EINA_UNUSED)
sigaction(SIGABRT, &old_sigabrt, NULL);
if ((_log_dom > -1) && (_log_dom != EINA_LOG_DOMAIN_GLOBAL))
{
eina_log_domain_unregister(_log_dom);
_log_dom = -1;
eina_log_domain_unregister(_log_dom);
_log_dom = -1;
}
}
@ -87,8 +87,8 @@ crash_handler(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UN
t = ecore_time_get();
if ((t - restart_time) <= 2.0)
{
CRITICAL("crash too fast - less than 2 seconds. abort restart");
exit(-1);
CRITICAL("crash too fast - less than 2 seconds. abort restart");
exit(-1);
}
ecore_app_restart();
}
@ -170,15 +170,15 @@ main(int argc, char **argv)
if (!eina_init())
{
fprintf(stderr, "ERROR: failed to init eina.");
exit(-1);
fprintf(stderr, "ERROR: failed to init eina.");
exit(-1);
}
_log_dom = eina_log_domain_register
("elementary_quicklaunch", EINA_COLOR_CYAN);
("elementary_quicklaunch", EINA_COLOR_CYAN);
if (_log_dom < 0)
{
EINA_LOG_ERR("could not register elementary_quicklaunch log domain.");
_log_dom = EINA_LOG_DOMAIN_GLOBAL;
EINA_LOG_ERR("could not register elementary_quicklaunch log domain.");
_log_dom = EINA_LOG_DOMAIN_GLOBAL;
}
if (!(disp = getenv("DISPLAY"))) disp = "unknown";
@ -197,37 +197,37 @@ main(int argc, char **argv)
sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (sock < 0)
{
CRITICAL("cannot create socket for socket for '%s': %s",
buf, strerror(errno));
exit(-1);
CRITICAL("cannot create socket for socket for '%s': %s",
buf, strerror(errno));
exit(-1);
}
if (fcntl(sock, F_SETFD, FD_CLOEXEC) < 0)
{
CRITICAL("cannot set close on exec socket for '%s' (fd=%d): %s",
buf, sock, strerror(errno));
exit(-1);
CRITICAL("cannot set close on exec socket for '%s' (fd=%d): %s",
buf, sock, strerror(errno));
exit(-1);
}
lin.l_onoff = 1;
lin.l_linger = 0;
if (setsockopt(sock, SOL_SOCKET, SO_LINGER, &lin, sizeof(struct linger)) < 0)
{
CRITICAL("cannot set linger for socket for '%s' (fd=%d): %s",
buf, sock, strerror(errno));
exit(-1);
CRITICAL("cannot set linger for socket for '%s' (fd=%d): %s",
buf, sock, strerror(errno));
exit(-1);
}
socket_unix.sun_family = AF_UNIX;
strncpy(socket_unix.sun_path, buf, sizeof(socket_unix.sun_path));
socket_unix_len = LENGTH_OF_SOCKADDR_UN(&socket_unix);
if (bind(sock, (struct sockaddr *)&socket_unix, socket_unix_len) < 0)
{
CRITICAL("cannot bind socket for '%s' (fd=%d): %s",
buf, sock, strerror(errno));
exit(-1);
CRITICAL("cannot bind socket for '%s' (fd=%d): %s",
buf, sock, strerror(errno));
exit(-1);
}
if (listen(sock, 4096) < 0)
{
CRITICAL("listen(sock=%d, 4096): %s", sock, strerror(errno));
exit(-1);
CRITICAL("listen(sock=%d, 4096): %s", sock, strerror(errno));
exit(-1);
}
elm_quicklaunch_mode_set(EINA_TRUE);
elm_quicklaunch_init(argc, argv);
@ -314,32 +314,32 @@ main(int argc, char **argv)
for (;;)
{
int fd;
struct sockaddr_un client;
socklen_t len;
int fd;
struct sockaddr_un client;
socklen_t len;
len = sizeof(struct sockaddr_un);
fd = accept(sock, (struct sockaddr *)&client, &len);
elm_quicklaunch_sub_init(argc, argv);
// don't seed since we are doing this AFTER launch request
// elm_quicklaunch_seed();
if (fd >= 0)
{
unsigned long bytes;
int num;
len = sizeof(struct sockaddr_un);
fd = accept(sock, (struct sockaddr *)&client, &len);
elm_quicklaunch_sub_init(argc, argv);
// don't seed since we are doing this AFTER launch request
// elm_quicklaunch_seed();
if (fd >= 0)
{
unsigned long bytes;
int num;
num = read(fd, &bytes, sizeof(unsigned long));
if (num == sizeof(unsigned long))
num = read(fd, &bytes, sizeof(unsigned long));
if (num == sizeof(unsigned long))
handle_run(fd, bytes);
}
while (elm_quicklaunch_sub_shutdown() > 0);
}
while (elm_quicklaunch_sub_shutdown() > 0);
}
elm_quicklaunch_shutdown();
if ((_log_dom > -1) && (_log_dom != EINA_LOG_DOMAIN_GLOBAL))
{
eina_log_domain_unregister(_log_dom);
_log_dom = -1;
eina_log_domain_unregister(_log_dom);
_log_dom = -1;
}
eina_shutdown();

154
legacy/elementary/src/bin/run.c
View File

@ -41,16 +41,16 @@ main(int argc, char **argv)
if (!getcwd(buf, sizeof(buf) - 1))
{
fprintf(stderr, "elementary_quicklaunch: currect working dir too big.\n");
exit(-1);
fprintf(stderr, "elementary_quicklaunch: currect working dir too big.\n");
exit(-1);
}
cwd = strdup(buf);
if (!(disp = getenv("DISPLAY"))) disp = "unknown";
snprintf(buf, sizeof(buf), "/tmp/elm-ql-%i/%s", getuid(), disp);
if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
{
perror("elementary_quicklaunch: socket(AF_UNIX, SOCK_STREAM, 0)");
exit(-1);
perror("elementary_quicklaunch: socket(AF_UNIX, SOCK_STREAM, 0)");
exit(-1);
}
socket_unix.sun_family = AF_UNIX;
strncpy(socket_unix.sun_path, buf, sizeof(socket_unix.sun_path));
@ -58,85 +58,85 @@ main(int argc, char **argv)
socket_unix_len = LENGTH_OF_SOCKADDR_UN(&socket_unix);
if (connect(sock, (struct sockaddr *)&socket_unix, socket_unix_len) < 0)
{
perror("elementary_quicklaunch: connect(sock, (struct sockaddr *)&socket_unix, socket_unix_len)");
printf("elementary_quicklaunch: cannot connect to socket '%s'\n", buf);
exit(1);
perror("elementary_quicklaunch: connect(sock, (struct sockaddr *)&socket_unix, socket_unix_len)");
printf("elementary_quicklaunch: cannot connect to socket '%s'\n", buf);
exit(1);
}
exe = argv[0];
if (!(((exe[0] == '/')) ||
((exe[0] == '.') && (exe[1] == '/')) ||
((exe[0] == '.') && (exe[1] == '.') && (exe[2] == '/'))))
((exe[0] == '.') && (exe[1] == '/')) ||
((exe[0] == '.') && (exe[1] == '.') && (exe[2] == '/'))))
{
char *path = getenv("PATH");
int exelen = strlen(argv[0]);
if (path)
{
const char *p, *pp;
char *path = getenv("PATH");
int exelen = strlen(argv[0]);
if (path)
{
const char *p, *pp;
p = path;
pp = p;
exe = NULL;
for (;;)
{
if ((*p == ':') || (!*p))
{
unsigned int len;
p = path;
pp = p;
exe = NULL;
for (;;)
{
if ((*p == ':') || (!*p))
{
unsigned int len;
len = p - pp;
if (len < (sizeof(buf) - exelen - 3))
{
strncpy(buf, pp, len);
strcpy(buf + len, "/");
strcpy(buf + len + 1, argv[0]);
if (!access(buf, R_OK | X_OK))
{
exe = buf;
break;
}
if (!*p) break;
p++;
pp = p;
}
}
else
{
if (!*p) break;
p++;
}
}
}
len = p - pp;
if (len < (sizeof(buf) - exelen - 3))
{
strncpy(buf, pp, len);
strcpy(buf + len, "/");
strcpy(buf + len + 1, argv[0]);
if (!access(buf, R_OK | X_OK))
{
exe = buf;
break;
}
if (!*p) break;
p++;
pp = p;
}
}
else
{
if (!*p) break;
p++;
}
}
}
}
if (exe)
{
if (!lstat(exe, &st))
{
if (S_ISLNK(st.st_mode))
{
char buf2[PATH_MAX];
if (!lstat(exe, &st))
{
if (S_ISLNK(st.st_mode))
{
char buf2[PATH_MAX];
ssize_t len = readlink(exe, buf2, sizeof(buf2) - 1);
if (len >= 0)
{
char *p;
buf2[len] = 0;
p = strrchr(buf2, '/');
if (p) p++;
else p = buf2;
if (!strncasecmp(p, "elementary_run", 14))
we_are_elementary_run = 1;
}
}
}
ssize_t len = readlink(exe, buf2, sizeof(buf2) - 1);
if (len >= 0)
{
char *p;
buf2[len] = 0;
p = strrchr(buf2, '/');
if (p) p++;
else p = buf2;
if (!strncasecmp(p, "elementary_run", 14))
we_are_elementary_run = 1;
}
}
}
}
if (we_are_elementary_run)
{
sargc = argc;
sargv = argv;
sargc = argc;
sargv = argv;
}
else
{
sargc = argc - 1;
sargv = &(argv[1]);
sargc = argc - 1;
sargv = &(argv[1]);
}
slen = 0;
@ -150,16 +150,16 @@ main(int argc, char **argv)
for (i = 0; i < sargc; i++)
{
slen += sizeof(unsigned long);
slen += strlen(sargv[i]) + 1;
slen += sizeof(unsigned long);
slen += strlen(sargv[i]) + 1;
}
#ifdef HAVE_ENVIRON
// count how much space is needed for environment
for (i = 0; environ[i]; i++)
{
slen += sizeof(unsigned long);
slen += strlen(environ[i]) + 1;
slen += sizeof(unsigned long);
slen += strlen(environ[i]) + 1;
envnum++;
}
#endif
@ -182,9 +182,9 @@ main(int argc, char **argv)
// fill in args
for (i = 0; i < sargc; i++)
{
((unsigned long *)(sbuf))[n] = (unsigned long)pos - (unsigned long)sbuf;
strcpy((char *)pos, sargv[i]);
pos += strlen(sargv[i]) + 1;
((unsigned long *)(sbuf))[n] = (unsigned long)pos - (unsigned long)sbuf;
strcpy((char *)pos, sargv[i]);
pos += strlen(sargv[i]) + 1;
n++;
}
@ -192,9 +192,9 @@ main(int argc, char **argv)
// fill in environ
for (i = 0; environ[i]; i++)
{
((unsigned long *)(sbuf))[n] = (unsigned long)pos - (unsigned long)sbuf;
strcpy((char *)pos, environ[i]);
pos += strlen(environ[i]) + 1;
((unsigned long *)(sbuf))[n] = (unsigned long)pos - (unsigned long)sbuf;
strcpy((char *)pos, environ[i]);
pos += strlen(environ[i]) + 1;
n++;
}
#endif

2
legacy/elementary/src/bin/test_access.c
View File

@ -51,7 +51,7 @@ Evas_Object *gl_access_content_get(void *data EINA_UNUSED, Evas_Object *obj, con
static void
gl_del(void *data, Evas_Object *obj EINA_UNUSED)
{
free(data);
free(data);
}
static Elm_Gengrid_Item_Class *gic;

2
legacy/elementary/src/bin/test_application_server.c
View File

@ -129,7 +129,7 @@ _terminate_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc
printf("terminate cb\n");
eo_do(obj, elm_app_server_save(),
elm_app_server_title_get(&title));
elm_app_server_title_get(&title));
printf("Closing: %s\n", title);
eo_unref(obj);

2
legacy/elementary/src/bin/test_gengrid.c
View File

@ -260,7 +260,7 @@ grid_state_get(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char
void
grid_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED)
{
free(data);
free(data);
}
static void

2
legacy/elementary/src/bin/test_main_menu.c
View File

@ -49,7 +49,7 @@ test_main_menu(void *data EINA_UNUSED,
{
label = elm_label_add(win);
elm_object_text_set(label, "(ELM_DISABLE_EXTERNAL_MENU environment "
"variable is set. Using local menu instead)");
"variable is set. Using local menu instead)");
evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
elm_box_pack_end(bx, label);

2
legacy/elementary/src/bin/test_map.c
View File

@ -234,7 +234,7 @@ _overlays_num_check(Evas_Object *obj)
}
}
printf("Number of (visible/total) overlays in viewport: %d/%d\n",
cnt_visible, cnt);
cnt_visible, cnt);
}
static void

4
legacy/elementary/src/bin/test_notify.c
View File

@ -95,7 +95,7 @@ test_notify(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
lb = elm_label_add(win);
elm_object_text_set(lb, "Bottom position. This notify uses a timeout of 5 sec.<br/>"
"<b>The events outside the window are blocked.</b>");
"<b>The events outside the window are blocked.</b>");
elm_box_pack_end(bx, lb);
evas_object_show(lb);
@ -357,7 +357,7 @@ test_notify(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(lb, 0.0, 0.5);
elm_object_text_set(lb, "Fill Bottom. This notify fills horizontal area.<br/>"
"<b>elm_notify_align_set(notify, ELM_NOTIFY_ALIGN_FILL, 1.0); </b>");
"<b>elm_notify_align_set(notify, ELM_NOTIFY_ALIGN_FILL, 1.0); </b>");
elm_box_pack_end(bx, lb);
evas_object_show(lb);

4
legacy/elementary/src/bin/test_photocam.c
View File

@ -219,8 +219,8 @@ _photocam_mouse_wheel_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
int _zoom = zoom;
while (_zoom>1)
{
_zoom /= 2;
val++;
_zoom /= 2;
val++;
}
elm_photocam_zoom_mode_set(photocam, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);

18
legacy/elementary/src/bin/test_scaling.c
View File

@ -80,9 +80,9 @@ test_scaling2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_object_text_set(fr, "Scale: 0.5");
lb = elm_label_add(win);
elm_object_text_set(lb,
"Parent frame scale<br/>"
"is 0.5. Child should<br/>"
"inherit it.");
"Parent frame scale<br/>"
"is 0.5. Child should<br/>"
"inherit it.");
elm_object_content_set(fr, lb);
evas_object_show(lb);
elm_box_pack_end(bx, fr);
@ -92,9 +92,9 @@ test_scaling2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_object_text_set(fr, "Scale: 1.0");
lb = elm_label_add(win);
elm_object_text_set(lb,
"Parent frame scale<br/>"
"is 1.0. Child should<br/>"
"inherit it.");
"Parent frame scale<br/>"
"is 1.0. Child should<br/>"
"inherit it.");
elm_object_content_set(fr, lb);
evas_object_show(lb);
elm_object_scale_set(fr, 1.0);
@ -105,9 +105,9 @@ test_scaling2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_object_text_set(fr, "Scale: 2.0");
lb = elm_label_add(win);
elm_object_text_set(lb,
"Parent frame scale<br/>"
"is 2.0. Child should<br/>"
"inherit it.");
"Parent frame scale<br/>"
"is 2.0. Child should<br/>"
"inherit it.");
elm_object_content_set(fr, lb);
evas_object_show(lb);
elm_object_scale_set(fr, 2.0);

4
legacy/elementary/src/bin/test_thumb.c
View File

@ -20,8 +20,8 @@ test_thumb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
"sky_03.jpg",
"sky_04.jpg",
"wood_01.jpg",
"mystrale.jpg",
"mystrale_2.jpg"
"mystrale.jpg",
"mystrale_2.jpg"
};
elm_need_ethumb();

2
legacy/elementary/src/bin/test_weather.c
View File

@ -161,7 +161,7 @@ test_weather(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
Evas_Object *lbl;
lbl = elm_label_add(win);
evas_object_size_hint_weight_set(lbl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_weight_set(lbl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, lbl);
elm_object_text_set(lbl, "libeweather is required to display the forecast.");
evas_object_show(lbl);

6
legacy/elementary/src/bin/test_win_plug.c
View File

@ -10,9 +10,9 @@ static int try_num = 0;
static void
_timer_del(void *data EINA_UNUSED,
Evas *e EINA_UNUSED,
Evas_Object *obj,
void *event_info EINA_UNUSED)
Evas *e EINA_UNUSED,
Evas_Object *obj,
void *event_info EINA_UNUSED)
{
Ecore_Timer *timer = evas_object_data_del(obj, "test-timer");
if (!timer) return;

32
legacy/elementary/src/bin/test_win_socket.c
View File

@ -70,9 +70,9 @@ fill(Evas_Object *win, Eina_Bool do_bg)
elm_entry_anchor_hover_style_set(av, "popout");
elm_entry_anchor_hover_parent_set(av, win);
elm_object_text_set(av,
"Hi there. This is the most recent message in the "
"list of messages. It has one <a href=tel:+614321234>+61 432 1234</a> "
"(phone number) to click on.");
"Hi there. This is the most recent message in the "
"list of messages. It has one <a href=tel:+614321234>+61 432 1234</a> "
"(phone number) to click on.");
elm_object_content_set(bb, av);
evas_object_show(av);
elm_box_pack_end(bx, bb);
@ -94,19 +94,19 @@ fill(Evas_Object *win, Eina_Bool do_bg)
elm_entry_anchor_hover_style_set(av, "popout");
elm_entry_anchor_hover_parent_set(av, win);
elm_object_text_set(av,
"Hey what are you doing? This is the second last message "
"Hi there. This is the most recent message in the "
"list. It's a longer one so it can wrap more and "
"contains a <a href=contact:john>John</a> contact "
"link in it to test popups on links. The idea is that "
"all SMS's are scanned for things that look like phone "
"numbers or names that are in your contacts list, and "
"if they are, they become clickable links that pop up "
"a menus of obvious actions to perform on this piece "
"of information. This of course can be later explicitly "
"done by links maybe running local apps or even being "
"web URL's too that launch the web browser and point it "
"to that URL. <item relsize=16x16 vsize=full href=emoticon/omg></item>");
"Hey what are you doing? This is the second last message "
"Hi there. This is the most recent message in the "
"list. It's a longer one so it can wrap more and "
"contains a <a href=contact:john>John</a> contact "
"link in it to test popups on links. The idea is that "
"all SMS's are scanned for things that look like phone "
"numbers or names that are in your contacts list, and "
"if they are, they become clickable links that pop up "
"a menus of obvious actions to perform on this piece "
"of information. This of course can be later explicitly "
"done by links maybe running local apps or even being "
"web URL's too that launch the web browser and point it "
"to that URL. <item relsize=16x16 vsize=full href=emoticon/omg></item>");
elm_object_content_set(bb, av);
evas_object_show(av);
elm_box_pack_end(bx, bb);

104
legacy/elementary/src/lib/elm_calendar.c
View File

@ -211,18 +211,18 @@ _set_month_year(Elm_Calendar_Smart_Data *sd)
{
char *buf;
if (sd->double_spinners) /* theme has spinner for year */
{
buf = _format_year(&sd->shown_time);
if (buf)
{
elm_layout_text_set(sd->obj, "year_text", buf);
free(buf);
}
else elm_layout_text_set(sd->obj, "year_text", "");
if (sd->double_spinners) /* theme has spinner for year */
{
buf = _format_year(&sd->shown_time);
if (buf)
{
elm_layout_text_set(sd->obj, "year_text", buf);
free(buf);
}
else elm_layout_text_set(sd->obj, "year_text", "");
buf = _format_month(&sd->shown_time);
}
buf = _format_month(&sd->shown_time);
}
else
buf = sd->format_func(&sd->shown_time);
@ -589,36 +589,36 @@ _update_data(Evas_Object *obj, Eina_Bool month,
if (month)
{
sd->shown_time.tm_mon += delta;
if (sd->shown_time.tm_mon < 0)
{
if (sd->shown_time.tm_year == sd->year_min)
{
sd->shown_time.tm_mon++;
return EINA_FALSE;
}
sd->shown_time.tm_mon = 11;
sd->shown_time.tm_year--;
}
else if (sd->shown_time.tm_mon > 11)
{
if (sd->shown_time.tm_year == sd->year_max)
{
sd->shown_time.tm_mon--;
return EINA_FALSE;
}
sd->shown_time.tm_mon = 0;
sd->shown_time.tm_year++;
}
sd->shown_time.tm_mon += delta;
if (sd->shown_time.tm_mon < 0)
{
if (sd->shown_time.tm_year == sd->year_min)
{
sd->shown_time.tm_mon++;
return EINA_FALSE;
}
sd->shown_time.tm_mon = 11;
sd->shown_time.tm_year--;
}
else if (sd->shown_time.tm_mon > 11)
{
if (sd->shown_time.tm_year == sd->year_max)
{
sd->shown_time.tm_mon--;
return EINA_FALSE;
}
sd->shown_time.tm_mon = 0;
sd->shown_time.tm_year++;
}
}
else
{
years = sd->shown_time.tm_year + delta;
if (((years > sd->year_max) && (sd->year_max != -1)) ||
years < sd->year_min)
return EINA_FALSE;
years = sd->shown_time.tm_year + delta;
if (((years > sd->year_max) && (sd->year_max != -1)) ||
years < sd->year_min)
return EINA_FALSE;
sd->shown_time.tm_year = years;
sd->shown_time.tm_year = years;
}
if ((sd->select_mode != ELM_CALENDAR_SELECT_MODE_ONDEMAND)
@ -698,9 +698,9 @@ _button_month_dec_start(void *data,
static void
_button_month_stop(void *data,
Evas_Object *obj __UNUSED__,
const char *emission __UNUSED__,
const char *source __UNUSED__)
Evas_Object *obj __UNUSED__,
const char *emission __UNUSED__,
const char *source __UNUSED__)
{
ELM_CALENDAR_DATA_GET(data, sd);
@ -710,9 +710,9 @@ _button_month_stop(void *data,
static void
_button_year_inc_start(void *data,
Evas_Object *obj __UNUSED__,
const char *emission __UNUSED__,
const char *source __UNUSED__)
Evas_Object *obj __UNUSED__,
const char *emission __UNUSED__,
const char *source __UNUSED__)
{
ELM_CALENDAR_DATA_GET(data, sd);
@ -742,9 +742,9 @@ _button_year_dec_start(void *data,
static void
_button_year_stop(void *data,
Evas_Object *obj __UNUSED__,
const char *emission __UNUSED__,
const char *source __UNUSED__)
Evas_Object *obj __UNUSED__,
const char *emission __UNUSED__,
const char *source __UNUSED__)
{
ELM_CALENDAR_DATA_GET(data, sd);
@ -923,9 +923,9 @@ _elm_calendar_smart_calculate(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA
static void
_style_changed(void *data,
Evas_Object *obj __UNUSED__,
const char *emission __UNUSED__,
const char *source __UNUSED__)
Evas_Object *obj __UNUSED__,
const char *emission __UNUSED__,
const char *source __UNUSED__)
{
ELM_CALENDAR_DATA_GET(data, sd);
@ -981,8 +981,8 @@ _elm_calendar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
(wd->resize_obj, "elm,action,selected", "*",
_day_selected, obj);
edje_object_signal_callback_add
(wd->resize_obj, "load", "*",
_style_changed, obj);
(wd->resize_obj, "load", "*",
_style_changed, obj);
for (i = 0; i < ELM_DAY_LAST; i++)
{
@ -1420,7 +1420,7 @@ _format_function_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
Elm_Calendar_Smart_Data *sd = _pd;
sd->format_func = format_function;
if (sd->double_spinners) /* theme has spinner for year */
if (sd->double_spinners) /* theme has spinner for year */
_set_month_year(sd);
}

20
legacy/elementary/src/lib/elm_conform.c
View File

@ -172,7 +172,7 @@ _conformant_part_sizing_eval(Evas_Object *obj,
{
//No information of the keyboard geometry, reset the geometry.
#ifdef __linux__
DBG("[KEYPAD]:pid=%d, xwin=0x%x, zone=0x%x: no env value and check window property.", getpid(), xwin, zone);
DBG("[KEYPAD]:pid=%d, xwin=0x%x, zone=0x%x: no env value and check window property.", getpid(), xwin, zone);
#endif
if (!ecore_x_e_illume_keyboard_geometry_get(xwin, &sx, &sy, &sw, &sh))
{
@ -844,7 +844,7 @@ _on_prop_change(void *data,
if (ev->atom == ECORE_X_ATOM_E_ILLUME_ZONE)
{
DBG("pid=%d, win=0x%x, ECORE_X_ATOM_E_ILLUME_ZONE.\n", pid, ev->win);
DBG("pid=%d, win=0x%x, ECORE_X_ATOM_E_ILLUME_ZONE.\n", pid, ev->win);
Conformant_Part_Type part_type;
part_type = (ELM_CONFORMANT_INDICATOR_PART |
@ -856,32 +856,32 @@ _on_prop_change(void *data,
}
else if (ev->atom == ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY)
{
DBG("pid=%d, win=0x%x, ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY.", pid, ev->win);
DBG("pid=%d, win=0x%x, ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY.", pid, ev->win);
_conformant_part_sizing_eval(data, ELM_CONFORMANT_INDICATOR_PART);
}
}
else if (ev->atom == ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY)
{
DBG("pid=%d, win=0x%x, ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY.", pid, ev->win);
DBG("pid=%d, win=0x%x, ECORE_X_ATOM_E_ILLUME_SOFTKEY_GEOMETRY.", pid, ev->win);
_conformant_part_sizing_eval(data, ELM_CONFORMANT_SOFTKEY_PART);
}
}
else if (ev->atom == ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY)
{
DBG("[KEYPAD]:pid=%d, win=0x%x, ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY.", pid, ev->win);
DBG("[KEYPAD]:pid=%d, win=0x%x, ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY.", pid, ev->win);
_conformant_part_sizing_eval(data, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART);
}
else if (ev->atom == ECORE_X_ATOM_E_ILLUME_CLIPBOARD_GEOMETRY)
{
DBG("pid=%d, win=0x%x, ECORE_X_ATOM_E_ILLUME_CLIPBOARD_GEOMETRY.", pid, ev->win);
DBG("pid=%d, win=0x%x, ECORE_X_ATOM_E_ILLUME_CLIPBOARD_GEOMETRY.", pid, ev->win);
_conformant_part_sizing_eval(data, ELM_CONFORMANT_CLIPBOARD_PART);
}
else if (ev->atom == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE)
{
DBG("[KEYPAD]:pid=%d, win=0x%x, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE.", pid, ev->win);
DBG("[KEYPAD]:pid=%d, win=0x%x, ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE.", pid, ev->win);
_virtualkeypad_state_change(data, ev);
}
else if (ev->atom == ECORE_X_ATOM_E_ILLUME_CLIPBOARD_STATE)
{
DBG("pid=%d, win=0x%x, ECORE_X_ATOM_E_ILLUME_CLIPBOARD_STATE.", pid, ev->win);
DBG("pid=%d, win=0x%x, ECORE_X_ATOM_E_ILLUME_CLIPBOARD_STATE.", pid, ev->win);
_clipboard_state_change(data, ev);
}

26
legacy/elementary/src/lib/elm_image.c
View File

@ -1274,19 +1274,19 @@ _elm_image_smart_orient_set(Eo *obj, void *_pd, va_list *list)
switch (orient)
{
case ELM_IMAGE_FLIP_HORIZONTAL:
_elm_image_flip_horizontal(obj, sd);
sd->orient = orient;
return;
_elm_image_flip_horizontal(obj, sd);
sd->orient = orient;
return;
case ELM_IMAGE_FLIP_VERTICAL:
_elm_image_flip_vertical(obj, sd);
sd->orient = orient;
return;
_elm_image_flip_vertical(obj, sd);
sd->orient = orient;
return;
case ELM_IMAGE_ROTATE_180:
_elm_image_smart_rotate_180(obj, sd);
sd->orient = orient;
return;
_elm_image_smart_rotate_180(obj, sd);
sd->orient = orient;
return;
case ELM_IMAGE_ORIENT_NONE:
sd->orient = orient;
@ -1319,27 +1319,27 @@ _elm_image_smart_orient_set(Eo *obj, void *_pd, va_list *list)
case ELM_IMAGE_FLIP_TRANSPOSE:
to = data;
hw = -hw + 1;
sd->orient = orient;
sd->orient = orient;
break;
case ELM_IMAGE_FLIP_TRANSVERSE:
to = data + hw - 1;
w = -w;
hw = hw - 1;
sd->orient = orient;
sd->orient = orient;
break;
case ELM_IMAGE_ROTATE_90:
to = data + w - 1;
hw = -hw - 1;
sd->orient = orient;
sd->orient = orient;
break;
case ELM_IMAGE_ROTATE_270:
to = data + hw - w;
w = -w;
hw = hw + 1;
sd->orient = orient;
sd->orient = orient;
break;
default:

12
legacy/elementary/src/lib/elm_interface_scrollable.c
View File

@ -388,9 +388,9 @@ EAPI Eo_Op ELM_SCROLLABLE_INTERFACE_BASE_ID = EO_NOOP;
#define MY_SCROLLABLE_INTERFACE_NAME "elm_interface_scrollable"
#define ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(o, ptr) \
Elm_Scrollable_Smart_Interface_Data *ptr = \
(!eo_isa(o, MY_SCROLLABLE_INTERFACE) ? NULL : \
eo_data_scope_get(o, MY_SCROLLABLE_INTERFACE)); \
Elm_Scrollable_Smart_Interface_Data *ptr = \
(!eo_isa(o, MY_SCROLLABLE_INTERFACE) ? NULL : \
eo_data_scope_get(o, MY_SCROLLABLE_INTERFACE)); \
if (!ptr) \
{ \
CRITICAL("No interface data for object %p (%s)", \
@ -399,9 +399,9 @@ EAPI Eo_Op ELM_SCROLLABLE_INTERFACE_BASE_ID = EO_NOOP;
}
#define ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
Elm_Scrollable_Smart_Interface_Data *ptr = \
(!eo_isa(o, MY_SCROLLABLE_INTERFACE) ? NULL : \
eo_data_scope_get(o, MY_SCROLLABLE_INTERFACE)); \
Elm_Scrollable_Smart_Interface_Data *ptr = \
(!eo_isa(o, MY_SCROLLABLE_INTERFACE) ? NULL : \
eo_data_scope_get(o, MY_SCROLLABLE_INTERFACE)); \
if (!ptr) \
{ \
CRITICAL("No interface data for object %p (%s)", \

2
legacy/elementary/src/lib/elm_layout.c
View File

@ -291,7 +291,7 @@ _visuals_refresh(Evas_Object *obj,
eo_do(obj, elm_obj_layout_sizing_eval());
edje_object_signal_callback_del(wd->resize_obj,
"edje,change,file", "edje",
"edje,change,file", "edje",
_reload_theme);
edje_object_signal_callback_add(wd->resize_obj,
"edje,change,file", "edje",

4
legacy/elementary/src/lib/elm_main.c
View File

@ -661,8 +661,8 @@ elm_quicklaunch_init(int argc,
if (!_elm_lib_dir) _elm_lib_dir = eina_stringshare_add("/");
eina_log_timing(_elm_log_dom,
EINA_LOG_STATE_STOP,
EINA_LOG_STATE_INIT);
EINA_LOG_STATE_STOP,
EINA_LOG_STATE_INIT);
return _elm_ql_init_count;
}

6
legacy/elementary/src/lib/elm_map.c
View File

@ -1442,8 +1442,8 @@ _overlay_default_show(Overlay_Default *ovl)
disp = ovl->content;
evas_object_geometry_get(disp, NULL, NULL, &w, &h);
if (w <= 0 || h <= 0) evas_object_size_hint_min_get(disp, &w, &h);
ovl->w = w;
ovl->h = h;
ovl->w = w;
ovl->h = h;
}
else if (!(ovl->icon) && ovl->clas_content)
{
@ -2563,7 +2563,7 @@ _overlay_show(Elm_Map_Overlay *overlay)
case ELM_MAP_OVERLAY_TYPE_SCALE:
if (overlay->visible) _overlay_scale_show(overlay->ovl);
else _overlay_scale_hide(overlay->ovl);
break;
break;
default:
ERR("Invalid overlay type to show: %d", overlay->type);
}

4
legacy/elementary/src/lib/elm_menu.c
View File

@ -180,7 +180,7 @@ _sizing_eval(Evas_Object *obj)
hover = eo_data_scope_get(sd->hv, ELM_OBJ_WIDGET_CLASS);
edje_object_part_geometry_get(hover->resize_obj, "bottom", NULL,
NULL, &bw, &bh);
NULL, &bw, &bh);
evas_object_size_hint_min_set(obj, bw, bh);
EINA_LIST_FOREACH(sd->items, l, item)
@ -707,7 +707,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL),
eo_parent_get(&parent));
eo_parent_get(&parent));
elm_menu_parent_set(obj, parent);
elm_hover_target_set(sd->hv, sd->location);

8
legacy/elementary/src/lib/elm_thumb.c
View File

@ -348,8 +348,8 @@ _on_ethumb_thumb_error(Ethumb_Client *client __UNUSED__,
return;
}
evas_object_event_callback_del_full
(sd->view, EVAS_CALLBACK_IMAGE_PRELOADED, _on_thumb_preloaded,
sd);
(sd->view, EVAS_CALLBACK_IMAGE_PRELOADED, _on_thumb_preloaded,
sd);
pending_request--;
sd->thumb.request = NULL;
@ -634,8 +634,8 @@ _elm_thumb_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
sd->thumb.retry = EINA_FALSE;
}
evas_object_event_callback_del_full
(sd->view, EVAS_CALLBACK_IMAGE_PRELOADED, _on_thumb_preloaded,
sd);
(sd->view, EVAS_CALLBACK_IMAGE_PRELOADED, _on_thumb_preloaded,
sd);
eina_stringshare_del(sd->thumb.thumb_path);
eina_stringshare_del(sd->thumb.thumb_key);

4
legacy/elementary/src/lib/elm_widget.c
View File

@ -14,8 +14,8 @@ EAPI Eo_Op ELM_WIDGET_BASE_ID = EO_NOOP;
#define MY_CLASS_NAME "elm_widget"
#define ELM_WIDGET_DATA_GET(o, wd) \
Elm_Widget_Smart_Data *wd = NULL; \
#define ELM_WIDGET_DATA_GET(o, wd) \
Elm_Widget_Smart_Data *wd = NULL; \
if (eo_isa(o, MY_CLASS)) wd = eo_data_scope_get(o, MY_CLASS)
#define API_ENTRY \

2
legacy/elementary/src/lib/elm_win.c
View File

@ -2969,7 +2969,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
if (getenv("ELM_FIRST_FRAME"))
evas_event_callback_add(ecore_evas_get(tmp_sd.ee), EVAS_CALLBACK_RENDER_POST,
_elm_win_first_frame_do, getenv("ELM_FIRST_FRAME"));
_elm_win_first_frame_do, getenv("ELM_FIRST_FRAME"));
/* copying possibly altered fields back */
#define SD_CPY(_field) \