Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
63c3690fa8 | ||
|
|
e2ece2c35b | ||
|
|
86d6e96f7a | ||
|
|
87e1ccc6bf | ||
|
|
aa355e22f9 | ||
|
|
d21f758158 | ||
|
|
f2741116a7 |
@@ -84,10 +84,10 @@ if( NOT IMLIB_BUILD_WITH_X )
|
|||||||
endif( NOT IMLIB_BUILD_WITH_X )
|
endif( NOT IMLIB_BUILD_WITH_X )
|
||||||
|
|
||||||
|
|
||||||
|
add_definitions( -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_WITH_GETLINE )
|
||||||
|
|
||||||
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||||
add_definitions( -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE -D_DEFAULT_SOURCE )
|
add_definitions( -D_POSIX_C_SOURCE=200809L )
|
||||||
else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
|
||||||
add_definitions( -D_WITH_GETLINE )
|
|
||||||
endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||||
|
|
||||||
|
|
||||||
@@ -147,6 +147,7 @@ set( SOURCES src/config.c
|
|||||||
src/util/cache.c
|
src/util/cache.c
|
||||||
src/util/color.c
|
src/util/color.c
|
||||||
src/util/gradient.c
|
src/util/gradient.c
|
||||||
|
src/util/uevent.c
|
||||||
src/util/window.c )
|
src/util/window.c )
|
||||||
|
|
||||||
if( ENABLE_BATTERY )
|
if( ENABLE_BATTERY )
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
|
2017-09-08 15.1
|
||||||
|
- Fixes:
|
||||||
|
- Fixed build on non-Linux and non-x86 systems
|
||||||
|
|
||||||
2017-09-02 15.0
|
2017-09-02 15.0
|
||||||
- Fixes:
|
- Fixes:
|
||||||
- Clock, executors and other timers fire correctly after waking up from suspend
|
- Clock, executors and other timers fire correctly after waking up from suspend
|
||||||
@@ -947,3 +951,4 @@ released tint-0.2
|
|||||||
- fork ttm projet from p://code.google.com/p/ttm/ (by Pål Staurland staura@gmail.com)
|
- fork ttm projet from p://code.google.com/p/ttm/ (by Pål Staurland staura@gmail.com)
|
||||||
while the projet is no longer in developpement, have not changed the name of 'tint'.
|
while the projet is no longer in developpement, have not changed the name of 'tint'.
|
||||||
.
|
.
|
||||||
|
.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Latest stable release: 15.0
|
# Latest stable release: 15.1
|
||||||
Changes: https://gitlab.com/o9000/tint2/blob/15.0/ChangeLog
|
Changes: https://gitlab.com/o9000/tint2/blob/15.1/ChangeLog
|
||||||
|
|
||||||
Documentation: [doc/tint2.md](doc/tint2.md)
|
Documentation: [doc/tint2.md](doc/tint2.md)
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@ Compile it with (after you install the [dependencies](https://gitlab.com/o9000/t
|
|||||||
```
|
```
|
||||||
git clone https://gitlab.com/o9000/tint2.git
|
git clone https://gitlab.com/o9000/tint2.git
|
||||||
cd tint2
|
cd tint2
|
||||||
git checkout 15.0
|
git checkout 15.1
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
cmake ..
|
cmake ..
|
||||||
|
|||||||
@@ -199,9 +199,9 @@ pre {
|
|||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<h1 id="latest-stable-release-15-0"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">15.0</span><a name="latest-stable-release-15-0" href="#latest-stable-release-15-0" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/15.0/ChangeLog">https://gitlab.com/o9000/tint2/blob/15.0/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
|
<h1 id="latest-stable-release-15-1"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">15.1</span><a name="latest-stable-release-15-1" href="#latest-stable-release-15-1" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/15.1/ChangeLog">https://gitlab.com/o9000/tint2/blob/15.1/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
|
||||||
cd tint2
|
cd tint2
|
||||||
git checkout 15.0
|
git checkout 15.1
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
cmake ..
|
cmake ..
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
.TH TINT2 1 "2017\-09\-02" 15.0
|
.TH TINT2 1 "2017\-09\-08" 15.1
|
||||||
.SH NAME
|
.SH NAME
|
||||||
.PP
|
.PP
|
||||||
tint2 \- lightweight panel/taskbar
|
tint2 \- lightweight panel/taskbar
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# TINT2 1 "2017-09-02" 15.0
|
# TINT2 1 "2017-09-08" 15.1
|
||||||
|
|
||||||
## NAME
|
## NAME
|
||||||
tint2 - lightweight panel/taskbar
|
tint2 - lightweight panel/taskbar
|
||||||
|
|||||||
20
src/main.c
20
src/main.c
@@ -576,30 +576,30 @@ void handle_x_events()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void prepare_fd_set(fd_set *fd_set, int *max_fd)
|
void prepare_fd_set(fd_set *set, int *max_fd)
|
||||||
{
|
{
|
||||||
FD_ZERO(fd_set);
|
FD_ZERO(set);
|
||||||
FD_SET(server.x11_fd, fd_set);
|
FD_SET(server.x11_fd, set);
|
||||||
*max_fd = server.x11_fd;
|
*max_fd = server.x11_fd;
|
||||||
if (sigchild_pipe_valid) {
|
if (sigchild_pipe_valid) {
|
||||||
FD_SET(sigchild_pipe[0], fd_set);
|
FD_SET(sigchild_pipe[0], set);
|
||||||
*max_fd = MAX(*max_fd, sigchild_pipe[0]);
|
*max_fd = MAX(*max_fd, sigchild_pipe[0]);
|
||||||
}
|
}
|
||||||
for (GList *l = panel_config.execp_list; l; l = l->next) {
|
for (GList *l = panel_config.execp_list; l; l = l->next) {
|
||||||
Execp *execp = (Execp *)l->data;
|
Execp *execp = (Execp *)l->data;
|
||||||
int fd = execp->backend->child_pipe_stdout;
|
int fd = execp->backend->child_pipe_stdout;
|
||||||
if (fd > 0) {
|
if (fd > 0) {
|
||||||
FD_SET(fd, fd_set);
|
FD_SET(fd, set);
|
||||||
*max_fd = MAX(*max_fd, fd);
|
*max_fd = MAX(*max_fd, fd);
|
||||||
}
|
}
|
||||||
fd = execp->backend->child_pipe_stderr;
|
fd = execp->backend->child_pipe_stderr;
|
||||||
if (fd > 0) {
|
if (fd > 0) {
|
||||||
FD_SET(fd, fd_set);
|
FD_SET(fd, set);
|
||||||
*max_fd = MAX(*max_fd, fd);
|
*max_fd = MAX(*max_fd, fd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (uevent_fd > 0) {
|
if (uevent_fd > 0) {
|
||||||
FD_SET(uevent_fd, fd_set);
|
FD_SET(uevent_fd, set);
|
||||||
*max_fd = MAX(*max_fd, uevent_fd);
|
*max_fd = MAX(*max_fd, uevent_fd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -742,13 +742,13 @@ void run_tint2_event_loop()
|
|||||||
if (panel_refresh)
|
if (panel_refresh)
|
||||||
handle_panel_refresh();
|
handle_panel_refresh();
|
||||||
|
|
||||||
fd_set fd_set;
|
fd_set fds;
|
||||||
int max_fd;
|
int max_fd;
|
||||||
prepare_fd_set(&fd_set, &max_fd);
|
prepare_fd_set(&fds, &max_fd);
|
||||||
|
|
||||||
// Wait for an event and handle it
|
// Wait for an event and handle it
|
||||||
ts_event_read = 0;
|
ts_event_read = 0;
|
||||||
if (XPending(server.display) > 0 || select(max_fd + 1, &fd_set, 0, 0, get_next_timeout()) >= 0) {
|
if (XPending(server.display) > 0 || select(max_fd + 1, &fds, 0, 0, get_next_timeout()) >= 0) {
|
||||||
#ifdef HAVE_TRACING
|
#ifdef HAVE_TRACING
|
||||||
start_tracing((void*)run_tint2_event_loop);
|
start_tracing((void*)run_tint2_event_loop);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ void init_signals()
|
|||||||
// Set signal handlers
|
// Set signal handlers
|
||||||
signal_pending = 0;
|
signal_pending = 0;
|
||||||
|
|
||||||
struct sigaction sa_chld = {.sa_handler = SIG_DFL, .sa_flags = SA_NOCLDWAIT | SA_RESTART};
|
struct sigaction sa_chld = {.sa_handler = SIG_IGN};
|
||||||
sigaction(SIGCHLD, &sa_chld, 0);
|
sigaction(SIGCHLD, &sa_chld, 0);
|
||||||
|
|
||||||
struct sigaction sa = {.sa_handler = signal_handler, .sa_flags = SA_RESTART};
|
struct sigaction sa = {.sa_handler = signal_handler, .sa_flags = SA_RESTART};
|
||||||
|
|||||||
@@ -1173,7 +1173,7 @@ double compute_control_point_offset(Area *area, Offset *offset)
|
|||||||
double height = element_area->height;
|
double height = element_area->height;
|
||||||
double radius = sqrt(element_area->width * element_area->width + element_area->height * element_area->height) / 2.0;
|
double radius = sqrt(element_area->width * element_area->width + element_area->height * element_area->height) / 2.0;
|
||||||
|
|
||||||
double left, top;
|
double left = 0, top = 0;
|
||||||
if (offset->element == ELEMENT_SELF) {
|
if (offset->element == ELEMENT_SELF) {
|
||||||
left = 0;
|
left = 0;
|
||||||
top = 0;
|
top = 0;
|
||||||
|
|||||||
@@ -40,7 +40,9 @@
|
|||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
#if !defined(__OpenBSD__)
|
||||||
#include <wordexp.h>
|
#include <wordexp.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_RSVG
|
#ifdef HAVE_RSVG
|
||||||
#include <librsvg/rsvg.h>
|
#include <librsvg/rsvg.h>
|
||||||
@@ -397,6 +399,7 @@ pid_t tint_exec(const char *command,
|
|||||||
chdir(dir);
|
chdir(dir);
|
||||||
close_all_fds();
|
close_all_fds();
|
||||||
if (terminal) {
|
if (terminal) {
|
||||||
|
#if !defined(__OpenBSD__)
|
||||||
fprintf(stderr, "tint2: executing in x-terminal-emulator: %s\n", command);
|
fprintf(stderr, "tint2: executing in x-terminal-emulator: %s\n", command);
|
||||||
wordexp_t words;
|
wordexp_t words;
|
||||||
words.we_offs = 2;
|
words.we_offs = 2;
|
||||||
@@ -405,6 +408,7 @@ pid_t tint_exec(const char *command,
|
|||||||
words.we_wordv[1] = (char*)"-e";
|
words.we_wordv[1] = (char*)"-e";
|
||||||
execvp("x-terminal-emulator", words.we_wordv);
|
execvp("x-terminal-emulator", words.we_wordv);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
fprintf(stderr, "tint2: could not execute command in x-terminal-emulator: %s, executting in shell\n", command);
|
fprintf(stderr, "tint2: could not execute command in x-terminal-emulator: %s, executting in shell\n", command);
|
||||||
}
|
}
|
||||||
execlp("sh", "sh", "-c", command, NULL);
|
execlp("sh", "sh", "-c", command, NULL);
|
||||||
|
|||||||
@@ -67,11 +67,10 @@ void cleanup_gradient(GradientClass *g);
|
|||||||
// Gradient instances associated to Areas
|
// Gradient instances associated to Areas
|
||||||
|
|
||||||
struct Area;
|
struct Area;
|
||||||
typedef struct Area Area;
|
|
||||||
|
|
||||||
typedef struct GradientInstance {
|
typedef struct GradientInstance {
|
||||||
GradientClass *gradient_class;
|
GradientClass *gradient_class;
|
||||||
Area *area;
|
struct Area *area;
|
||||||
cairo_pattern_t *pattern;
|
cairo_pattern_t *pattern;
|
||||||
} GradientInstance;
|
} GradientInstance;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user