Package: moc
Version: 1:2.5.0-1
Severity: minor
Tags: patch
Dear Maintainer,
*** Reporter, please consider answering these questions, where appropriate ***
* What led up to the situation?
When moc is resized, for example when using a tilling window manager, it
dislays "terminal's too small" while the terminal size is still big enough to
display moc correctly.
I think that the threshold of lines and columns size is too high so I changed
them. With this values I got the "terminal's too small" mention only when it
gets really too small.
-- System Information:
Debian Release: 8.0
APT prefers testing-updates
APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages moc depends on:
ii libasound2 1.0.28-1
ii libc6 2.19-17
ii libcurl3-gnutls 7.38.0-4
ii libdb5.3 5.3.28-9
ii libfaad2 2.7-8
ii libflac8 1.3.0-3
ii libgcc1 1:4.9.2-10
ii libid3tag0 0.15.1b-11
ii libjack-jackd2-0 [libjack-0.116] 1.9.10+20140719git3eb0ae6a~dfsg-2
ii libltdl7 2.4.2-1.11
ii libmad0 0.15.1b-8
ii libmagic1 1:5.22+15-2
ii libmodplug1 1:0.8.8.4-4.1+b1
ii libmpcdec6 2:0.1~r459-4.1
ii libncursesw5 5.9+20140913-1+b1
ii libogg0 1.3.2-1
ii libopusfile0 0.6-1
ii librcc0 0.2.12-0.1
ii libresid-builder0c2a 2.1.1-14
ii libsamplerate0 0.1.8-8
ii libsidplay2 2.1.1-14
ii libsidutils0 2.1.1-14
ii libsndfile1 1.0.25-9.1
ii libspeex1 1.2~rc1.2-1
ii libstdc++6 4.9.2-10
ii libtagc0 1.9.1-2.1
ii libtinfo5 5.9+20140913-1+b1
ii libvorbis0a 1.3.4-2
ii libvorbisfile3 1.3.4-2
ii libwavpack1 4.70.0-1
ii zlib1g 1:1.2.8.dfsg-2+b1
moc recommends no packages.
Versions of packages moc suggests:
pn moc-ffmpeg-plugin <none>
-- no debconf information
*** /home/sogal/moc_interfaces_elements.c.diff
--- interface_elements.c.orig 2015-04-15 15:40:16.594245182 +0200
+++ interface_elements.c 2015-04-15 15:44:57.574249398 +0200
@@ -2529,7 +2529,7 @@
/* End the program if the terminal is too small. */
static void check_term_size (struct main_win *mw, struct info_win *iw)
{
- mw->too_small = iw->too_small = COLS < 59 || LINES < 7;
+ mw->too_small = iw->too_small = COLS < 30 || LINES < 5;
}
/* Update the title with the current fill. */
@@ -2770,7 +2770,7 @@
bar_set_title (&w->mixer_bar, name);
if (!w->in_entry && !w->too_small) {
- bar_draw (&w->mixer_bar, w->win, COLS - 37, 0);
+ bar_draw (&w->mixer_bar, w->win, COLS - 27, 0);
info_win_update_curs (w);
}
}
@@ -3085,7 +3085,7 @@
bar_set_fill (&w->mixer_bar, (double) value);
if (!w->in_entry && !w->too_small)
- bar_draw (&w->mixer_bar, w->win, COLS - 37, 0);
+ bar_draw (&w->mixer_bar, w->win, COLS - 27, 0);
}
/* Draw a switch that is turned on or off in form of [TITLE]. */
@@ -3398,7 +3398,7 @@
lines.ltee, lines.rtee, lines.llcorn,
lines.lrcorn);
/* mixer frame */
- mvwaddch (w->win, 0, COLS - 38, lines.rtee);
+ mvwaddch (w->win, 0, COLS - 28, lines.rtee);
mvwaddch (w->win, 0, COLS - 17, lines.ltee);
/* playlist time frame */
@@ -3448,7 +3448,7 @@
if (w->in_entry)
entry_draw (&w->entry, w->win, 1, 0);
else
- bar_draw (&w->mixer_bar, w->win, COLS - 37, 0);
+ bar_draw (&w->mixer_bar, w->win, COLS - 27, 0);
--- interface_elements.c.orig 2015-04-15 15:40:16.594245182 +0200
+++ interface_elements.c 2015-04-15 15:44:57.574249398 +0200
@@ -2529,7 +2529,7 @@
/* End the program if the terminal is too small. */
static void check_term_size (struct main_win *mw, struct info_win *iw)
{
- mw->too_small = iw->too_small = COLS < 59 || LINES < 7;
+ mw->too_small = iw->too_small = COLS < 30 || LINES < 5;
}
/* Update the title with the current fill. */
@@ -2770,7 +2770,7 @@
bar_set_title (&w->mixer_bar, name);
if (!w->in_entry && !w->too_small) {
- bar_draw (&w->mixer_bar, w->win, COLS - 37, 0);
+ bar_draw (&w->mixer_bar, w->win, COLS - 27, 0);
info_win_update_curs (w);
}
}
@@ -3085,7 +3085,7 @@
bar_set_fill (&w->mixer_bar, (double) value);
if (!w->in_entry && !w->too_small)
- bar_draw (&w->mixer_bar, w->win, COLS - 37, 0);
+ bar_draw (&w->mixer_bar, w->win, COLS - 27, 0);
}
/* Draw a switch that is turned on or off in form of [TITLE]. */
@@ -3398,7 +3398,7 @@
lines.ltee, lines.rtee, lines.llcorn, lines.lrcorn);
/* mixer frame */
- mvwaddch (w->win, 0, COLS - 38, lines.rtee);
+ mvwaddch (w->win, 0, COLS - 28, lines.rtee);
mvwaddch (w->win, 0, COLS - 17, lines.ltee);
/* playlist time frame */
@@ -3448,7 +3448,7 @@
if (w->in_entry)
entry_draw (&w->entry, w->win, 1, 0);
else
- bar_draw (&w->mixer_bar, w->win, COLS - 37, 0);
+ bar_draw (&w->mixer_bar, w->win, COLS - 27, 0);
bar_draw (&w->time_bar, w->win, 2, 3);
}
--- interface_elements.c.orig 2015-04-15 15:40:16.594245182 +0200
+++ interface_elements.c 2015-04-15 15:44:57.574249398 +0200
@@ -2529,7 +2529,7 @@
/* End the program if the terminal is too small. */
static void check_term_size (struct main_win *mw, struct info_win *iw)
{
- mw->too_small = iw->too_small = COLS < 59 || LINES < 7;
+ mw->too_small = iw->too_small = COLS < 30 || LINES < 5;
}
/* Update the title with the current fill. */
@@ -2770,7 +2770,7 @@
bar_set_title (&w->mixer_bar, name);
if (!w->in_entry && !w->too_small) {
- bar_draw (&w->mixer_bar, w->win, COLS - 37, 0);
+ bar_draw (&w->mixer_bar, w->win, COLS - 27, 0);
info_win_update_curs (w);
}
}
@@ -3085,7 +3085,7 @@
bar_set_fill (&w->mixer_bar, (double) value);
if (!w->in_entry && !w->too_small)
- bar_draw (&w->mixer_bar, w->win, COLS - 37, 0);
+ bar_draw (&w->mixer_bar, w->win, COLS - 27, 0);
}
/* Draw a switch that is turned on or off in form of [TITLE]. */
@@ -3398,7 +3398,7 @@
lines.ltee, lines.rtee, lines.llcorn, lines.lrcorn);
/* mixer frame */
- mvwaddch (w->win, 0, COLS - 38, lines.rtee);
+ mvwaddch (w->win, 0, COLS - 28, lines.rtee);
mvwaddch (w->win, 0, COLS - 17, lines.ltee);
/* playlist time frame */
@@ -3448,7 +3448,7 @@
if (w->in_entry)
entry_draw (&w->entry, w->win, 1, 0);
else
- bar_draw (&w->mixer_bar, w->win, COLS - 37, 0);
+ bar_draw (&w->mixer_bar, w->win, COLS - 27, 0);
bar_draw (&w->time_bar, w->win, 2, 3);
}
