FOSS/xfce4-taskmanager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanups

Browse Source 
(Old svn revision: 1418)
This commit is contained in:
Johannes Zellner
2006-05-19 14:07:41 +00:00
parent da93cc9ce7
commit c35b22a11e
7 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/callbacks.c
View File

@@ -1,7 +1,7 @@
/*
* xfce4-taskmanager - very simple taskmanger
*
* Copyright (c) 2005 Johannes Zellner, <webmaster@nebulon.de>
* Copyright (c) 2006 Johannes Zellner, <webmaster@nebulon.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
src/callbacks.h
View File

@@ -1,7 +1,7 @@
/*
* xfce4-taskmanager - very simple taskmanger
*
* Copyright (c) 2005 Johannes Zellner, <webmaster@nebulon.de>
* Copyright (c) 2006 Johannes Zellner, <webmaster@nebulon.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

30
src/functions.c
View File

@@ -1,7 +1,7 @@
/*
* xfce4-taskmanager - very simple taskmanger
*
* Copyright (c) 2005 Johannes Zellner, <webmaster@nebulon.de>
* Copyright (c) 2006 Johannes Zellner, <webmaster@nebulon.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
gboolean refresh_task_list(void)
{
DIR *dir;
struct dirent *dir_entry;
gint i;
/* load the /proc dir */
if((dir = opendir(PROC_DIR_1)) == NULL)
@@ -36,9 +38,6 @@ gboolean refresh_task_list(void)
}
}
}
struct dirent *dir_entry;
gint i;
/* markes all tasks to "not checked" */
for(i = 0; i < tasks; i++)
@@ -52,22 +51,23 @@ gboolean refresh_task_list(void)
if(atoi(dir_entry->d_name) != 0)
{
FILE *task_file_status;
gchar buffer_status[256];
struct task task;
struct passwd *passwdp;
struct stat status;
gchar task_file_name_status[64] = "/proc/";
g_strlcat(task_file_name_status,dir_entry->d_name, sizeof task_file_name_status);
#if defined(__NetBSD__)
g_strlcat(task_file_name_status,"/status", sizeof task_file_name_status);
#else
g_strlcat(task_file_name_status,"/stat", sizeof task_file_name_status);
#endif
gchar buffer_status[256];
struct task task;
struct passwd *passwdp;
struct stat status;
stat(task_file_name_status, &status);
memset(&task, 0, sizeof(task));
if((task_file_status = fopen(task_file_name_status,"r")) != NULL)
{
while(fgets(buffer_status, sizeof buffer_status, task_file_status) != NULL)
@@ -80,10 +80,12 @@ gboolean refresh_task_list(void)
* init 1 0 1 1 -1,-1 sldr 1131254603,930043 0,74940 0,87430 wait 0 0,0
*/
sscanf(buffer_status, "%s %i %i %s %s %s %s %s %s %s %s %i %s",
&task.name, &task.pid, &task.ppid, &dummy, &dummy, &dummy,
&dummy, &dummy, &dummy, &dummy, &dummy, &task.uid, &dummy);
&dummy, &dummy, &dummy, &dummy, &task.state, &task.uid, &dummy);
task.size = -1;
task.rss = -1;
#else
//sscanf(buffer_status, "%d %s %c %d %d %d %d %d %lu %lu %lu %lu %lu %lu %lu %ld %ld %ld %ld %ld %ld %lu %lu %ld %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %d %d",
@@ -159,10 +161,10 @@ gboolean refresh_task_list(void)
if((gint)data->pid == task.pid)
{
if((gint)data->ppid != task.ppid || (gchar)data->state != task.state || (unsigned int)data->size != task.size || (unsigned int)data->rss != task.rss)
if((gint)data->ppid != task.ppid || strcmp(data->state,task.state) || (unsigned int)data->size != task.size || (unsigned int)data->rss != task.rss)
{
data->ppid = task.ppid;
data->state = task.state;
strcpy(data->state, task.state);
data->size = task.size;
data->rss = task.rss;

8
src/interface.c
View File

@@ -1,7 +1,7 @@
/*
* xfce4-taskmanager - very simple taskmanger
*
* Copyright (c) 2005 Johannes Zellner, <webmaster@nebulon.de>
* Copyright (c) 2006 Johannes Zellner, <webmaster@nebulon.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -253,7 +253,7 @@ void fill_list_item(gint i, GtkTreeIter *iter)
gchar *pid = g_strdup_printf("%i", task->pid);
gchar *ppid = g_strdup_printf("%i", task->ppid);
gchar *state = g_strdup_printf("%c", task->state);
gchar *state = g_strdup_printf("%s", task->state);
gchar *size = g_strdup_printf("%i kB", task->size);
gchar *rss = g_strdup_printf("%i kB", task->rss);
gchar *name = g_strdup_printf("%s", task->name);
@@ -305,9 +305,7 @@ void add_new_list_item(gint i)
void refresh_list_item(gint i)
{
GtkTreeIter iter;
gboolean valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter);
struct task task = g_array_index(task_array, struct task, i);
while(valid)
@@ -330,7 +328,6 @@ void refresh_list_item(gint i)
void remove_list_item(gint pid)
{
GtkTreeIter iter;
gboolean valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter);
while(valid)
@@ -395,7 +392,6 @@ gint compare_list_item(GtkTreeModel *model, GtkTreeIter *iter1, GtkTreeIter *ite
void change_task_view(void)
{
gtk_list_store_clear(GTK_LIST_STORE(list_store));
gint i = 0;
for(i = 0; i < tasks; i++)

2
src/interface.h
View File

@@ -1,7 +1,7 @@
/*
* xfce4-taskmanager - very simple taskmanger
*
* Copyright (c) 2005 Johannes Zellner, <webmaster@nebulon.de>
* Copyright (c) 2006 Johannes Zellner, <webmaster@nebulon.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
src/main.c
View File

@@ -1,7 +1,7 @@
/*
* xfce4-taskmanager - very simple taskmanger
*
* Copyright (c) 2005 Johannes Zellner, <webmaster@nebulon.de>
* Copyright (c) 2006 Johannes Zellner, <webmaster@nebulon.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

4
src/types.h
View File

@@ -1,7 +1,7 @@
/*
* xfce4-taskmanager - very simple taskmanger
*
* Copyright (c) 2005 Johannes Zellner, <webmaster@nebulon.de>
* Copyright (c) 2006 Johannes Zellner, <webmaster@nebulon.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ struct task
gint uid;
gchar uname[64];
gchar name[64];
gchar state;
gchar state[16];
gint size;
gint rss;
gboolean checked;