chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: also set errno to the passed error code before processing format string in log_s...
[elogind.git]
/
src
/
libsystemd-terminal
/
modeset.c
diff --git
a/src/libsystemd-terminal/modeset.c
b/src/libsystemd-terminal/modeset.c
index 33c79a2036914a830b54c3a7c0f7e11bd618a378..f0508d7a05416ebd1f24a44de6ebe332ad2ad923 100644
(file)
--- a/
src/libsystemd-terminal/modeset.c
+++ b/
src/libsystemd-terminal/modeset.c
@@
-234,18
+234,18
@@
static void modeset_draw(Modeset *m, const grdev_display_target *t) {
uint32_t j, k, *b;
uint8_t *l;
uint32_t j, k, *b;
uint8_t *l;
- assert(t->
fb->format == DRM_FORMAT_XRGB8888 || t->fb
->format == DRM_FORMAT_ARGB8888);
+ assert(t->
back->format == DRM_FORMAT_XRGB8888 || t->back
->format == DRM_FORMAT_ARGB8888);
assert(!t->rotate);
assert(!t->flip);
assert(!t->rotate);
assert(!t->flip);
- l = t->
fb
->maps[0];
+ l = t->
back
->maps[0];
for (j = 0; j < t->height; ++j) {
for (k = 0; k < t->width; ++k) {
b = (uint32_t*)l;
b[k] = (0xff << 24) | (m->r << 16) | (m->g << 8) | m->b;
}
for (j = 0; j < t->height; ++j) {
for (k = 0; k < t->width; ++k) {
b = (uint32_t*)l;
b[k] = (0xff << 24) | (m->r << 16) | (m->g << 8) | m->b;
}
- l += t->
fb
->strides[0];
+ l += t->
back
->strides[0];
}
}
}
}
@@
-256,9
+256,9
@@
static void modeset_render(Modeset *m, grdev_display *d) {
m->g = next_color(&m->g_up, m->g, 3);
m->b = next_color(&m->b_up, m->b, 2);
m->g = next_color(&m->g_up, m->g, 3);
m->b = next_color(&m->b_up, m->b, 2);
- GRDEV_DISPLAY_FOREACH_TARGET(d, t
, 0
) {
+ GRDEV_DISPLAY_FOREACH_TARGET(d, t) {
modeset_draw(m, t);
modeset_draw(m, t);
- grdev_display_flip_target(d, t
, 1
);
+ grdev_display_flip_target(d, t);
}
grdev_session_commit(m->grdev_session);
}
grdev_session_commit(m->grdev_session);
@@
-332,7
+332,8
@@
static int modeset_sysview_fn(sysview_context *c, void *userdata, sysview_event
grdev_session_restore(m->grdev_session);
grdev_session_disable(m->grdev_session);
m->grdev_session = grdev_session_free(m->grdev_session);
grdev_session_restore(m->grdev_session);
grdev_session_disable(m->grdev_session);
m->grdev_session = grdev_session_free(m->grdev_session);
- sd_event_exit(m->event, 0);
+ if (sd_event_get_exit_code(m->event, &r) == -ENODATA)
+ sd_event_exit(m->event, 0);
break;
case SYSVIEW_EVENT_SESSION_ATTACH:
d = ev->session_attach.device;
break;
case SYSVIEW_EVENT_SESSION_ATTACH:
d = ev->session_attach.device;
@@
-347,6
+348,13
@@
static int modeset_sysview_fn(sysview_context *c, void *userdata, sysview_event
if (type == SYSVIEW_DEVICE_DRM)
grdev_session_remove_drm(m->grdev_session, sysview_device_get_ud(d));
if (type == SYSVIEW_DEVICE_DRM)
grdev_session_remove_drm(m->grdev_session, sysview_device_get_ud(d));
+ break;
+ case SYSVIEW_EVENT_SESSION_REFRESH:
+ d = ev->session_refresh.device;
+ type = sysview_device_get_type(d);
+ if (type == SYSVIEW_DEVICE_DRM)
+ grdev_session_hotplug_drm(m->grdev_session, ev->session_refresh.ud);
+
break;
case SYSVIEW_EVENT_SESSION_CONTROL:
r = ev->session_control.error;
break;
case SYSVIEW_EVENT_SESSION_CONTROL:
r = ev->session_control.error;
@@
-361,13
+369,6
@@
static int modeset_sysview_fn(sysview_context *c, void *userdata, sysview_event
return -errno;
}
return -errno;
}
- break;
- case SYSVIEW_EVENT_DEVICE_CHANGE:
- d = ev->device_change.device;
- type = sysview_device_get_type(d);
- if (type == SYSVIEW_DEVICE_DRM)
- grdev_session_hotplug_drm(m->grdev_session, ev->device_change.ud);
-
break;
}
break;
}
@@
-479,7
+480,7
@@
int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
log_parse_environment();
log_open();
-
srand(time(NULL)
);
+
initialize_srand(
);
r = parse_argv(argc, argv);
if (r <= 0)
r = parse_argv(argc, argv);
if (r <= 0)