i3lock→slock

このコミットが含まれているのは:
守矢諏訪子 2023-12-05 12:06:15 +09:00
コミット 7e6a338214
2個のファイルの変更9行の追加16行の削除

ファイルの表示

@ -17,10 +17,8 @@
#endif
static const char wallpaper[] = "/home/suwako/.local/share/wallpapers/eyecandy/cherry-blossoms-";
static const char wpjpg[] = ".jpg";
static const char wppng[] = ".png";
extern char desktop_bg[100];
extern char i3lock_bg[100];
static const char ext[] = ".jpg";
extern char bgimg[100];
#if MYPC == DESKTOP
static const char resolution[] = "1080";
@ -77,7 +75,7 @@ static Sp scratchpads[] = {
};
static const char *const autostart[] = {
"hsetroot", "-center", desktop_bg, NULL,
"hsetroot", "-center", bgimg, NULL,
"xset", "-dpms", NULL,
"xset", "s", "off", NULL,
NULL /* terminate */
@ -267,9 +265,9 @@ static const Key keys[] = {
{ MODKEY, XK_a, togglegaps, {0} },
{ MODKEY|ShiftMask, XK_a, defaultgaps, {0} },
{ MODKEY, XK_s, togglesticky, {0} },
{ MODKEY|ShiftMask, XK_s, spawn, {.v = (const char*[]){ "i3lock", "-i", i3lock_bg, NULL } } },
{ MODKEY|ShiftMask, XK_s, spawn, {.v = (const char*[]){ "doas", "slock", "-i", bgimg, NULL } } },
{ MODKEY, XK_d, spawn, {.v = (const char*[]){ "rofi", "-show", "drun", NULL } } },
{ MODKEY|ShiftMask, XK_d, spawn, {.v = (const char*[]){ "rofi-pass", NULL } } },
{ MODKEY|ShiftMask, XK_d, spawn, {.v = (const char*[]){ "rofi-pass", "--root", "~/.local/share/sp", NULL } } },
{ MODKEY, XK_f, togglefullscr, {0} },
{ MODKEY|ShiftMask, XK_f, setlayout, {.v = &layouts[8]} },
{ MODKEY, XK_g, shiftview, { .i = -1 } },

13
dwm.c
ファイルの表示

@ -394,17 +394,12 @@ static pid_t *autostart_pids;
static size_t autostart_len;
/* 背景を設定 */
char desktop_bg[100];
char i3lock_bg[100];
char bgimg[100];
void setupbackgrounds() {
strcpy(desktop_bg, wallpaper);
strcat(desktop_bg, resolution);
strcat(desktop_bg, wpjpg);
strcpy(i3lock_bg, wallpaper);
strcat(i3lock_bg, resolution);
strcat(i3lock_bg, wppng);
strcpy(bgimg, wallpaper);
strcat(bgimg, resolution);
strcat(bgimg, ext);
}
/* function implementations */