norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge 30db190ceb48469645a85f123528266318b585bb into 5dbeb1474b6e80b593525ab4dea14b188132b8d3

Browse Source
This commit is contained in:
GitHub Merge Button 2012-01-08 16:13:13 -08:00
commit fb85c4507c
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -67,7 +67,7 @@ AC_ARG_ENABLE([pango],
AC_MSG_RESULT([$force_pango])
if test x$force_pango = xyes -a $have_pango = xno ; then
AC_ERROR([Pango library not found])
AC_ERROR([Pango library not found])
fi
AM_CONDITIONAL([USE_PANGO], [test x$force_pango = xyes])
@ -80,7 +80,7 @@ AM_CONDITIONAL([DEBUG], [test x$debug = xyes])
AC_MSG_RESULT([$debug])
if test ! x$debug = xyes ; then
AC_DEFINE([NDEBUG], [1], [No Debug])
AC_DEFINE([NDEBUG], [1], [No Debug])
fi
AC_CONFIG_FILES([Makefile])

2
src/console.c
View File

@ -209,7 +209,7 @@ void kmscon_console_unref(struct kmscon_console *con)
kmscon_buffer_unref(con->cells);
kmscon_font_factory_unref(con->ff);
free(con);
log_debug("console: destroing console\n");
log_debug("console: destroying console\n");
}
unsigned int kmscon_console_get_width(struct kmscon_console *con)

4
src/eloop.c
View File

@ -296,7 +296,7 @@ int kmscon_eloop_add_fd(struct kmscon_eloop *loop, struct kmscon_fd *fd,
void kmscon_eloop_rm_fd(struct kmscon_fd *fd)
{
struct kmscon_eloop *loop;
int i;
size_t i;
if (!fd || !fd->loop)
return;
@ -545,7 +545,7 @@ int kmscon_eloop_dispatch(struct kmscon_eloop *loop, int timeout)
/* dispatch fd events */
count = epoll_wait(loop->efd, ep, 32, timeout);
if (count < 0) {
log_warning("eloop: epoll_wait dispatching failed\n");
log_warning("eloop: epoll_wait dispatching failed: %m\n");
return -errno;
}

1
src/font_pango.c
View File

@ -286,6 +286,7 @@ static int measure_width(struct kmscon_font *font)
if (!font)
return -EINVAL;
width = 0;
num = 0;
for (i = 0; i < 127; ++i) {
ch = kmscon_symbol_make(i);

2
src/input_xkb.c
View File

@ -667,7 +667,7 @@ bool kmscon_xkb_process_evdev_key(struct xkb_desc *desc,
struct kmscon_input_event *out)
{
KeyCode keycode;
uint8_t group;
uint8_t group;
uint16_t shift_level;
uint32_t sym;
union xkb_action *action;

4
src/output.c
View File

@ -1131,8 +1131,8 @@ int kmscon_compositor_refresh(struct kmscon_compositor *comp)
{
drmModeConnector *conn;
drmModeRes *res;
size_t i;
int cid;
int i;
uint32_t cid;
struct kmscon_output *output, *tmp;
if (!comp || comp->state != COMPOSITOR_AWAKE)

1
tests/test_console.c
View File

@ -96,6 +96,7 @@ static void stdin_cb(struct kmscon_fd *fd, int mask, void *data)
} else if (!ret) {
log_info("stdin closed\n");
kmscon_eloop_rm_fd(fd);
con->stdin_fd = NULL;
} else {
len = ret;
log_debug("stdin input read (len: %d)\n", len);