Skip to content
This repository has been archived by the owner on Jul 7, 2023. It is now read-only.

For hcy #98

Merged
merged 4 commits into from
Mar 28, 2012
Merged

For hcy #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a546056
Avoid deprecated macros
thynson Mar 26, 2012
d6c30de
Replace GtkType with GType
thynson Mar 26, 2012
5548adc
Use G_CALLBACK for porting to gtk3
thynson Mar 26, 2012
5c25bb0
Replace GDK_* with GDK_KEY_*
thynson Mar 26, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/gui/chattextview.h
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
// ------------------------------------------ // ------------------------------------------
// //


#define QQ_CHAT_TEXTVIEW(obj) GTK_CHECK_CAST(obj\ #define QQ_CHAT_TEXTVIEW(obj) G_TYPE_CHECK_INSTANCE_CAST(obj\
, qq_chat_textview_get_type()\ , qq_chat_textview_get_type()\
, QQChatTextview) , QQChatTextview)
#define QQ_CHAT_TEXTVIEWCLASS(c) GTK_CHECK_CLASS_CAST(c\ #define QQ_CHAT_TEXTVIEWCLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, qq_chat_textview_get_type()\ , qq_chat_textview_get_type()\
, QQChatTextviewClass) , QQChatTextviewClass)
#define QQ_IS_CHAT_TEXTVIEW(obj) GTK_CHECK_TYPE(obj\ #define QQ_IS_CHAT_TEXTVIEW(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj\
, qq_chat_textview_get_type()) , qq_chat_textview_get_type())


typedef struct __QQChatTextview QQChatTextview; typedef struct __QQChatTextview QQChatTextview;
Expand Down
6 changes: 3 additions & 3 deletions src/gui/chatwidget.h
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
// | | // | |
// ---------------------------------------------- // ----------------------------------------------
// //
#define QQ_CHATWIDGET(obj) GTK_CHECK_CAST(obj, qq_chatwidget_get_type()\ #define QQ_CHATWIDGET(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, qq_chatwidget_get_type()\
, QQChatWidget) , QQChatWidget)
#define QQ_CHATWIDGETCLASS(c) GTK_CHECK_CLASS_CAST(c\ #define QQ_CHATWIDGETCLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, qq_chatwidget_get_type()\ , qq_chatwidget_get_type()\
, QQChatWidgetClass) , QQChatWidgetClass)
#define QQ_IS_CHATWIDGET(obj) GTK_CHECK_TYPE(obj, qq_chatwidget_get_type()) #define QQ_IS_CHATWIDGET(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_chatwidget_get_type())


typedef struct __QQChatWidget QQChatWidget; typedef struct __QQChatWidget QQChatWidget;
typedef struct __QQChatWidgetClass QQChatWidgetClass; typedef struct __QQChatWidgetClass QQChatWidgetClass;
Expand Down
38 changes: 19 additions & 19 deletions src/gui/chatwindow.c
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ typedef struct{
GtkWidget *name_label, *lnick_label; GtkWidget *name_label, *lnick_label;


GtkWidget *chat_widget; GtkWidget *chat_widget;

GtkWidget *send_btn, *close_btn; GtkWidget *send_btn, *close_btn;
}QQChatWindowPriv; }QQChatWindowPriv;


Expand Down Expand Up @@ -169,9 +169,9 @@ static gboolean qq_input_textview_key_press(GtkWidget *widget, GdkEvent *e
, gpointer data) , gpointer data)
{ {
GdkEventKey *event = (GdkEventKey*)e; GdkEventKey *event = (GdkEventKey*)e;
if(event -> keyval == GDK_Return || event -> keyval == GDK_KP_Enter if(event -> keyval == GDK_KEY_Return || event -> keyval == GDK_KEY_KP_Enter
|| event -> keyval == GDK_ISO_Enter){ || event -> keyval == GDK_KEY_ISO_Enter){
if((event -> state & GDK_CONTROL_MASK) != 0 if((event -> state & GDK_CONTROL_MASK) != 0
|| (event -> state & GDK_SHIFT_MASK) != 0){ || (event -> state & GDK_SHIFT_MASK) != 0){
return FALSE; return FALSE;
} }
Expand All @@ -188,8 +188,8 @@ static gboolean qq_chatwindow_key_press(GtkWidget *widget, GdkEvent *e
, gpointer data) , gpointer data)
{ {
GdkEventKey *event = (GdkEventKey*)e; GdkEventKey *event = (GdkEventKey*)e;
if((event -> state & GDK_CONTROL_MASK) != 0 if((event -> state & GDK_CONTROL_MASK) != 0
&& (event -> keyval == GDK_w || event -> keyval == GDK_W)){ && (event -> keyval == GDK_KEY_w || event -> keyval == GDK_KEY_W)){
QQChatWindowPriv *priv = data; QQChatWindowPriv *priv = data;
gqq_config_remove_ht(cfg, "chat_window_map", priv -> uin); gqq_config_remove_ht(cfg, "chat_window_map", priv -> uin);
gtk_widget_destroy(widget); gtk_widget_destroy(widget);
Expand All @@ -215,7 +215,7 @@ static void qq_chatwindow_init(QQChatWindow *win)
pb = gdk_pixbuf_new_from_file(buf, NULL); pb = gdk_pixbuf_new_from_file(buf, NULL);
gtk_window_set_icon(GTK_WINDOW(win), pb); gtk_window_set_icon(GTK_WINDOW(win), pb);
g_object_unref(pb); g_object_unref(pb);
g_snprintf(buf, 500, "Talking with %s", bdy == NULL ? priv -> uin g_snprintf(buf, 500, "Talking with %s", bdy == NULL ? priv -> uin
: bdy -> nick -> str); : bdy -> nick -> str);
gtk_window_set_title(GTK_WINDOW(win), buf); gtk_window_set_title(GTK_WINDOW(win), buf);


Expand All @@ -227,17 +227,17 @@ static void qq_chatwindow_init(QQChatWindow *win)
priv -> name_label = gtk_label_new(""); priv -> name_label = gtk_label_new("");
priv -> lnick_label = gtk_label_new(""); priv -> lnick_label = gtk_label_new("");
gtk_box_pack_start(GTK_BOX(header_hbox), priv -> faceimage gtk_box_pack_start(GTK_BOX(header_hbox), priv -> faceimage
, FALSE, FALSE, 5); , FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), priv -> name_label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), priv -> name_label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), priv -> lnick_label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), priv -> lnick_label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(header_hbox), vbox, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(header_hbox), vbox, FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(priv -> body_vbox), header_hbox gtk_box_pack_start(GTK_BOX(priv -> body_vbox), header_hbox
, FALSE, FALSE, 5); , FALSE, FALSE, 5);


// message text view // message text view
priv -> chat_widget = qq_chatwidget_new(); priv -> chat_widget = qq_chatwidget_new();
gtk_box_pack_start(GTK_BOX(priv -> body_vbox), priv -> chat_widget gtk_box_pack_start(GTK_BOX(priv -> body_vbox), priv -> chat_widget
, TRUE, TRUE, 0); , TRUE, TRUE, 0);


// buttons // buttons
GtkWidget *buttonbox = gtk_hbutton_box_new(); GtkWidget *buttonbox = gtk_hbutton_box_new();
Expand All @@ -251,7 +251,7 @@ static void qq_chatwindow_init(QQChatWindow *win)
G_CALLBACK(qq_chatwindow_on_send_clicked), win); G_CALLBACK(qq_chatwindow_on_send_clicked), win);
gtk_container_add(GTK_CONTAINER(buttonbox), priv -> close_btn); gtk_container_add(GTK_CONTAINER(buttonbox), priv -> close_btn);
gtk_container_add(GTK_CONTAINER(buttonbox), priv -> send_btn); gtk_container_add(GTK_CONTAINER(buttonbox), priv -> send_btn);
gtk_box_pack_start(GTK_BOX(priv -> body_vbox), buttonbox, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(priv -> body_vbox), buttonbox, FALSE, FALSE, 3);


GtkWidget *w = GTK_WIDGET(win); GtkWidget *w = GTK_WIDGET(win);
gtk_window_resize(GTK_WINDOW(w), 500, 450); gtk_window_resize(GTK_WINDOW(w), 500, 450);
Expand Down Expand Up @@ -279,17 +279,17 @@ static void qq_chatwindow_init(QQChatWindow *win)
/* /*
* The getter. * The getter.
*/ */
static void qq_chatwindow_getter(GObject *object, guint property_id, static void qq_chatwindow_getter(GObject *object, guint property_id,
GValue *value, GParamSpec *pspec) GValue *value, GParamSpec *pspec)
{ {
if(object == NULL || value == NULL || property_id < 0){ if(object == NULL || value == NULL || property_id < 0){
return; return;
} }

QQChatWindowPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE( QQChatWindowPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE(
object, qq_chatwindow_get_type() object, qq_chatwindow_get_type()
, QQChatWindowPriv); , QQChatWindowPriv);

switch (property_id) switch (property_id)
{ {
case QQ_CHATWINDOW_PROPERTY_UIN: case QQ_CHATWINDOW_PROPERTY_UIN:
Expand All @@ -304,7 +304,7 @@ static void qq_chatwindow_getter(GObject *object, guint property_id,
/* /*
* The setter. * The setter.
*/ */
static void qq_chatwindow_setter(GObject *object, guint property_id, static void qq_chatwindow_setter(GObject *object, guint property_id,
const GValue *value, GParamSpec *pspec) const GValue *value, GParamSpec *pspec)
{ {
if(object == NULL || value == NULL || property_id < 0){ if(object == NULL || value == NULL || property_id < 0){
Expand All @@ -313,7 +313,7 @@ static void qq_chatwindow_setter(GObject *object, guint property_id,
QQChatWindowPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE( QQChatWindowPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE(
object, qq_chatwindow_get_type() object, qq_chatwindow_get_type()
, QQChatWindowPriv); , QQChatWindowPriv);
gchar buf[500]; gchar buf[500];
GdkPixbuf *pb = NULL; GdkPixbuf *pb = NULL;
switch (property_id) switch (property_id)
{ {
Expand Down Expand Up @@ -351,7 +351,7 @@ static void qq_chatwindow_setter(GObject *object, guint property_id,
name = bdy -> markname -> str; name = bdy -> markname -> str;
} }
// set status and name // set status and name
if(g_strcmp0("online", bdy -> status -> str) == 0 if(g_strcmp0("online", bdy -> status -> str) == 0
|| g_strcmp0("away", bdy -> status -> str) == 0 || g_strcmp0("away", bdy -> status -> str) == 0
|| g_strcmp0("busy", bdy -> status -> str) == 0 || g_strcmp0("busy", bdy -> status -> str) == 0
|| g_strcmp0("silent", bdy -> status -> str) == 0 || g_strcmp0("silent", bdy -> status -> str) == 0
Expand Down
6 changes: 3 additions & 3 deletions src/gui/chatwindow.h
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <qq.h> #include <qq.h>


#define QQ_CHATWINDOW(obj) GTK_CHECK_CAST(obj, qq_chatwindow_get_type()\ #define QQ_CHATWINDOW(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, qq_chatwindow_get_type()\
, QQChatWindow) , QQChatWindow)
#define QQ_CHATWINDOWCLASS(c) GTK_CHECK_CLASS_CAST(c\ #define QQ_CHATWINDOWCLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, qq_chatwindow_get_type()\ , qq_chatwindow_get_type()\
, QQChatWindowClass) , QQChatWindowClass)
#define QQ_IS_CHATWINDOW(obj) GTK_CHECK_TYPE(obj, qq_chatwindow_get_type()) #define QQ_IS_CHATWINDOW(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, qq_chatwindow_get_type())


typedef struct __QQChatWindow QQChatWindow; typedef struct __QQChatWindow QQChatWindow;
typedef struct __QQChatWindowClass QQChatWindowClass; typedef struct __QQChatWindowClass QQChatWindowClass;
Expand Down
18 changes: 9 additions & 9 deletions src/gui/facepopupwindow.c
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ static void qq_face_popup_window_init(QQFacePopupWindow *win)
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(win), TRUE); gtk_window_set_skip_taskbar_hint(GTK_WINDOW(win), TRUE);


g_signal_connect(win, "focus-out-event" g_signal_connect(win, "focus-out-event"
, GTK_SIGNAL_FUNC(qq_face_popup_window_focus_out), win); , G_CALLBACK(qq_face_popup_window_focus_out), win);


GtkWidget *table, *img, *eventbox, *frame; GtkWidget *table, *img, *eventbox, *frame;
gint i, j, k; gint i, j, k;
Expand All @@ -136,16 +136,16 @@ static void qq_face_popup_window_init(QQFacePopupWindow *win)
par -> face = face_transfer_table[k]; par -> face = face_transfer_table[k];
par -> win = GTK_WIDGET(win); par -> win = GTK_WIDGET(win);
++k; ++k;
g_signal_connect(eventbox , "button-release-event" g_signal_connect(eventbox , "button-release-event"
, GTK_SIGNAL_FUNC(face_popup_window_clicked) , G_CALLBACK(face_popup_window_clicked)
, par); , par);
frame = gtk_frame_new(NULL); frame = gtk_frame_new(NULL);
gtk_container_add(GTK_CONTAINER(frame), eventbox); gtk_container_add(GTK_CONTAINER(frame), eventbox);
g_signal_connect(eventbox , "enter-notify-event" g_signal_connect(eventbox , "enter-notify-event"
, GTK_SIGNAL_FUNC(face_enter_notify_event) , G_CALLBACK(face_enter_notify_event)
, frame); , frame);
g_signal_connect(eventbox , "leave-notify-event" g_signal_connect(eventbox , "leave-notify-event"
, GTK_SIGNAL_FUNC(face_leave_notify_event) , G_CALLBACK(face_leave_notify_event)
, frame); , frame);
gtk_table_attach_defaults(GTK_TABLE(table), frame gtk_table_attach_defaults(GTK_TABLE(table), frame
, j, j + 1, i, i + 1); , j, j + 1, i, i + 1);
Expand All @@ -171,9 +171,9 @@ static void qq_face_popup_windowclass_init(QQFacePopupWindowClass *klass)
//install the 'face-clicked' signal //install the 'face-clicked' signal
klass -> face_clicked_default_handler = default_handler; klass -> face_clicked_default_handler = default_handler;
//void signal_handler(gpointer instance, gint face, gpointer data) //void signal_handler(gpointer instance, gint face, gpointer data)
klass -> face_clicked_signal_id = klass -> face_clicked_signal_id =
g_signal_new("face-clicked" g_signal_new("face-clicked"
, G_TYPE_FROM_CLASS(klass) , G_TYPE_FROM_CLASS(klass)
, G_SIGNAL_RUN_LAST //run after the default handler , G_SIGNAL_RUN_LAST //run after the default handler
, G_STRUCT_OFFSET(QQFacePopupWindowClass , G_STRUCT_OFFSET(QQFacePopupWindowClass
, face_clicked_default_handler) , face_clicked_default_handler)
Expand Down
6 changes: 3 additions & 3 deletions src/gui/facepopupwindow.h
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
#include <qq.h> #include <qq.h>


#define QQ_TYPE_FACE_POPUP_WINDOW qq_face_popup_window_get_type() #define QQ_TYPE_FACE_POPUP_WINDOW qq_face_popup_window_get_type()
#define QQ_FACE_POPUP_WINDOW(obj) GTK_CHECK_CAST(obj\ #define QQ_FACE_POPUP_WINDOW(obj) G_TYPE_CHECK_INSTANCE_CAST(obj\
, QQ_TYPE_FACE_POPUP_WINDOW\ , QQ_TYPE_FACE_POPUP_WINDOW\
, QQFacePopupWindow) , QQFacePopupWindow)
#define QQ_FACE_POPUP_WINDOWCLASS(c) GTK_CHECK_CLASS_CAST(c\ #define QQ_FACE_POPUP_WINDOWCLASS(c) G_TYPE_CHECK_CLASS_CAST(c\
, QQ_TYPE_FACE_POPUP_WINDOW\ , QQ_TYPE_FACE_POPUP_WINDOW\
, QQFacePopupWindowClass) , QQFacePopupWindowClass)
#define QQ_IS_FACE_POPUP_WINDOW(obj) GTK_CHECK_TYPE(obj\ #define QQ_IS_FACE_POPUP_WINDOW(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj\
, QQ_TYPE_FACE_POPUP_WINDOW) , QQ_TYPE_FACE_POPUP_WINDOW)


typedef struct __QQFacePopupWindow QQFacePopupWindow; typedef struct __QQFacePopupWindow QQFacePopupWindow;
Expand Down
Loading