[Lcdproc] curses driver. configurable border.

[bruno schwander]

------=_Part_17227_3306953.1191864547634
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi,

I made the fixes you requested.

Bruno

On 10/8/07, Peter Marschall <peter@adpm.de> wrote:
> Hi Bruno,
>
> On Sunday, 7. October 2007, bruno schwander wrote:
> > The border drawn by the curses driver is a waste of space for very
> > small terminals, like the 4x40 lcd terminal I have. Here is a diff to
> > allow choosing wether the border is drawn or not by specifying
> >
> > # draw Border [default: yes]
> > DrawBorder=no
> >
> > in the [curses] driver section.
> >
> > I hope this will be deemed useful and be folded in lcdproc.
>
> although I'd love to have the patch included into LCDproc I
> have a few issues with it, that I think you can fix easily:
>
> 1) documentation
>    Please update
>    - docs/lcdproc-user/drivers/curses.docbook
>    - LCDd.conf
>    with the new directove for the curses driver
>    Pleae see
> http://lcdproc.sourceforge.net/docs/current-dev.html#documentation
>    for general guidelines on LCDproc documentation.
>
> 2) coding style
>    Plaese try to adhere to the original coding style in the files
>    (i.e. Tabs instead of Spaces, Space after "if" nd before a
>    brace opening a block, ...)
>    This makes the code more consistent with the rest and makes
>    it easier to read (and to grep through ;-)
>
> 3) I fear the reduction of the offset in the vbar() and hbar() functions
>    is one too much. It reduces the offset and calls chr() afterwards
>    which reduces the offset again.
>    Would you mind to check (e.g. with lcdproc client) ?
>
> With these issues fixed the patch will get easily into CVS.
> Thanks in advance.
>
> Thanks for supporting LCDproc
> Peter
>
> --
> Peter Marschall
> peter@adpm.de
>

------=_Part_17227_3306953.1191864547634
Content-Type: message/news; name="curses.docbook.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="curses.docbook.diff";
 filename="curses.docbook.diff"
X-Attachment-Id: f_f7j9bdkk

KioqIGN1cnNlcy5kb2Nib29rfglTYXQgQXByIDE0IDA3OjM4OjM0IDIwMDcKLS0tIGN1cnNlcy5k
b2Nib29rCU1vbiBPY3QgIDggMDk6Mjg6MjEgMjAwNwoqKioqKioqKioqKioqKioKKioqIDExNiwx
MjMgKioqKgotLS0gMTE2LDEzOCAtLS0tCiAgICBUZWxsIHdoZXRoZXIgdG8gdXNlIEFDUyAoYWx0
ZXJuYXRpdmUgY2hhcmFjdGVyIHNldCkgc3ltYm9scyBmb3IgaWNvbnMgYW5kIGJhcnMKICAgIGlu
c3RlYWQgb2YgIHNpbXBsZSBBU0NJSSBjaGFyYWN0ZXJzLgogICAgPC9wYXJhPjwvbGlzdGl0ZW0+
CiAgPC92YXJsaXN0ZW50cnk+CisgCisgPHZhcmxpc3RlbnRyeT4KKyAgIDx0ZXJtPgorICAgICA8
Y29tbWFuZD5EcmF3Qm9yZGVyPTwvY29tbWFuZD4KKyAgICAgPGFyZyBjaG9pY2UgPSJwbGFpbiI+
CisgICAgICAgPGdyb3VwIGNob2ljZT0icmVxIj4KKyAgICAgICAgIDxhcmcgY2hvaWNlPSJwbGFp
biI+PGxpdGVyYWw+PGVtcGhhc2lzPnllczwvZW1waGFzaXM+PC9saXRlcmFsPjwvYXJnPgorICAg
ICAgICAgPGFyZyBjaG9pY2U9InBsYWluIj48bGl0ZXJhbD5ubzwvbGl0ZXJhbD48L2FyZz4KKyAg
ICAgICA8L2dyb3VwPgorICAgICA8L2FyZz4gIAorICAgPC90ZXJtPgorICAgPGxpc3RpdGVtPjxw
YXJhPgorICAgVGVsbCB3aGV0aGVyIHRvIGRyYXcgYSBib3JkZXIgYXJvdW5kIHRoZSBzY3JlZW4u
CisgICA8L3BhcmE+PC9saXN0aXRlbT4KKyA8L3Zhcmxpc3RlbnRyeT4KICA8L3ZhcmlhYmxlbGlz
dD4KICAKICA8L3NlY3QzPgogIAo=
------=_Part_17227_3306953.1191864547634
Content-Type: message/news; name="LCDd.conf.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="LCDd.conf.diff";
 filename="LCDd.conf.diff"
X-Attachment-Id: f_f7j9byh2

KioqIExDRGQuY29uZn4JU2F0IE9jdCAgNiAwMDozOTo1NiAyMDA3Ci0tLSBMQ0RkLmNvbmYJTW9u
IE9jdCAgOCAwOTo0ODoxMiAyMDA3CioqKioqKioqKioqKioqKgoqKiogMjM3LDI0NCAqKioqCi0t
LSAyMzcsMjQ2IC0tLS0KICAKICAjIHVzZSBBU0Mgc3ltYm9scyBmb3IgaWNvbnMgJiBiYXJzIFtk
ZWZhdWx0OiBubzsgbGVnYWwsIHllcywgbm9dCiAgVXNlQUNTPW5vCiAgCisgIyBkcmF3IEJvcmRl
ciBbZGVmYXVsdDogeWVzOyBsZWdhbDogeWVzLCBub10KKyAjRHJhd0JvcmRlcj1ubwogIAogIAog
ICMjIEN3bGludXggZHJpdmVyICMjCiAgW0N3TG54XQo=
------=_Part_17227_3306953.1191864547634
Content-Type: message/news; name="curses_drv.c.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="curses_drv.c.diff";
 filename="curses_drv.c.diff"
X-Attachment-Id: f_f7j9c2yu

KioqIGN1cnNlc19kcnYuYy5iYWsJTW9uIE9jdCAgOCAxMDoxNjozOCAyMDA3Ci0tLSBjdXJzZXNf
ZHJ2LmMJTW9uIE9jdCAgOCAxMDoyNDo1MCAyMDA3CioqKioqKioqKioqKioqKgoqKiogMTI1LDEz
MiAqKioqCi0tLSAxMjUsMTM0IC0tLS0KICAJaW50IHhvZmZzOwogIAlpbnQgeW9mZnM7CiAgCiAg
CWludCB1c2VBQ1M7CisgCisgCWludCBkcmF3Qm9yZGVyOwogIH0gUHJpdmF0ZURhdGE7CiAgCiAg
CiAgLy8gVmFycyBmb3IgdGhlIHNlcnZlciBjb3JlCioqKioqKioqKioqKioqKgoqKiogMjEzLDIy
MCAqKioqCi0tLSAyMTUsMjIzIC0tLS0KICAJcC0+eG9mZnMgPSBDT05GX0RFRl9UT1BfTEVGVF9Y
LAogIAlwLT55b2ZmcyA9IENPTkZfREVGX1RPUF9MRUZUX1k7CiAgCXAtPmNlbGx3aWR0aCA9IExD
RF9ERUZBVUxUX0NFTExXSURUSDsKICAJcC0+Y2VsbGhlaWdodCA9IExDRF9ERUZBVUxUX0NFTExI
RUlHSFQ7CisgICAgICAgICBwLT5kcmF3Qm9yZGVyID0gMTsKICAKICAKICAJLyogR2V0IHNldHRp
bmdzIGZyb20gY29uZmlnIGZpbGUgKi8KICAKKioqKioqKioqKioqKioqCioqKiAyNDEsMjQ4ICoq
KioKLS0tIDI0NCwyNTUgLS0tLQogIAkvKiB1c2UgQUNTIGNoYXJhY3RlcnM/ICovCiAgCXAtPnVz
ZUFDUyA9IGRydnRoaXMtPmNvbmZpZ19nZXRfYm9vbChkcnZ0aGlzLT5uYW1lLCAiVXNlQUNTIiwg
MCwgMCk7CiAgCWRlYnVnKFJQVF9ERUJVRywgIiVzOiB1c2luZyBBQ1MgJXMiLCBkcnZ0aGlzLT5u
YW1lLCAocC0+dXNlQUNTKSA/ICJPTiIgOiAiT0ZGIik7CiAgCisgCS8qIGRyYXcgYm9yZGVyID8g
Ki8KKyAJcC0+ZHJhd0JvcmRlciA9IGRydnRoaXMtPmNvbmZpZ19nZXRfYm9vbChkcnZ0aGlzLT5u
YW1lLCAiRHJhd0JvcmRlciIsIDAsIDEpOworIAlkZWJ1ZyhSUFRfREVCVUcsICIlczogZHJhd2lu
ZyBCb3JkZXIgJXMiLCBkcnZ0aGlzLT5uYW1lLCAocC0+ZHJhd0JvcmRlcikgPyAiT04iIDogIk9G
RiIpOworIAogIAkvKiBHZXQgc2l6ZSBzZXR0aW5ncyAqLwogIAlpZiAoKGRydnRoaXMtPnJlcXVl
c3RfZGlzcGxheV93aWR0aCgpID4gMCkKICAJICAgICYmIChkcnZ0aGlzLT5yZXF1ZXN0X2Rpc3Bs
YXlfaGVpZ2h0KCkgPiAwKSkgewogIAkJLyogSWYgdGhpcyBkcml2ZXIgaXMgc2Vjb25kYXJ5IGRy
aXZlciwgdXNlIHNpemUgZnJvbSBwcmltYXJ5IGRyaXZlciAqLwoqKioqKioqKioqKioqKioKKioq
IDI5MCwzMDEgKioqKgogIAlub2RlbGF5KHN0ZHNjciwgVFJVRSk7CiAgCWludHJmbHVzaChzdGRz
Y3IsIEZBTFNFKTsKICAJa2V5cGFkKHN0ZHNjciwgVFJVRSk7CiAgCiEgCXAtPndpbiA9IG5ld3dp
bihwLT5oZWlnaHQgKyAyLAkvKiArMiBmb3IgdGhlIGJvcmRlciAqLwohIAkJCSBwLT53aWR0aCAr
IDIsCS8qICsyIGZvciB0aGUgYm9yZGVyICovCiEgCQkJIHAtPnlvZmZzLAohIAkJCSBwLT54b2Zm
cyk7CiAgCiAgCS8vbm9kZWxheShwLT53aW4sIFRSVUUpOwogIAkvL2ludHJmbHVzaChwLT53aW4s
IEZBTFNFKTsKICAJLy9rZXlwYWQocC0+d2luLCBUUlVFKTsKLS0tIDI5NywzMTUgLS0tLQogIAlu
b2RlbGF5KHN0ZHNjciwgVFJVRSk7CiAgCWludHJmbHVzaChzdGRzY3IsIEZBTFNFKTsKICAJa2V5
cGFkKHN0ZHNjciwgVFJVRSk7CiAgCiEgICAgICAgICBpZihwLT5kcmF3Qm9yZGVyKSB7CiEgICAg
ICAgICAgICAgcC0+d2luID0gbmV3d2luKHAtPmhlaWdodCArIDIsCS8qICsyIGZvciB0aGUgYm9y
ZGVyICovCiEgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAtPndpZHRoICsgMiwJLyogKzIg
Zm9yIHRoZSBib3JkZXIgKi8KISAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcC0+eW9mZnMs
CiEgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAtPnhvZmZzKTsKISAgICAgICAgIH1lbHNl
ewohICAgICAgICAgICAgIHAtPndpbiA9IG5ld3dpbihwLT5oZWlnaHQsCiEgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgIHAtPndpZHRoLAohICAgICAgICAgICAgICAgICAgICAgICAgICAgICBw
LT55b2ZmcywKISAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcC0+eG9mZnMpOwohICAgICAg
ICAgfQogIAogIAkvL25vZGVsYXkocC0+d2luLCBUUlVFKTsKICAJLy9pbnRyZmx1c2gocC0+d2lu
LCBGQUxTRSk7CiAgCS8va2V5cGFkKHAtPndpbiwgVFJVRSk7CioqKioqKioqKioqKioqKgoqKiog
Mzk1LDQwMyAqKioqCiAgewogIAlQcml2YXRlRGF0YSAqcCA9IGRydnRoaXMtPnByaXZhdGVfZGF0
YTsKICAKICAJd2JrZ2RzZXQocC0+d2luLCBDT0xPUl9QQUlSKHAtPmN1cnJlbnRfY29sb3JfcGFp
cikgfCAnICcpOwohIAljdXJzZXNfd2JvcmRlcihkcnZ0aGlzKTsKICAJd2VyYXNlKHAtPndpbik7
CiAgfQogIAogIE1PRFVMRV9FWFBPUlQgdm9pZAotLS0gNDA5LDQyMCAtLS0tCiAgewogIAlQcml2
YXRlRGF0YSAqcCA9IGRydnRoaXMtPnByaXZhdGVfZGF0YTsKICAKICAJd2JrZ2RzZXQocC0+d2lu
LCBDT0xPUl9QQUlSKHAtPmN1cnJlbnRfY29sb3JfcGFpcikgfCAnICcpOwohIAohICAgICAgICAg
aWYocC0+ZHJhd0JvcmRlcikKISAgICAgICAgICAgICBjdXJzZXNfd2JvcmRlcihkcnZ0aGlzKTsK
ISAKICAJd2VyYXNlKHAtPndpbik7CiAgfQogIAogIE1PRFVMRV9FWFBPUlQgdm9pZAoqKioqKioq
KioqKioqKioKKioqIDQzNiw0NDMgKioqKgotLS0gNDUzLDQ2NCAtLS0tCiAgCiAgCWlmICgoeCA8
PSAwKSB8fCAoeSA8PSAwKSB8fCAoeCA+IHAtPndpZHRoKSB8fCAoeSA+IHAtPmhlaWdodCkpCiAg
CQlyZXR1cm47CiAgCisgICAgICAgICBpZighcC0+ZHJhd0JvcmRlcikgeworICAgICAgICAgICAg
IHgtLTsgeS0tOworICAgICAgICAgfQorIAogIAltdndhZGRzdHIocC0+d2luLCB5LCB4LCBzdHJp
bmcpOwogIH0KICAKICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLwoqKioqKioqKioqKioqKioKKioqIDQ1MSw0NTkgKioqKgog
IAogIAlpZiAoKHggPD0gMCkgfHwgKHkgPD0gMCkgfHwgKHggPiBwLT53aWR0aCkgfHwgKHkgPiBw
LT5oZWlnaHQpKQogIAkJcmV0dXJuOwogIAohIAltdndhZGRjaChwLT53aW4sIHksIHgsIGMpOwog
IH0KICAKICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
Ly8vLy8vLy8vLy8vLy8vLwogIC8vIERyYXdzIGEgdmVydGljYWwgYmFyOyBlcmFzZXMgZW50aXJl
IGNvbHVtbiBvbnNjcmVlbi4KLS0tIDQ3Miw0ODUgLS0tLQogIAogIAlpZiAoKHggPD0gMCkgfHwg
KHkgPD0gMCkgfHwgKHggPiBwLT53aWR0aCkgfHwgKHkgPiBwLT5oZWlnaHQpKQogIAkJcmV0dXJu
OwogIAohICAgICAgICAgaWYoIXAtPmRyYXdCb3JkZXIpIHsKISAgICAgICAgICAgICB4LS07IHkt
LTsKISAgICAgICAgIH0KISAKISAgICAgICAgIG12d2FkZGNoKHAtPndpbiwgeSwgeCwgYyk7CiEg
CiAgfQogIAogIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
Ly8vLy8vLy8vLy8vLy8vLy8vCiAgLy8gRHJhd3MgYSB2ZXJ0aWNhbCBiYXI7IGVyYXNlcyBlbnRp
cmUgY29sdW1uIG9uc2NyZWVuLgoqKioqKioqKioqKioqKioKKioqIDYwMCw2MDggKioqKgogIAkJ
CWN1cnNlc19yZXN0b3JlX3NjcmVlbihkcnZ0aGlzKTsKICAJCQl1bmdldGNoKGMpOwogIAkJfQog
IAohIAljdXJzZXNfd2JvcmRlcihkcnZ0aGlzKTsKICAJd3JlZnJlc2gocC0+d2luKTsKICB9CiAg
CiAgCi0tLSA2MjYsNjM2IC0tLS0KICAJCQljdXJzZXNfcmVzdG9yZV9zY3JlZW4oZHJ2dGhpcyk7
CiAgCQkJdW5nZXRjaChjKTsKICAJCX0KICAKISAgICAgICAgIGlmKHAtPmRyYXdCb3JkZXIpCiEg
ICAgICAgICAgICAgY3Vyc2VzX3dib3JkZXIoZHJ2dGhpcyk7CiEgCiAgCXdyZWZyZXNoKHAtPndp
bik7CiAgfQogIAogIAo=
------=_Part_17227_3306953.1191864547634--