diff options
| -rw-r--r-- | plugins/sysinfo/match.c | 4 | ||||
| -rw-r--r-- | plugins/sysinfo/pci.c | 12 | ||||
| -rw-r--r-- | plugins/sysinfo/xsys.c | 855 | ||||
| -rw-r--r-- | plugins/sysinfo/xsys.h | 3 |
4 files changed, 470 insertions, 404 deletions
diff --git a/plugins/sysinfo/match.c b/plugins/sysinfo/match.c index 64d7a062..3ad44716 100644 --- a/plugins/sysinfo/match.c +++ b/plugins/sysinfo/match.c @@ -24,8 +24,6 @@ #include <unistd.h> #include "xsys.h" -extern int percentages; - float percentage(unsigned long long *free, unsigned long long *total) { unsigned long long result = (*free) * (unsigned long long)1000 / (*total); @@ -56,7 +54,7 @@ char *pretty_freespace(const char *desc, unsigned long long *free_k, unsigned lo free_space = free_space / 1024; total_space = total_space / 1024; } - if (percentages != 0) + if (sysinfo_get_percentages () != 0) snprintf(result, bsize, "%s: %.1f%s, %.1f%% free", desc, total_space, bytesize, percentage(free_k, total_k)); diff --git a/plugins/sysinfo/pci.c b/plugins/sysinfo/pci.c index 221df850..aba04e68 100644 --- a/plugins/sysinfo/pci.c +++ b/plugins/sysinfo/pci.c @@ -27,8 +27,6 @@ #include <pci/pci.h> #include "xsys.h" -#define PCIIDS "/usr/share/misc/pci.ids" - static struct pci_filter filter; /* Device filter */ static struct pci_access *pacc; int bus, dev, func; /* Location of the card */ @@ -112,9 +110,15 @@ int pci_find_by_class(u16 *class, char *vendor, char *device) void pci_find_fullname(char *fullname, char *vendor, char *device) { - char buffer[bsize], vendorname[bsize/2] = "", devicename[bsize/2] = "", *position; + char buffer[bsize]; + char vendorname[bsize/2] = ""; + char devicename[bsize/2] = ""; + char *position; int cardfound = 0; - FILE *fp = fopen(PCIIDS, "r"); + + sysinfo_get_pciids (buffer); + FILE *fp = fopen (buffer, "r"); + if(fp == NULL) { snprintf(fullname, bsize, "%s:%s", vendor, device); return; diff --git a/plugins/sysinfo/xsys.c b/plugins/sysinfo/xsys.c index 171282ff..b3896de9 100644 --- a/plugins/sysinfo/xsys.c +++ b/plugins/sysinfo/xsys.c @@ -29,588 +29,649 @@ #include "match.h" #include "xsys.h" +#define DEFAULT_FORMAT "%B%1:%B %2 **" +#define DEFAULT_PERCENTAGES 1 +#define DEFAULT_PCIIDS "/usr/share/hwdata/pci.ids" + static xchat_plugin *ph; static char name[] = "SysInfo"; static char desc[] = "Display info about your hardware and OS"; static char version[] = "2.2"; -static char format[bsize] = "%B%1%B[%2]"; -unsigned int percentages = 1; - -static void load_config(); -static void save_config(); - -static int format_cb (char *word[], char *word_eol[], void *userdata); -static int percentages_cb (char *word[], char *word_eol[], void *userdata); -static int sysinfo_cb (char *word[], char *word_eol[], void *userdata); -static int xsys_cb (char *word[], char *word_eol[], void *userdata); -static int cpuinfo_cb (char *word[], char *word_eol[], void *userdata); -static int uptime_cb (char *word[], char *word_eol[], void *userdata); -static int osinfo_cb (char *word[], char *word_eol[], void *userdata); -static int sound_cb (char *word[], char *word_eol[], void *userdata); -static int netdata_cb (char *word[], char *word_eol[], void *userdata); -static int netstream_cb (char *word[], char *word_eol[], void *userdata); -static int disk_cb (char *word[], char *word_eol[], void *userdata); -static int mem_cb (char *word[], char *word_eol[], void *userdata); -static int video_cb (char *word[], char *word_eol[], void *userdata); -static int ether_cb (char *word[], char *word_eol[], void *userdata); -static int distro_cb (char *word[], char *word_eol[], void *userdata); -#if 0 -static int hwmon_cb (char *word[], char *word_eol[], void *userdata); -#endif - -int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, - char **plugin_desc, char **plugin_version, char *arg) -{ - ph = plugin_handle; - *plugin_name = name; - *plugin_desc = desc; - *plugin_version = version; - - xchat_hook_command(ph, "XSYS2FORMAT",XCHAT_PRI_NORM, format_cb, NULL, NULL); - xchat_hook_command(ph, "PERCENTAGES",XCHAT_PRI_NORM, percentages_cb, NULL, NULL); - xchat_hook_command(ph, "SYSINFO", XCHAT_PRI_NORM, sysinfo_cb, NULL, (void *) 0); - xchat_hook_command(ph, "ESYSINFO", XCHAT_PRI_NORM, sysinfo_cb, NULL, (void *) 1); - xchat_hook_command(ph, "XSYS", XCHAT_PRI_NORM, xsys_cb, NULL, (void *) 0); - xchat_hook_command(ph, "EXSYS", XCHAT_PRI_NORM, xsys_cb, NULL, (void *) 1); - xchat_hook_command(ph, "CPUINFO", XCHAT_PRI_NORM, cpuinfo_cb, NULL, (void *) 0); - xchat_hook_command(ph, "ECPUINFO", XCHAT_PRI_NORM, cpuinfo_cb, NULL, (void *) 1); - xchat_hook_command(ph, "SYSUPTIME", XCHAT_PRI_NORM, uptime_cb, NULL, (void *) 0); - xchat_hook_command(ph, "ESYSUPTIME", XCHAT_PRI_NORM, uptime_cb, NULL, (void *) 1); - xchat_hook_command(ph, "OSINFO", XCHAT_PRI_NORM, osinfo_cb, NULL, (void *) 0); - xchat_hook_command(ph, "EOSINFO", XCHAT_PRI_NORM, osinfo_cb, NULL, (void *) 1); - xchat_hook_command(ph, "SOUND", XCHAT_PRI_NORM, sound_cb, NULL, (void *) 0); - xchat_hook_command(ph, "ESOUND", XCHAT_PRI_NORM, sound_cb, NULL, (void *) 1); - xchat_hook_command(ph, "NETDATA", XCHAT_PRI_NORM, netdata_cb, NULL, (void *) 0); - xchat_hook_command(ph, "ENETDATA", XCHAT_PRI_NORM, netdata_cb, NULL, (void *) 1); - xchat_hook_command(ph, "NETSTREAM", XCHAT_PRI_NORM, netstream_cb, NULL, (void *) 0); - xchat_hook_command(ph, "ENETSTREAM", XCHAT_PRI_NORM, netstream_cb, NULL, (void *) 1); - xchat_hook_command(ph, "DISKINFO", XCHAT_PRI_NORM, disk_cb, NULL, (void *) 0); - xchat_hook_command(ph, "EDISKINFO", XCHAT_PRI_NORM, disk_cb, NULL, (void *) 1); - xchat_hook_command(ph, "MEMINFO", XCHAT_PRI_NORM, mem_cb, NULL, (void *) 0); - xchat_hook_command(ph, "EMEMINFO", XCHAT_PRI_NORM, mem_cb, NULL, (void *) 1); - xchat_hook_command(ph, "VIDEO", XCHAT_PRI_NORM, video_cb, NULL, (void *) 0); - xchat_hook_command(ph, "EVIDEO", XCHAT_PRI_NORM, video_cb, NULL, (void *) 1); - xchat_hook_command(ph, "ETHER", XCHAT_PRI_NORM, ether_cb, NULL, (void *) 0); - xchat_hook_command(ph, "EETHER", XCHAT_PRI_NORM, ether_cb, NULL, (void *) 1); - xchat_hook_command(ph, "DISTRO", XCHAT_PRI_NORM, distro_cb, NULL, (void *) 0); - xchat_hook_command(ph, "EDISTRO", XCHAT_PRI_NORM, distro_cb, NULL, (void *) 1); -#if 0 - xchat_hook_command(ph, "HWMON", XCHAT_PRI_NORM, hwmon_cb, NULL, (void *) 0); - xchat_hook_command(ph, "EHWMON", XCHAT_PRI_NORM, hwmon_cb, NULL, (void *) 1); -#endif - load_config(); - xchat_printf (ph, "%s plugin loaded\n", name); - - return 1; -} - -static void save_config() +static int +cpuinfo_cb (char *word[], char *word_eol[], void *userdata) { - FILE *fp; + char model[bsize]; + char vendor[bsize]; + char cache[bsize]; char buffer[bsize]; - snprintf(buffer, bsize, "%s/xsys2.conf", xchat_get_info(ph, "xchatdirfs")); - fp = fopen(buffer, "w"); - if(fp == NULL) - { - printf("ERROR writing xsys2.conf"); - return; - } - fprintf(fp, "format: %s\n", format); - fprintf(fp, "percentages: %i\n", percentages); - fclose(fp); - return; -} - -static void load_config() -{ - FILE *fp; - char buffer[bsize]; - snprintf(buffer, bsize, "%s/xsys2.conf", xchat_get_info(ph, "xchatdirfs")); - fp = fopen(buffer, "r"); - if(fp == NULL) - save_config(); - - while(fgets(buffer, bsize, fp) != NULL) - { - find_match_char(buffer, "format", format); - find_match_int(buffer, "percentages", &percentages); - } - fclose(fp); -} - -static int format_cb(char *word[], char *word_eol[], void *userdata) -{ - if(*(word[2]) == '\0') - xchat_printf(ph, "Current format string:\n%s", format); - else - { - strncpy(format, word_eol[2], bsize); - save_config(); - } - return XCHAT_EAT_ALL; -} - -static int percentages_cb(char *word[], char *word_eol[], void *userdata) -{ - if(*(word[2]) == '\0') - if (percentages != 0) - xchat_printf(ph, "Percentages currently enabled"); - else - xchat_printf(ph, "Percentages currently disabled"); - else - { - percentages = atoi(word[2]); - save_config(); - } - return XCHAT_EAT_ALL; -} - -static int sysinfo_cb(char *word[], char *word_eol[], void *userdata) -{ - char sysinfo[bsize], buffer[bsize], cpu_model[bsize], cpu_cache[bsize], cpu_vendor[bsize]; - char os_host[bsize], os_user[bsize], os_kernel[bsize]; - unsigned long long mem_total, mem_free; + char format[bsize]; unsigned int count; - double cpu_freq; + double freq; int giga = 0; - sysinfo[0] = '\0'; -// BEGIN OS PARSING - if(xs_parse_os(os_user, os_host, os_kernel) != 0) + if (xs_parse_cpu (model, vendor, &freq, cache, &count) != 0) { - xchat_printf(ph, "ERROR in parse_os()"); + xchat_printf (ph, "ERROR in parse_cpu()"); return XCHAT_EAT_ALL; } - snprintf(buffer, bsize, "%s", os_kernel); - format_output("os", buffer, format); - strncat(sysinfo, buffer, bsize-strlen(sysinfo)); - -// BEGIN DISTRO PARSING - if(xs_parse_distro(buffer) != 0) - strncpy(buffer, "Unknown", bsize); - format_output("distro", buffer, format); - strcat(sysinfo, "\017 "); - strncat(sysinfo, buffer, bsize-strlen(sysinfo)); - -// BEGIN CPU PARSING - if(xs_parse_cpu(cpu_model, cpu_vendor, &cpu_freq, cpu_cache, &count) != 0) - { - xchat_printf(ph, "ERROR in parse_cpu()"); - return XCHAT_EAT_ALL; - } - - if(cpu_freq > 1000) + if (freq > 1000) { - cpu_freq /= 1000; + freq /= 1000; giga = 1; } - - if(giga) snprintf(buffer, bsize, "%d x %s (%s) @ %.2fGHz", count, cpu_model, cpu_vendor, cpu_freq); - else snprintf(buffer, bsize, "%d x %s (%s) @ %.0fMHz", count, cpu_model, cpu_vendor, cpu_freq); - format_output("cpu", buffer, format); - strcat(sysinfo, "\017 "); - strncat(sysinfo, buffer, bsize-strlen(sysinfo)); -// BEGIN MEMORY PARSING - if(xs_parse_meminfo(&mem_total, &mem_free, 0) == 1) + if (giga) { - xchat_printf(ph, "ERROR in parse_meminfo!"); - return XCHAT_EAT_ALL; - } - snprintf(buffer, bsize, "%s", pretty_freespace("Physical", &mem_free, &mem_total)); - format_output("mem", buffer, format); - strcat(sysinfo, "\017 "); - strncat(sysinfo, buffer, bsize-strlen(sysinfo)); - -// BEGIN DISK PARSING - if(xs_parse_df(NULL, buffer)) - { - xchat_printf(ph, "ERROR in parse_df"); - return XCHAT_EAT_ALL; + snprintf (buffer, bsize, "%d x %s (%s) @ %.2fGHz w/ %s L2 Cache", count, model, vendor, freq, cache); } - format_output("disk", buffer, format); - strcat(sysinfo, "\017 "); - strncat(sysinfo, buffer, bsize-strlen(buffer)); - -//BEGIN VIDEO PARSING - if(xs_parse_video(buffer)) + else { - xchat_printf(ph, "ERROR in parse_video"); - return XCHAT_EAT_ALL; + snprintf (buffer, bsize, "%d x %s (%s) @ %.0fMHz w/ %s L2 Cache", count, model, vendor, freq, cache); } - format_output("video", buffer, format); - strcat(sysinfo, "\017 "); - strncat(sysinfo, buffer, bsize-strlen(buffer)); -//BEGIN SOUND PARSING - if(xs_parse_sound(buffer)) - strncpy(buffer, "Not present", bsize); - format_output("sound", buffer, format); - strcat(sysinfo, "\017 "); - strncat(sysinfo, buffer, bsize-strlen(buffer)); - - if((long)userdata) - xchat_printf(ph, "%s", sysinfo); - else - xchat_commandf(ph, "say %s", sysinfo); - - return XCHAT_EAT_ALL; -} -static int xsys_cb(char *word[], char *word_eol[], void *userdata) -{ - if((long)userdata) - xchat_printf(ph, "You are using %s v%s (http://dev.gentoo.org/~chainsaw/xsys)", name, version); - else - xchat_commandf(ph, "me is using %s v%s (http://dev.gentoo.org/~chainsaw/xsys)", name, version); - - return XCHAT_EAT_ALL; -} + xchat_pluginpref_get_str (ph, "format", format); + format_output ("CPU", buffer, format); -static int cpuinfo_cb(char *word[], char *word_eol[], void *userdata) -{ - char model[bsize], vendor[bsize], cache[bsize], buffer[bsize]; - unsigned int count; - double freq; - int giga = 0; - - if(xs_parse_cpu(model, vendor, &freq, cache, &count) != 0) + if ((long)userdata) { - xchat_printf(ph, "ERROR in parse_cpu()"); - return XCHAT_EAT_ALL; + xchat_printf (ph, "%s", buffer); } - - if(freq > 1000) + else { - freq /= 1000; - giga = 1; + xchat_commandf (ph, "say %s", buffer); } - - if(giga) snprintf(buffer, bsize, "%d x %s (%s) @ %.2fGHz w/ %s L2 Cache", count, model, vendor, freq, cache); - else snprintf(buffer, bsize, "%d x %s (%s) @ %.0fMHz w/ %s L2 Cache", count, model, vendor, freq, cache); - - format_output("cpu", buffer, format); - - if((long)userdata) - xchat_printf(ph, "%s", buffer); - else - xchat_commandf(ph, "say %s", buffer); - + return XCHAT_EAT_ALL; } -static int uptime_cb(char *word[], char *word_eol[], void *userdata) +static int +uptime_cb (char *word[], char *word_eol[], void *userdata) { char buffer[bsize]; - int weeks, days, hours, minutes, seconds; - - if(xs_parse_uptime(&weeks, &days, &hours, &minutes, &seconds)) + char format[bsize]; + int weeks; + int days; + int hours; + int minutes; + int seconds; + + if (xs_parse_uptime (&weeks, &days, &hours, &minutes, &seconds)) { - xchat_printf(ph, "ERROR in parse_uptime()"); + xchat_printf (ph, "ERROR in parse_uptime()"); return XCHAT_EAT_ALL; } - - if( minutes != 0 || hours != 0 || days != 0 || weeks != 0 ) + + if (minutes != 0 || hours != 0 || days != 0 || weeks != 0) { - if( hours != 0 || days != 0 || weeks != 0 ) + if (hours != 0 || days != 0 || weeks != 0) { - if( days !=0 || weeks != 0 ) + if (days !=0 || weeks != 0) { - if( weeks != 0 ) + if (weeks != 0) { - snprintf( buffer, bsize, "%dw %dd %dh %dm %ds", - weeks, days, hours, minutes, seconds ); + snprintf (buffer, bsize, "%dw %dd %dh %dm %ds", weeks, days, hours, minutes, seconds); } else { - snprintf( buffer, bsize, "%dd %dh %dm %ds", - days, hours, minutes, seconds ); + snprintf (buffer, bsize, "%dd %dh %dm %ds", days, hours, minutes, seconds); } } else { - snprintf( buffer, bsize, "%dh %dm %ds", - hours, minutes, seconds ); + snprintf (buffer, bsize, "%dh %dm %ds", hours, minutes, seconds); } } else { - snprintf( buffer, bsize, "%dm %ds", minutes, seconds ); + snprintf (buffer, bsize, "%dm %ds", minutes, seconds); } } - format_output("uptime", buffer, format); - - if((long)userdata) - xchat_printf(ph, "%s", buffer); + format_output ("Uptime", buffer, format); + + if ((long)userdata) + { + xchat_printf (ph, "%s", buffer); + } else - xchat_commandf(ph, "say %s", buffer); - + { + xchat_commandf (ph, "say %s", buffer); + } + return XCHAT_EAT_ALL; } -static int osinfo_cb(char *word[], char *word_eol[], void *userdata) +static int +osinfo_cb (char *word[], char *word_eol[], void *userdata) { - char buffer[bsize], user[bsize], host[bsize], kernel[bsize]; - - if(xs_parse_os(user, host, kernel) != 0) + char buffer[bsize]; + char user[bsize]; + char host[bsize]; + char kernel[bsize]; + char format[bsize]; + + if (xs_parse_os (user, host, kernel) != 0) { - xchat_printf(ph, "ERROR in parse_os()"); + xchat_printf (ph, "ERROR in parse_os()"); return XCHAT_EAT_ALL; } - snprintf(buffer, bsize, "%s@%s, %s", user, host, kernel); - format_output("os", buffer, format); + snprintf (buffer, bsize, "%s@%s, %s", user, host, kernel); + xchat_pluginpref_get_str (ph, "format", format); + format_output ("OS", buffer, format); - if((long)userdata) - xchat_printf(ph, "%s", buffer); + if ((long)userdata) + { + xchat_printf (ph, "%s", buffer); + } else - xchat_commandf(ph, "say %s", buffer); - + { + xchat_commandf (ph, "say %s", buffer); + } + return XCHAT_EAT_ALL; } -static int sound_cb(char *word[], char *world_eol[], void *userdata) +static int +sound_cb (char *word[], char *world_eol[], void *userdata) { char sound[bsize]; - if(xs_parse_sound(sound) != 0) + char format[bsize]; + + if (xs_parse_sound (sound) != 0) { - xchat_printf(ph, "ERROR in parse_asound()!"); + xchat_printf (ph, "ERROR in parse_asound()!"); return XCHAT_EAT_ALL; } - - format_output("sound", sound, format); - - if((long)userdata) - xchat_printf(ph, "%s", sound); + + xchat_pluginpref_get_str (ph, "format", format); + format_output ("Sound", sound, format); + + if ((long)userdata) + { + xchat_printf (ph, "%s", sound); + } else - xchat_commandf(ph, "say %s", sound); - + { + xchat_commandf (ph, "say %s", sound); + } + return XCHAT_EAT_ALL; } -static int distro_cb(char *word[], char *word_eol[], void *userdata) +static int +distro_cb (char *word[], char *word_eol[], void *userdata) { char name[bsize]; - if(xs_parse_distro(name) != 0) + char format[bsize]; + + if (xs_parse_distro (name) != 0) { - xchat_printf(ph, "ERROR in parse_distro()!"); + xchat_printf (ph, "ERROR in parse_distro()!"); return XCHAT_EAT_ALL; } - - format_output("distro", name, format); - if((long)userdata) - xchat_printf(ph, "%s", name); + + xchat_pluginpref_get_str (ph, "format", format); + format_output("Distro", name, format); + + if ((long)userdata) + { + xchat_printf (ph, "%s", name); + } else - xchat_commandf(ph, "say %s", name); + { + xchat_commandf (ph, "say %s", name); + } return XCHAT_EAT_ALL; } -static int netdata_cb(char *word[], char *word_eol[], void *userdata) +static int +netdata_cb (char *word[], char *word_eol[], void *userdata) { char netdata[bsize]; - unsigned long long bytes_recv, bytes_sent; + char format[bsize]; + unsigned long long bytes_recv; + unsigned long long bytes_sent; - if(*word[2] == '\0') + if (*word[2] == '\0') { - xchat_printf(ph, "You must specify a network device! (eg.: /netdata eth0)"); + xchat_printf (ph, "You must specify a network device! (eg.: /netdata eth0)"); return XCHAT_EAT_ALL; } - - if(xs_parse_netdev(word[2], &bytes_recv, &bytes_sent) != 0) + + if (xs_parse_netdev (word[2], &bytes_recv, &bytes_sent) != 0) { - xchat_printf(ph, "ERROR in parse_netdev"); + xchat_printf (ph, "ERROR in parse_netdev"); return XCHAT_EAT_ALL; } - + bytes_recv /= 1024; bytes_sent /= 1024; - snprintf(netdata, bsize, "%s: %.1f MB Recieved, %.1f MB Sent", word[2], (double)bytes_recv/1024.0, (double)bytes_sent/1024.0); - format_output("netdata", netdata, format); - if((long)userdata) - xchat_printf(ph, "%s", netdata); + snprintf (netdata, bsize, "%s: %.1f MB Recieved, %.1f MB Sent", word[2], (double)bytes_recv/1024.0, (double)bytes_sent/1024.0); + xchat_pluginpref_get_str (ph, "format", format); + format_output ("Netdata", netdata, format); + + if ((long)userdata) + { + xchat_printf (ph, "%s", netdata); + } else - xchat_commandf(ph, "say %s", netdata); - + { + xchat_commandf (ph, "say %s", netdata); + } + return XCHAT_EAT_ALL; } -static int netstream_cb(char *word[], char *word_eol[], void *userdata) +static int +netstream_cb (char *word[], char *word_eol[], void *userdata) { - char netstream[bsize], mag_r[3], mag_s[5]; - unsigned long long bytes_recv, bytes_sent, bytes_recv_p, bytes_sent_p; + char netstream[bsize]; + char mag_r[3]; + char mag_s[5]; + char format[bsize]; + unsigned long long bytes_recv; + unsigned long long bytes_sent; + unsigned long long bytes_recv_p; + unsigned long long bytes_sent_p; + struct timespec ts = {1, 0}; - - if(*word[2] == '\0') + if (*word[2] == '\0') { - xchat_printf(ph, "You must specify a network device! (eg.: /netstream eth0)"); + xchat_printf (ph, "You must specify a network device! (eg.: /netstream eth0)"); return XCHAT_EAT_ALL; } - - if(xs_parse_netdev(word[2], &bytes_recv, &bytes_sent) != 0) + + if (xs_parse_netdev(word[2], &bytes_recv, &bytes_sent) != 0) { - xchat_printf(ph, "ERROR in parse_netdev"); + xchat_printf (ph, "ERROR in parse_netdev"); return XCHAT_EAT_ALL; } - - while(nanosleep(&ts, &ts) < 0); - - if(xs_parse_netdev(word[2], &bytes_recv_p, &bytes_sent_p) != 0) + + while (nanosleep (&ts, &ts) < 0); + + if (xs_parse_netdev(word[2], &bytes_recv_p, &bytes_sent_p) != 0) { - xchat_printf(ph, "ERROR in parse_netdev"); + xchat_printf (ph, "ERROR in parse_netdev"); return XCHAT_EAT_ALL; } - + bytes_recv = (bytes_recv_p - bytes_recv); bytes_sent = (bytes_sent_p - bytes_sent); - - if(bytes_recv>1024) + + if (bytes_recv > 1024) { bytes_recv /= 1024; - snprintf(mag_r, 5, "KB/s"); + snprintf (mag_r, 5, "KB/s"); } - else snprintf(mag_r, 5, "B/s"); - - if(bytes_sent>1024) + else + { + snprintf (mag_r, 5, "B/s"); + } + + if (bytes_sent > 1024) { bytes_sent /= 1024; - snprintf(mag_s, 5, "KB/s"); + snprintf (mag_s, 5, "KB/s"); } - else snprintf(mag_s, 5, "B/s"); - - snprintf(netstream, bsize, "%s: Receiving %llu %s, Sending %llu %s", word[2], bytes_recv, mag_r, bytes_sent, mag_s); - format_output("netstream", netstream, format); - if((long)userdata) - xchat_printf(ph, "%s", netstream); else - xchat_commandf(ph, "say %s", netstream); - + { + snprintf (mag_s, 5, "B/s"); + } + + snprintf (netstream, bsize, "%s: Receiving %llu %s, Sending %llu %s", word[2], bytes_recv, mag_r, bytes_sent, mag_s); + xchat_pluginpref_get_str (ph, "format", format); + format_output ("Netstream", netstream, format); + + if ((long)userdata) + { + xchat_printf (ph, "%s", netstream); + } + else + { + xchat_commandf (ph, "say %s", netstream); + } + return XCHAT_EAT_ALL; } -static int disk_cb(char *word[], char *word_eol[], void *userdata) +static int +disk_cb (char *word[], char *word_eol[], void *userdata) { char string[bsize] = {0,}; - - if(*word[2] == '\0') + char format[bsize]; + + if (*word[2] == '\0') { - if(xs_parse_df(NULL, string)) + if (xs_parse_df(NULL, string)) { - xchat_printf(ph, "ERROR in parse_df"); + xchat_printf (ph, "ERROR in parse_df"); return XCHAT_EAT_ALL; } } else { - if(xs_parse_df(word[2], string)) + if (xs_parse_df(word[2], string)) { - xchat_printf(ph, "ERROR in parse_df"); + xchat_printf (ph, "ERROR in parse_df"); return XCHAT_EAT_ALL; } } + + xchat_pluginpref_get_str (ph, "format", format); + format_output ("Disk", string, format); - format_output("disk", string, format); - - if((long)userdata) + if ((long)userdata) + { xchat_printf(ph, "%s", string); + } else + { xchat_commandf(ph, "say %s", string); - + } + return XCHAT_EAT_ALL; } -static int mem_cb(char *word[], char *word_eol[], void *userdata) +static int +mem_cb (char *word[], char *word_eol[], void *userdata) { - unsigned long long mem_total, mem_free, swap_total, swap_free; + unsigned long long mem_total; + unsigned long long mem_free; + unsigned long long swap_total; + unsigned long long swap_free; char string[bsize]; - - if(xs_parse_meminfo(&mem_total, &mem_free, 0) == 1) + char format[bsize]; + + if (xs_parse_meminfo (&mem_total, &mem_free, 0) == 1) { - xchat_printf(ph, "ERROR in parse_meminfo!"); + xchat_printf (ph, "ERROR in parse_meminfo!"); return XCHAT_EAT_ALL; } - if(xs_parse_meminfo(&swap_total, &swap_free, 1) == 1) + if (xs_parse_meminfo (&swap_total, &swap_free, 1) == 1) { - xchat_printf(ph, "ERROR in parse_meminfo!"); + xchat_printf (ph, "ERROR in parse_meminfo!"); return XCHAT_EAT_ALL; } - snprintf(string, bsize, "%s - %s", pretty_freespace("Physical", &mem_free, &mem_total), - pretty_freespace("Swap", &swap_free, &swap_total)); - format_output("mem", string, format); + snprintf (string, bsize, "%s - %s", pretty_freespace ("Physical", &mem_free, &mem_total), pretty_freespace ("Swap", &swap_free, &swap_total)); + xchat_pluginpref_get_str (ph, "format", format); + format_output ("RAM", string, format); - if((long)userdata) - xchat_printf(ph, "%s", string); + if ((long)userdata) + { + xchat_printf (ph, "%s", string); + } else - xchat_commandf(ph, "say %s", string); + { + xchat_commandf (ph, "say %s", string); + } return XCHAT_EAT_ALL; } -static int video_cb(char *word[], char *word_eol[], void *userdata) +static int +video_cb (char *word[], char *word_eol[], void *userdata) { - char vid_card[bsize], agp_bridge[bsize], buffer[bsize]; + char vid_card[bsize]; + char agp_bridge[bsize]; + char buffer[bsize]; + char format[bsize]; int ret; - if((ret = xs_parse_video(vid_card)) != 0) + + if ((ret = xs_parse_video (vid_card)) != 0) { - xchat_printf(ph, "ERROR in parse_video! %d", ret); + xchat_printf (ph, "ERROR in parse_video! %d", ret); return XCHAT_EAT_ALL; } - - if(xs_parse_agpbridge(agp_bridge) != 0) - snprintf(buffer, bsize, "%s", vid_card); + + if (xs_parse_agpbridge (agp_bridge) != 0) + { + snprintf (buffer, bsize, "%s", vid_card); + } else - snprintf(buffer, bsize, "%s @ %s", vid_card, agp_bridge); - - format_output("video", buffer, format); - if((long)userdata) - xchat_printf(ph, "%s", buffer); + { + snprintf (buffer, bsize, "%s @ %s", vid_card, agp_bridge); + } + + xchat_pluginpref_get_str (ph, "format", format); + format_output ("VGA", buffer, format); + if ((long)userdata) + { + xchat_printf (ph, "%s", buffer); + } else - xchat_commandf(ph, "say %s", buffer); - + { + xchat_commandf (ph, "say %s", buffer); + } + return XCHAT_EAT_ALL; } -static int ether_cb(char *word[], char *word_eol[], void *userdata) +static int +ether_cb (char *word[], char *word_eol[], void *userdata) { char ethernet_card[bsize]; - if(xs_parse_ether(ethernet_card)) - strncpy(ethernet_card, "None found", bsize); - format_output("ether", ethernet_card, format); - if((long)userdata) + char format[bsize]; + + if (xs_parse_ether (ethernet_card)) + { + strncpy (ethernet_card, "None found", bsize); + } + + xchat_pluginpref_get_str (ph, "format", format); + format_output ("Ethernet", ethernet_card, format); + + if ((long)userdata) + { xchat_printf(ph, "%s", ethernet_card); + } else + { xchat_commandf(ph, "say %s", ethernet_card); - + } + return XCHAT_EAT_ALL; } -#if 0 -static int hwmon_cb(char *word[], char *word_eol[], void *userdata) +int +sysinfo_get_percentages () { - char chip[bsize], buffer[bsize]; - - if(xs_parse_hwmon_chip(chip)) + return xchat_pluginpref_get_int (ph, "percentages"); +} + +void +sysinfo_get_pciids (char* dest) +{ + xchat_pluginpref_get_str (ph, "pciids", dest); +} + +static int +sysinfo_cb (char *word[], char *word_eol[], void *userdata) +{ + char sysinfo[bsize]; + char buffer[bsize]; + char cpu_model[bsize]; + char cpu_cache[bsize]; + char cpu_vendor[bsize]; + char os_host[bsize]; + char os_user[bsize]; + char os_kernel[bsize]; + char format[bsize]; + unsigned long long mem_total; + unsigned long long mem_free; + unsigned int count; + double cpu_freq; + int giga = 0; + sysinfo[0] = '\0'; + + xchat_pluginpref_get_str (ph, "format", format); + + /* BEGIN OS PARSING */ + if (xs_parse_os (os_user, os_host, os_kernel) != 0) { - xchat_printf(ph, "ERROR No hardware monitoring support found"); + xchat_printf (ph, "ERROR in parse_os()"); return XCHAT_EAT_ALL; } - format_output("sensor", chip, format); - strcat(chip, "\017 "); - xs_parse_hwmon_temp(buffer, 1); - format_output("temp1", buffer, format); - strncat(chip, buffer, bsize); - - if((long)userdata) - xchat_printf(ph, "%s", chip); + snprintf (buffer, bsize, "%s", os_kernel); + format_output ("OS", buffer, format); + strncat (sysinfo, buffer, bsize - strlen (sysinfo)); + + /* BEGIN DISTRO PARSING */ + if (xs_parse_distro (buffer) != 0) + { + strncpy (buffer, "Unknown", bsize); + } + + format_output ("Distro", buffer, format); + strcat (sysinfo, "\017 "); + strncat (sysinfo, buffer, bsize - strlen (sysinfo)); + + /* BEGIN CPU PARSING */ + if (xs_parse_cpu (cpu_model, cpu_vendor, &cpu_freq, cpu_cache, &count) != 0) + { + xchat_printf (ph, "ERROR in parse_cpu()"); + return XCHAT_EAT_ALL; + } + + if (cpu_freq > 1000) + { + cpu_freq /= 1000; + giga = 1; + } + + if (giga) + { + snprintf (buffer, bsize, "%d x %s (%s) @ %.2fGHz", count, cpu_model, cpu_vendor, cpu_freq); + } else - xchat_commandf(ph, "say %s", chip); - + { + snprintf (buffer, bsize, "%d x %s (%s) @ %.0fMHz", count, cpu_model, cpu_vendor, cpu_freq); + } + + format_output ("CPU", buffer, format); + strcat (sysinfo, "\017 "); + strncat (sysinfo, buffer, bsize - strlen (sysinfo)); + + /* BEGIN MEMORY PARSING */ + if (xs_parse_meminfo (&mem_total, &mem_free, 0) == 1) + { + xchat_printf (ph, "ERROR in parse_meminfo!"); + return XCHAT_EAT_ALL; + } + + snprintf (buffer, bsize, "%s", pretty_freespace ("Physical", &mem_free, &mem_total)); + format_output ("RAM", buffer, format); + strcat (sysinfo, "\017 "); + strncat (sysinfo, buffer, bsize - strlen (sysinfo)); + + /* BEGIN DISK PARSING */ + if (xs_parse_df (NULL, buffer)) + { + xchat_printf (ph, "ERROR in parse_df"); + return XCHAT_EAT_ALL; + } + + format_output ("Disk", buffer, format); + strcat (sysinfo, "\017 "); + strncat (sysinfo, buffer, bsize - strlen (buffer)); + + /* BEGIN VIDEO PARSING */ + if (xs_parse_video (buffer)) + { + xchat_printf (ph, "ERROR in parse_video"); + return XCHAT_EAT_ALL; + } + + format_output ("VGA", buffer, format); + strcat (sysinfo, "\017 "); + strncat (sysinfo, buffer, bsize - strlen (buffer)); + + /* BEGIN SOUND PARSING */ + if (xs_parse_sound (buffer)) + { + strncpy (buffer, "Not present", bsize); + } + + format_output ("Sound", buffer, format); + strcat (sysinfo, "\017 "); + strncat (sysinfo, buffer, bsize - strlen (buffer)); + + if ((long)userdata) + { + xchat_printf (ph, "%s", sysinfo); + } + else + { + xchat_commandf (ph, "say %s", sysinfo); + } + return XCHAT_EAT_ALL; } -#endif + +int +xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg) +{ + ph = plugin_handle; + *plugin_name = name; + *plugin_desc = desc; + *plugin_version = version; + char buffer[bsize]; + + xchat_hook_command (ph, "SYSINFO", XCHAT_PRI_NORM, sysinfo_cb, NULL, (void *) 0); + xchat_hook_command (ph, "ESYSINFO", XCHAT_PRI_NORM, sysinfo_cb, NULL, (void *) 1); + xchat_hook_command (ph, "CPUINFO", XCHAT_PRI_NORM, cpuinfo_cb, NULL, (void *) 0); + xchat_hook_command (ph, "ECPUINFO", XCHAT_PRI_NORM, cpuinfo_cb, NULL, (void *) 1); + xchat_hook_command (ph, "SYSUPTIME", XCHAT_PRI_NORM, uptime_cb, NULL, (void *) 0); + xchat_hook_command (ph, "ESYSUPTIME", XCHAT_PRI_NORM, uptime_cb, NULL, (void *) 1); + xchat_hook_command (ph, "OSINFO", XCHAT_PRI_NORM, osinfo_cb, NULL, (void *) 0); + xchat_hook_command (ph, "EOSINFO", XCHAT_PRI_NORM, osinfo_cb, NULL, (void *) 1); + xchat_hook_command (ph, "SOUND", XCHAT_PRI_NORM, sound_cb, NULL, (void *) 0); + xchat_hook_command (ph, "ESOUND", XCHAT_PRI_NORM, sound_cb, NULL, (void *) 1); + xchat_hook_command (ph, "NETDATA", XCHAT_PRI_NORM, netdata_cb, NULL, (void *) 0); + xchat_hook_command (ph, "ENETDATA", XCHAT_PRI_NORM, netdata_cb, NULL, (void *) 1); + xchat_hook_command (ph, "NETSTREAM", XCHAT_PRI_NORM, netstream_cb, NULL, (void *) 0); + xchat_hook_command (ph, "ENETSTREAM", XCHAT_PRI_NORM, netstream_cb, NULL, (void *) 1); + xchat_hook_command (ph, "DISKINFO", XCHAT_PRI_NORM, disk_cb, NULL, (void *) 0); + xchat_hook_command (ph, "EDISKINFO", XCHAT_PRI_NORM, disk_cb, NULL, (void *) 1); + xchat_hook_command (ph, "MEMINFO", XCHAT_PRI_NORM, mem_cb, NULL, (void *) 0); + xchat_hook_command (ph, "EMEMINFO", XCHAT_PRI_NORM, mem_cb, NULL, (void *) 1); + xchat_hook_command (ph, "VIDEO", XCHAT_PRI_NORM, video_cb, NULL, (void *) 0); + xchat_hook_command (ph, "EVIDEO", XCHAT_PRI_NORM, video_cb, NULL, (void *) 1); + xchat_hook_command (ph, "ETHER", XCHAT_PRI_NORM, ether_cb, NULL, (void *) 0); + xchat_hook_command (ph, "EETHER", XCHAT_PRI_NORM, ether_cb, NULL, (void *) 1); + xchat_hook_command (ph, "DISTRO", XCHAT_PRI_NORM, distro_cb, NULL, (void *) 0); + xchat_hook_command (ph, "EDISTRO", XCHAT_PRI_NORM, distro_cb, NULL, (void *) 1); + + /* this is required for the very first run */ + if (xchat_pluginpref_get_str (ph, "pciids", buffer) == 0) + { + xchat_pluginpref_set_str (ph, "pciids", DEFAULT_PCIIDS); + } + + if (xchat_pluginpref_get_str (ph, "format", buffer) == 0) + { + xchat_pluginpref_set_str (ph, "format", DEFAULT_FORMAT); + } + + if (xchat_pluginpref_get_int (ph, "percentages") == -1) + { + xchat_pluginpref_set_int (ph, "percentages", DEFAULT_PERCENTAGES); + } + + xchat_printf (ph, "%s plugin loaded\n", name); + return 1; +} + +int +xchat_plugin_deinit (void) +{ + xchat_printf (ph, "%s plugin unloaded\n", name); + return 1; +} diff --git a/plugins/sysinfo/xsys.h b/plugins/sysinfo/xsys.h index 19a77ede..b5f4a227 100644 --- a/plugins/sysinfo/xsys.h +++ b/plugins/sysinfo/xsys.h @@ -25,4 +25,7 @@ #define bsize 1024 #define delims ":=" +int sysinfo_get_percentages (); +void sysinfo_get_pciids (char *dest); + #endif |