korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2025-01-22 20:35:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

client: Use common header for display functions

Browse Source
This commit is contained in:
Marcel Holtmann 2012-12-14 23:24:13 +01:00
parent 85e83446ad
commit 420d1e997e
3 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.tools
View File

@ -2,7 +2,7 @@
if CLIENT
bin_PROGRAMS += client/bluetoothctl
client_bluetoothctl_SOURCES = $(gdbus_sources) client/main.c
client_bluetoothctl_SOURCES = $(gdbus_sources) client/main.c client/display.h
client_bluetoothctl_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -lreadline
endif

36
client/display.h Normal file
View File

@ -0,0 +1,36 @@
/*
*
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2012 Intel Corporation. All rights reserved.
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#define COLOR_OFF "\x1B[0m"
#define COLOR_BLUE "\x1B[0;34m"
static inline void begin_message(void)
{
rl_message("");
printf("\r%*c\r", rl_end, ' ');
}
static inline void end_message(void)
{
rl_clear_message();
}

14
client/main.c
View File

@ -37,8 +37,7 @@
#include <glib.h>
#include <gdbus.h>
#define COLOR_OFF "\x1B[0m"
#define COLOR_BLUE "\x1B[0;34m"
#include "display.h"
static GMainLoop *main_loop;
static DBusConnection *dbus_conn;
@ -46,17 +45,6 @@ static DBusConnection *dbus_conn;
static GList *ctrl_list;
static GDBusProxy *default_ctrl;
static inline void begin_message(void)
{
rl_message("");
printf("\r%*c\r", rl_end, ' ');
}
static inline void end_message(void)
{
rl_clear_message();
}
static void connect_handler(DBusConnection *connection, void *user_data)
{
rl_set_prompt(COLOR_BLUE "[bluetooth]" COLOR_OFF "# ");