Changeset 2445 for trunk/jons-gtk-gui

Timestamp:

01/09/01 15:26:56 (8 years ago)

Author:

emojon

Message:

Auto Logon

Location:

trunk/jons-gtk-gui/src

Files:

• convo.cpp (modified) (8 diffs)
• history_window.cpp (modified) (7 diffs)
• licq_gtk.h (modified) (6 diffs)
• main.cpp (modified) (1 diff)
• main_window.cpp (modified) (2 diffs)
• option_window.cpp (modified) (10 diffs)

trunk/jons-gtk-gui/src/convo.cpp

@@ -21 +21 @@
 #include "licq_gtk.h"
 
+#include "licq_color.h"
 #include "licq_icqd.h"
 #include "licq_user.h"
@@ -51 +52 @@
 
     c->user = u;
+    c->clrBack = new GdkColor;
+    c->clrFore = new GdkColor;
 
     cnv = g_slist_append(cnv, c);
@@ -100 +103 @@
     
     /* Handle the etag stuff */
-    struct e_tag_data *etd = g_new0(struct e_tag_data, 1);
-
-    c->etag = etd;
+    c->etag = g_new0(struct e_tag_data, 1);
 
     /* Make the convo window */
@@ -218 +219 @@
     gtk_window_set_focus(GTK_WINDOW(c->window), c->entry);
 
-    /* Don't forget the delete signal */
-    gtk_signal_connect(GTK_OBJECT(c->window), "destroy",
-               GTK_SIGNAL_FUNC(convo_close), c);
+    /* Don't forget the delete_event signal */
+    gtk_signal_connect(GTK_OBJECT(c->window), "delete_event",
+               GTK_SIGNAL_FUNC(convo_delete), c);
 
     /* More e_tag_data stuff */
@@ -404 +405 @@
     }
 
-    if(u_event->SubCommand() == ICQ_CMDxSUB_MSG)
-    {
-        const gchar *message = u_event->Text();
+    // Get the color that it was sent in if it's wanted
+    if (recv_colors)
+    {
+        if (!c->clrBack)
+        {
+            c->clrBack = new GdkColor;
+        }
+        
+        if (!c->clrFore)
+        {
+            c->clrFore = new GdkColor;
+        }
+
+        CICQColor *pIcqColor = u_event->Color();
+        c->clrFore->red   = pIcqColor->ForeRed() * 257;
+        c->clrFore->green = pIcqColor->ForeGreen() * 257;
+        c->clrFore->blue  = pIcqColor->ForeBlue() * 257;
+        c->clrFore->pixel = 255;
+        c->clrBack->red   = pIcqColor->BackRed() * 257;
+        c->clrBack->green = pIcqColor->BackGreen() * 257;
+        c->clrBack->blue  = pIcqColor->BackBlue() * 257;
+        c->clrBack->pixel = 255;
+    }
+    else
+    {
+        if (c->clrFore)
+        {
+            delete c->clrFore;
+            c->clrFore = 0;
+        }
+
+        if (c->clrBack)
+        {
+            delete c->clrBack;
+            c->clrBack = 0;
+        }
+    }
+
+    // How about their alias and an optional timestamp?
+    gtk_text_freeze(GTK_TEXT(c->text));
+    gtk_text_insert(GTK_TEXT(c->text), 0, red, 0, c->user->GetAlias(), -1);
+
+    if (show_convo_timestamp)
+    {
+        char szTime[26];
+        time_t message_time = u_event->Time();
+        struct tm *_tm = localtime(&message_time);
+        strftime(szTime, 26, timestamp_format, _tm);
+        szTime[25] = '\0';
     
-        const gchar *for_user_m =
-                g_strdup_printf(":  %s\n", message);
-
-        char szTime[26];
-        if (show_convo_timestamp)
-        {
-            time_t message_time = u_event->Time();
-            struct tm *_tm = localtime(&message_time);
-            strftime(szTime, 26, timestamp_format, _tm);
-            szTime[25] = '\0';
-        }
-
-        gtk_text_freeze(GTK_TEXT(c->text));
-        gtk_text_insert(GTK_TEXT(c->text), 0, red, 0,
-                c->user->GetAlias(), -1);
-        
-        if (show_convo_timestamp)
-        {
-            char *temp_stamp = g_strdup_printf(" (%s)", szTime);
-            gtk_text_insert(GTK_TEXT(c->text), 0, red, 0,
-                temp_stamp, -1);
-            g_free(temp_stamp);
-        }
-        
-        gtk_text_insert(GTK_TEXT(c->text), 0, 0, 0, for_user_m, -1);
+        char *szTempStamp = g_strdup_printf(" (%s): ", szTime);
+        gtk_text_insert(GTK_TEXT(c->text), 0, red, 0, szTempStamp, -1);
+        g_free(szTempStamp);
+    }
+
+    switch (u_event->SubCommand())
+    {
+      case ICQ_CMDxSUB_MSG:
+      {
+        gtk_text_insert(GTK_TEXT(c->text), 0, c->clrFore, c->clrBack,
+                        u_event->Text(), -1);
+        gtk_text_insert(GTK_TEXT(c->text), 0, 0, 0, "\n", -1);
         gtk_text_thaw(GTK_TEXT(c->text));
-    }
-
-    else if(u_event->SubCommand() == ICQ_CMDxSUB_URL)
-    {   
+        break;
+      }
+
+      case ICQ_CMDxSUB_URL:
+      { 
         const char *url = u_event->Text();
 
@@ -447 +482 @@
         gtk_text_insert(GTK_TEXT(c->text), 0, 0, 0, for_user_u, -1);
         gtk_text_thaw(GTK_TEXT(c->text));
-
-    }
-
-    else if(u_event->SubCommand() == ICQ_CMDxSUB_CHAT)
-    {   
+        break;
+      }
+
+      case ICQ_CMDxSUB_CHAT:
+      { 
         const gchar *chat_d = u_event->Text();
 
@@ -474 +509 @@
             chat_accept_window(c_event, uin);
         }
-    }
-
-    else if(u_event->SubCommand() == ICQ_CMDxSUB_FILE)
-    {
+        break;
+      }
+
+      case ICQ_CMDxSUB_FILE:
+      {
         const gchar *file_d = u_event->Text();
         
@@ -498 +534 @@
             file_accept_window(c->user, u_event);
         }
-    }
-}
-
-gboolean convo_close(GtkWidget *widget, struct conversation *c)
-{
-    gtk_widget_destroy(c->window);
+        break;
+      }
+
+      default: // Not good
+        break;
+    } // switch
+}
+
+gboolean convo_delete(GtkWidget *widget, GdkEvent *event, struct conversation *c)
+{
+    convo_close(0, c);
+    return false;
+}
+
+void convo_close(GtkWidget *widget, struct conversation *c)
+{
+    if (c->clrBack)
+    {
+        delete (c->clrBack);
+    }
+    if (c->clrFore)
+    {
+        delete (c->clrFore);
+    }
+
     cnv = g_slist_remove(cnv, c);
     catcher = g_slist_remove(catcher, c->etag);
-    return TRUE;
-}
+
+    gtk_widget_destroy(c->window);
+
+    g_free(c->etag);
+    g_free(c);
+}

trunk/jons-gtk-gui/src/history_window.cpp

@@ -20 +20 @@
 
 #include "licq_gtk.h"
+#include "event_description.h"
 
 #include "licq_events.h"
@@ -27 +28 @@
 
 #include <gtk/gtk.h>
+#include <time.h>
 
 const gchar *line = "\n----------------------------\n";
@@ -39 +41 @@
     struct history *hist;
     const gchar *title = g_strdup_printf("History with %s", user->GetAlias());
-    gchar sz_date[30];
+    gchar szHdr[256];
     time_t _time;
     HistoryList hist_list;
@@ -47 +49 @@
     hist->user = user;
 
-    /* Make the window */
+    // Make the window
     window = gtk_window_new(GTK_WINDOW_DIALOG);
     gtk_window_set_title(GTK_WINDOW(window), title);
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
 
-    /* Make the boxes */
+    // Make the boxes
     v_box = gtk_vbox_new(FALSE, 5);
     h_box = gtk_hbox_new(FALSE, 5);
 
-    /* Make the scrolled window */
+    // Make the scrolled window
     scroll = gtk_scrolled_window_new(NULL, NULL);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
@@ -63 +65 @@
     gtk_widget_set_usize(scroll, 300, 225);
 
-    /* Make the text box */
+    // Make the text box
     hist->text = gtk_text_new(NULL, NULL);
     gtk_text_set_word_wrap(GTK_TEXT(hist->text), TRUE);
@@ -69 +71 @@
     gtk_container_add(GTK_CONTAINER(scroll), hist->text);
 
-    /* Pack the scrolled window */
+    // Pack the scrolled window
     gtk_box_pack_start(GTK_BOX(v_box), scroll, TRUE, TRUE, 0);
 
-    /* The close button */
+    // The close button
     button = gtk_button_new_with_label("Close");
     gtk_signal_connect(GTK_OBJECT(button), "clicked",
             GTK_SIGNAL_FUNC(dialog_close), window);
 
-    /* The reverse check button */
+    // The reverse check button
     hist->check = gtk_check_button_new_with_label("Reverse");
     gtk_signal_connect(GTK_OBJECT(hist->check), "toggled",
                GTK_SIGNAL_FUNC(reverse_history), hist);
 
-    /* Pack them */
+    // Pack them
     gtk_box_pack_start(GTK_BOX(h_box), hist->check, TRUE, TRUE, 5);
     gtk_box_pack_start(GTK_BOX(h_box), button, TRUE, TRUE, 5);
     gtk_box_pack_start(GTK_BOX(v_box), h_box, FALSE, FALSE, 0);
     
-    /* Add in the history */
-    gtk_text_freeze(GTK_TEXT(hist->text));
+    // Add in the history
     if(!user->GetHistory(hist_list))
         return;
 
+    // The three colors, blue, red, and white
+    GdkColor clrBlue, clrRed, clrWhite;
+
+    clrBlue.red   = 0;
+    clrBlue.green = 0;
+    clrBlue.blue  = 0xFFFF;
+    clrBlue.pixel = gulong(255 * 256);
+
+    clrRed.red   = 0xFFFF;
+    clrRed.green = 0;
+    clrRed.blue  = 0;
+    clrRed.pixel = 255;
+
+    clrWhite.red   = 0xFFFF;
+    clrWhite.green = 0xFFFF;
+    clrWhite.blue  = 0xFFFF;
+    clrWhite.pixel = 255;
+
     history_iter = hist_list.begin();
+    gtk_text_freeze(GTK_TEXT(hist->text));
+
+    // Easy way, small memory
+    GdkColor *clrColor;
+    char *szDesc, szDate[30];
+    tm *tmStupid;
     
-    while(1)
+    while(history_iter != hist_list.end())
     {
-        if(history_iter == hist_list.end())
-            break;
-
         _time = (*history_iter)->Time();
-        sprintf(sz_date, "%s\n", ctime(&_time));
-
+        tmStupid = localtime(&_time);
+        strftime(szDate, 29, "%c", tmStupid);
+        szDesc = event_description(*history_iter);
+        
+        if ((*history_iter)->Direction() == D_RECEIVER)
+        {
+            clrColor = &clrRed;
+            snprintf(szHdr, 255,
+                     "%s from %s\n%s [%c%c%c%c]\n\n",
+                 szDesc,
+                 user->GetAlias(),
+                 szDate,
+                 (*history_iter)->IsDirect() ? 'D' : '-',
+                 (*history_iter)->IsMultiRec() ? 'M' : '-',
+                 (*history_iter)->IsUrgent() ? 'U' : '-',
+                 (*history_iter)->IsEncrypted() ? 'E' : '-');
+        }
+        else
+        {
+            clrColor = &clrBlue;
+            snprintf(szHdr, 255,
+                     "%s to %s\n%s [%c%c%c%c]\n\n",
+                 szDesc,
+                 user->GetAlias(),
+                 szDate,
+                 (*history_iter)->IsDirect() ? 'D' : '-',
+                 (*history_iter)->IsMultiRec() ? 'M' : '-',
+                 (*history_iter)->IsUrgent() ? 'U' : '-',
+                 (*history_iter)->IsEncrypted() ? 'E' : '-');
+        }
+
+        szHdr[255] = '\0';
         gtk_text_insert(GTK_TEXT(hist->text), 0, 
-            (*history_iter)->Direction() == D_RECEIVER ? red: blue,
-            0, 
-            sz_date, -1);
+            clrColor, &clrWhite, szHdr, -1);
         gtk_text_insert(GTK_TEXT(hist->text),
             0,
-            (*history_iter)->Direction() == D_RECEIVER ? red : blue,
-            0,
-            (*history_iter)->Text(), -1);
-        gtk_text_insert(GTK_TEXT(hist->text), 0, 0, 0, line, -1);
-
+            clrColor, &clrWhite, (*history_iter)->Text(), -1);
+        gtk_text_insert(GTK_TEXT(hist->text), 0, 0, 0, "\n\n", -1);
+
+        delete [] szDesc;
         history_iter++;
     }
@@ -147 +196 @@
                             break;
         }
-
         else
         {

trunk/jons-gtk-gui/src/licq_gtk.h

@@ -27 +27 @@
 #include "licq_log.h"
 #include "licq_chat.h"
+#include "licq_color.h"
 #include "licq_user.h"
 
@@ -33 +34 @@
 #include <fstream.h>
 
-/* Program used definitions */
-#define MAX_LENGTH_UIN  8
+/* Program used constants */
+const int MAX_LENGTH_UIN = 8;
 
 /********** Structures ******************/
@@ -50 +51 @@
     GtkWidget *send_list;
     GtkWidget *progress;
+    GdkColor *clrFore;
+    GdkColor *clrBack;
     gchar prog_buf[60];
     gchar *for_user;
@@ -303 +306 @@
     GtkWidget *enter_sends;
     GtkWidget *flash_events;
+    GtkWidget *chkRecvColors;
 
     // Network section
@@ -497 +501 @@
 extern bool show_ignored_users;
 extern bool show_convo_timestamp;
+extern bool recv_colors;
 extern char timestamp_format[50];
 extern bool enter_sends;
 extern bool flash_events;
+extern unsigned long auto_logon;
 
 /* Globals in random_chat.cpp */
@@ -599 +605 @@
 extern void convo_cancel(GtkWidget *, struct conversation *);
 extern void convo_recv(unsigned long);
-extern gboolean convo_close(GtkWidget *, struct conversation *);
+extern gint convo_delete(GtkWidget *, GdkEvent *, struct conversation *);
+extern void convo_close(GtkWidget *, struct conversation *);
 
 

trunk/jons-gtk-gui/src/main.cpp

@@ -125 +125 @@
     gtk_main();
 
+    icq_daemon->icqLogoff();
+    icq_daemon->UnregisterPlugin();
+    gLog.ModifyService(S_PLUGIN, 0);
+
     gtk_widget_destroy(main_window);
-
-    icq_daemon->icqLogoff();
-
-    icq_daemon->UnregisterPlugin();
 
     return 0;

trunk/jons-gtk-gui/src/main_window.cpp

@@ -31 +31 @@
 void main_window_delete_event(GtkWidget *mainwindow, gpointer data)
 {
-    icq_daemon->UnregisterPlugin();
     gtk_main_quit();
 }
@@ -151 +150 @@
     gtk_widget_show(system_status);
 
+    // Auto logon here
+    if (auto_logon != ICQ_STATUS_OFFLINE)
+        icq_daemon->icqLogon(auto_logon);
+
     return main_window;
 }

trunk/jons-gtk-gui/src/option_window.cpp

@@ -29 +29 @@
 bool show_ignored_users;
 bool show_convo_timestamp;
+bool recv_colors;
 bool enter_sends;
 bool flash_events;
 char timestamp_format[50];
+unsigned long auto_logon;
 
 // The "Options" selection under the menu in the main window
@@ -100 +102 @@
         GtkAttachOptions(GTK_FILL | GTK_EXPAND),
         GTK_FILL, 3,3 );
-    
+
+    // Receive colors
+    ow->chkRecvColors = gtk_check_button_new_with_label("Receive Colors");
+    gtk_table_attach(GTK_TABLE(table), ow->chkRecvColors, 0, 1, 3, 4,
+        GtkAttachOptions(GTK_FILL | GTK_EXPAND),
+        GTK_FILL, 3, 3);
 
     // Put the table in the notebook
@@ -293 +300 @@
     lItems = g_list_append(lItems, const_cast<char *>("(None)"));
     lItems = g_list_append(lItems, const_cast<char *>("Online"));
+    lItems = g_list_append(lItems, const_cast<char *>("Free For Chat"));
     lItems = g_list_append(lItems, const_cast<char *>("Away"));
     lItems = g_list_append(lItems, const_cast<char *>("Not Available"));
@@ -344 +352 @@
     gtk_entry_set_text(GTK_ENTRY(ow->txtTimestampFormat),
         timestamp_format);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ow->chkRecvColors),
+        recv_colors);
 
     // Clist of servers
@@ -358 +368 @@
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(ow->spnPortHigh),
         icq_daemon->TCPPortsHigh());
+
+    // Auto Logon
+    char szStatus[15];
+    if (auto_logon == ICQ_STATUS_OFFLINE)
+    {
+        strcpy(szStatus, "(None)");
+    }
+    else if (auto_logon & ICQ_STATUS_DND)
+    {
+        strcpy(szStatus, "Do Not Disturb");
+    }
+    else if (auto_logon & ICQ_STATUS_OCCUPIED)
+    {
+        strcpy(szStatus, "Occupied");
+    }
+    else if (auto_logon & ICQ_STATUS_NA)
+    {
+        strcpy(szStatus, "Not Available");
+    }
+    else if (auto_logon & ICQ_STATUS_AWAY)
+    {
+        strcpy(szStatus, "Away");
+    }
+    else if (auto_logon & ICQ_STATUS_FREEFORCHAT)
+    {
+        strcpy(szStatus, "Free For Chat");
+    }
+    else if (auto_logon & ICQ_STATUS_ONLINE)
+    {
+        strcpy(szStatus, "Online");
+    }
+    else
+    {
+        strcpy(szStatus, "(None)");
+    }
+
+    gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(ow->cmbAutoLogon)->entry),
+        szStatus);
+
+    if (auto_logon != ICQ_STATUS_OFFLINE && auto_logon & ICQ_STATUS_FxPRIVATE)
+    {
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ow->chkInvisible),
+            true);
+    }
+        
 }
 
 void done_options(GtkWidget *widget, gpointer data)
 {
-    // Refresh the contact list
-    contact_list_refresh();
-
     struct options_window *ow = (struct options_window *)data;
     show_offline_users = gtk_toggle_button_get_active(
@@ -378 +430 @@
     strcpy(timestamp_format, temp);
     g_free(temp);
+    recv_colors = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+        ow->chkRecvColors));
     
     // Save the daemon options
@@ -389 +443 @@
     icq_daemon->SetTCPEnabled(
        !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ow->chkTCPEnabled)));
+
+    // Auto logon
+    const char *szAutoLogon =
+      gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(ow->cmbAutoLogon)->entry),
+                             0, -1);
+
+    if (strcmp("Online", szAutoLogon) == 0)
+        auto_logon = ICQ_STATUS_ONLINE;
+    else if (strcmp("Away", szAutoLogon) == 0)
+        auto_logon = ICQ_STATUS_AWAY;
+    else if (strcmp("Not Available", szAutoLogon) == 0)
+        auto_logon = ICQ_STATUS_NA;
+    else if (strcmp("Occupied", szAutoLogon) == 0)
+        auto_logon = ICQ_STATUS_OCCUPIED;
+    else if (strcmp("Do Not Disturb", szAutoLogon) == 0)
+        auto_logon = ICQ_STATUS_DND;
+    else if (strcmp("Free For Chat", szAutoLogon) == 0)
+        auto_logon = ICQ_STATUS_FREEFORCHAT;
+    else
+        auto_logon = ICQ_STATUS_OFFLINE;
+
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ow->chkInvisible)))
+    {
+        auto_logon |= ICQ_STATUS_FxPRIVATE;
+    }
 
     gtk_widget_destroy(ow->window);
@@ -414 +493 @@
     licqConf.WriteNum("ColorAway_Blue", away_color->blue);
     licqConf.WriteNum("ColorAway_Pixel", away_color->pixel);
+    licqConf.WriteNum("AutoLogon", auto_logon);
     licqConf.WriteBool("ShowOfflineUsers", show_offline_users);
     licqConf.WriteBool("ShowIgnoredUsres", show_ignored_users);
     licqConf.WriteBool("EnterSends", enter_sends);
     licqConf.WriteBool("FlashEvents", flash_events);
+    licqConf.WriteBool("RecvColors", recv_colors);
     licqConf.WriteBool("ShowTimestamp", show_convo_timestamp);
     licqConf.WriteStr("TimestampFormat", timestamp_format);
@@ -426 +507 @@
     // Refresh the colors
     do_colors();
+
+    // Refresh contact list
+    contact_list_refresh();
 }
 
@@ -465 +549 @@
     licqConf.ReadBool("EnterSends", enter_sends, true);
     licqConf.ReadBool("FlashEvents", flash_events, true);
+    licqConf.ReadBool("RecvColors", recv_colors, true);
     licqConf.ReadBool("ShowTimestamp", show_convo_timestamp, true);
     licqConf.ReadStr("TimestampFormat", timestamp_format, "%H:%M:%S");
+    
+    // Auto logon
+    licqConf.ReadNum("AutoLogon", auto_logon, 0);
 }