From cb49cc5d8307d7c839ed79821fbfc85ec1627d8c Mon Sep 17 00:00:00 2001 From: Markus Brueffer Date: Thu, 9 Jun 2005 22:56:12 +0000 Subject: Add tpb 0.6.3, An On-Screen-Display for hotkeys of IBM ThinkPads and the first consumer of the updated acpi_ibm(4) driver: With TPB it is possible to bind a program to the ThinkPad, Mail, Home and Search button. TPB can also run a callback program on each state change with the changed state and the new state as options. So it is possible to trigger several actions on different events. TPB has an on-screen display (OSD) to show volume, mute, brightness and some other information. Furthermore TPB supports a software mixer, as the R series ThinkPads have no hardware mixer to change the volume. WWW: http://www.nongnu.org/tpb/ --- deskutils/tpb/files/patch-src-tpb.c | 121 ++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 deskutils/tpb/files/patch-src-tpb.c (limited to 'deskutils/tpb/files/patch-src-tpb.c') diff --git a/deskutils/tpb/files/patch-src-tpb.c b/deskutils/tpb/files/patch-src-tpb.c new file mode 100644 index 000000000000..a57e61a43def --- /dev/null +++ b/deskutils/tpb/files/patch-src-tpb.c @@ -0,0 +1,121 @@ +--- src/tpb.c.orig Sun Aug 22 15:45:11 2004 ++++ src/tpb.c Fri Jun 10 00:11:56 2005 +@@ -34,6 +34,10 @@ + #include + #include "config.h" + ++#ifdef __FreeBSD__ ++#include ++#endif ++ + #if ENABLE_NLS + #include + #endif /* ENABLE_NLS */ +@@ -163,6 +167,9 @@ + /* to initialize struct */ + memset(&last_thinkpad_state, 0x00, sizeof(t_thinkpad_state)); + if(get_nvram_state(&thinkpad_state) != 0) { ++#ifdef __FreeBSD__ ++ fprintf(stderr, _("acpi_ibm(4) driver not loaded. Exiting...")); ++#endif + _exit(1); + } + if(cfg.apm == STATE_ON) { +@@ -972,6 +979,7 @@ + /* get the current state from the nvram */ + int get_nvram_state(t_thinkpad_state *thinkpad_state) /* {{{ */ + { ++#ifndef __FreeBSD__ + static int fdsc = -1; /* -1 -> file not opened */ + unsigned char buffer[114]; + struct { +@@ -1030,13 +1038,50 @@ + thinkpad_state->mute_toggle = (thinkpad_state->mute_toggle & ~0x01) | (( buffer[0x60] & 0x40) >> 6); + thinkpad_state->powermgt_ac = (( buffer[0x39] & 0x07) ); + thinkpad_state->powermgt_battery = (( buffer[0x39] & 0x38) >> 3); ++#else ++ u_int n = 0; ++ size_t len = sizeof(n); ++ if ( sysctlbyname("dev.acpi_ibm.0.hotkey", &n, &len, NULL, 0) == -1 ) ++ return -1; ++ ++ thinkpad_state->thinkpad_toggle = (thinkpad_state->thinkpad_toggle & ~0x01) | (( n & (1<<3)) >> 3); ++ thinkpad_state->zoom_toggle = (thinkpad_state->zoom_toggle & ~0x01) | (( n & (1<<4)) >> 4); ++ thinkpad_state->display_toggle = (thinkpad_state->display_toggle & ~0x01) | (( n & (1<<6)) >> 6); ++ thinkpad_state->home_toggle = (thinkpad_state->home_toggle & ~0x01) | (( n & (1<<0)) ); ++ thinkpad_state->search_toggle = (thinkpad_state->search_toggle & ~0x01) | (( n & (1<<1)) >> 1); ++ thinkpad_state->mail_toggle = (thinkpad_state->mail_toggle & ~0x01) | (( n & (1<<2)) >> 2); ++ thinkpad_state->hibernate_toggle = (thinkpad_state->hibernate_toggle & ~0x01) | (( n & (1<<7)) >> 7); ++ thinkpad_state->expand_toggle = (thinkpad_state->expand_toggle & ~0x01) | (( n & (1<<9)) >> 9); ++ thinkpad_state->brightness_toggle = (thinkpad_state->brightness_toggle & ~0x01) | (( n & (1<<10)) >> 10); ++ thinkpad_state->volume_toggle = (thinkpad_state->volume_toggle & ~0x01) | (( n & (1<<11)) >> 11); ++ ++ if ( sysctlbyname("dev.acpi_ibm.0.wlan", &n, &len, NULL, 0) == -1 ) ++ return -1; ++ thinkpad_state->wireless_toggle = (thinkpad_state->wireless_toggle & ~0x01) | n; ++ ++ if ( sysctlbyname("dev.acpi_ibm.0.thinklight", &n, &len, NULL, 0) == -1 ) ++ return -1; ++ thinkpad_state->thinklight_toggle = (thinkpad_state->thinklight_toggle & ~0x01) | n; ++ ++ if ( sysctlbyname("dev.acpi_ibm.0.lcd_brightness", &n, &len, NULL, 0) == -1 ) ++ return -1; ++ thinkpad_state->brightness_level = n; ++ ++ if ( sysctlbyname("dev.acpi_ibm.0.volume", &n, &len, NULL, 0) == -1 ) ++ return -1; ++ thinkpad_state->volume_level = n; + ++ if ( sysctlbyname("dev.acpi_ibm.0.mute", &n, &len, NULL, 0) == -1 ) ++ return -1; ++ thinkpad_state->mute_toggle = (thinkpad_state->mute_toggle & ~0x01) | n; ++#endif + return 0; + } /* }}} */ + + /* get the current state from the apm subsystem */ + int get_apm_state(t_thinkpad_state *thinkpad_state) /* {{{ */ + { ++#ifndef __FreeBSD__ + unsigned int i; + static int fdsc = -1; /* -1 -> file not opened */ + char buffer[38]; +@@ -1114,7 +1159,15 @@ + thinkpad_state->ac_state = STATE_ON; + break; + } ++#else ++ u_long addr; ++ size_t len = sizeof(addr); + ++ if ( sysctlbyname("hw.acpi.acline", &addr, &len, NULL, 0) == -1 ) ++ return -1; ++ ++ thinkpad_state->ac_state = (addr == 1) ? STATE_ON : STATE_OFF; ++#endif + return 0; + } /* }}} */ + +@@ -1276,6 +1329,12 @@ + + /* only use writeback to nvram when cfg.mixersteps is different from DEFAULT_MIXERSTEPS */ + if(cfg.mixersteps != DEFAULT_MIXERSTEPS) { ++#ifdef __FreeBSD__ ++ u_int n = 0; ++ ++ if (sysctlbyname("dec.acpi_ibm.0.volume", NULL, NULL, &n, sizeof(n))) ++ fprintf(stderr, _("Unable to set volume sysctl")); ++#else + /* open nvram */ + if((fdsc = open(cfg.nvram, O_RDWR|O_NONBLOCK)) == -1) { + fprintf(stderr, _("Unable to open device %s: "), cfg.nvram); +@@ -1317,8 +1376,8 @@ + } + + close(fdsc); ++#endif + } +- + return; + + } /* }}} */ -- cgit v1.2.3