hashirama/suckless_dictpopup
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Switch to stdin

Browse source
This commit is contained in:
GenjiFujimoto 2023-05-27 21:52:51 +02:00
parent 257bf1a3a4
commit ef1d1658b6
2 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dictpopup
View file

@ -1,10 +1,10 @@
#!/bin/sh #!/bin/sh
# Looks up argument instead, if provided # Looks up argument instead, if provided
word=${1:-$(xclip -o)} word=${1:-$(sselp)}
[ -z $word ] && exit 1 [ -z $word ] && exit 1
sdcv -n --utf8-output -e "$word" | tail -n +5 | sed 's|<br>|\n|g' | sed 's|<[^>]*>||g' | xargs -d '\n' popup 2>/dev/null sdcv -n --utf8-output -e "$word" | tail -n +5 | sed 's|<br>|\n|g' | sed 's|<[^>]*>||g' | popup
# Instead of sed also possible: # Instead of sed also possible:
# `lynx -dump -stdin -assume_charset=UTF-8 -display_charset=UTF-8` # `lynx -dump -stdin -assume_charset=UTF-8 -display_charset=UTF-8`

52
popup.c
View file

@ -20,6 +20,9 @@
#define INTERSECT(x,y,w,h,r) (MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \ #define INTERSECT(x,y,w,h,r) (MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \
* MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org))) * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
//TODO: Make selection possible
//TODO: Switch between dictionaries
#define EXIT_ACTION 0 #define EXIT_ACTION 0
#define EXIT_FAIL 1 #define EXIT_FAIL 1
#define EXIT_DISMISS 2 #define EXIT_DISMISS 2
@ -95,11 +98,8 @@ void expire(int sig)
XFlush(dpy); XFlush(dpy);
} }
int main(int argc, char *argv[]) int main()
{ {
if (argc == 1)
die("Usage: %s body", argv[0]);
struct sigaction act_expire, act_ignore; struct sigaction act_expire, act_ignore;
act_expire.sa_handler = expire; act_expire.sa_handler = expire;
@ -142,9 +142,18 @@ int main(int argc, char *argv[])
XftFont *font = XftFontOpenName(dpy, screen, font_pattern); XftFont *font = XftFontOpenName(dpy, screen, font_pattern);
for (int i = 1; i < argc; i++) static char *buf = NULL;
static size_t size = 0;
ssize_t len = 0;
char *str;
for (;(len = getline(&buf, &size, stdin)) > 0;)
{ {
for (unsigned int eol = get_max_len(argv[i], font, max_text_width); eol; argv[i] += eol, num_of_lines++, eol = get_max_len(argv[i], font, max_text_width)) /* Remove the trailing newline if one is present. */
if (len && buf[len - 1] == '\n')
buf[len - 1] = '\0';
str=buf;
for (unsigned int eol = get_max_len(str, font, max_text_width); eol; str += eol, num_of_lines++, eol = get_max_len(str, font, max_text_width))
{ {
if (lines_size <= num_of_lines) if (lines_size <= num_of_lines)
{ {
@ -157,7 +166,7 @@ int main(int argc, char *argv[])
if (!lines[num_of_lines]) if (!lines[num_of_lines])
die("malloc failed"); die("malloc failed");
strncpy(lines[num_of_lines], argv[i], eol); strncpy(lines[num_of_lines], str, eol);
lines[num_of_lines][eol] = '\0'; lines[num_of_lines][eol] = '\0';
} }
} }
@ -165,7 +174,7 @@ int main(int argc, char *argv[])
unsigned int text_height = font->ascent - font->descent; unsigned int text_height = font->ascent - font->descent;
unsigned int height = (num_of_lines - 1) * line_spacing + num_of_lines * text_height + 2 * padding; unsigned int height = (num_of_lines - 1) * line_spacing + num_of_lines * text_height + 2 * padding;
int x, y, di; int x, y, di, x_offset, y_offset;
unsigned int du; unsigned int du;
Window dw; Window dw;
if (!XQueryPointer(dpy, window, &dw, &dw, &x, &y, &di, &di, &du)) if (!XQueryPointer(dpy, window, &dw, &dw, &x, &y, &di, &di, &du))
@ -174,25 +183,34 @@ int main(int argc, char *argv[])
XineramaScreenInfo *info; XineramaScreenInfo *info;
int n, i=0; int n, i=0;
// TODO: Better error handling like dmenu
if ((info = XineramaQueryScreens(dpy, &n))){ if ((info = XineramaQueryScreens(dpy, &n))){
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
if (INTERSECT(x, y, 1, 1, info[i]) != 0) if (INTERSECT(x, y, 1, 1, info[i]) != 0)
break; break;
int x_offset = info[i].x_org; x_offset = info[i].x_org;
int y_offset = info[i].y_org; y_offset = info[i].y_org;
mh = info[i].height; mh = info[i].height;
mw = info[i].width; mw = info[i].width;
XFree(info); XFree(info);
// Correct on monitor boundary } else
if (y - y_offset + height > mh)
y -= MAX((y-y_offset+height)-mh,0);
if (x - x_offset + width > mw)
x -= MAX((x-x_offset+width)-mw, 0);
}
#endif #endif
{
x_offset = 0;
y_offset = 0;
mw = DisplayWidth(dpy, screen);
mh = DisplayHeight(dpy, screen);
}
// Correct on monitor boundary
int by = y - y_offset + height + border_size;
int rx = x - x_offset + width + border_size;
if (by > mh)
y = MAX(y-(by-mh), 0);
if (rx > mw)
x = MAX(x-(rx-mw), 0);
window = XCreateWindow(dpy, RootWindow(dpy, screen), x, y, width, height, border_size, DefaultDepth(dpy, screen), window = XCreateWindow(dpy, RootWindow(dpy, screen), x, y, width, height, border_size, DefaultDepth(dpy, screen),
CopyFromParent, visual, CWOverrideRedirect | CWBackPixel | CWBorderPixel, &attributes); CopyFromParent, visual, CWOverrideRedirect | CWBackPixel | CWBorderPixel, &attributes);