gtk_notebook_remove_page (GTK_NOTEBOOK(nb),idx);
linphone_gtk_update_chat_picture(FALSE);
g_object_set_data(G_OBJECT(friendlist),"chatview",NULL);
+ g_object_set_data(G_OBJECT(w),"from_message",NULL);
+ g_object_set_data(G_OBJECT(w),"cr",NULL);
gtk_widget_destroy(w);
}
void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from, const char *message, gboolean me,LinphoneChatRoom *cr){
GtkTextView *text=GTK_TEXT_VIEW(linphone_gtk_get_widget(w,"textview"));
GtkTextBuffer *buffer=gtk_text_view_get_buffer(text);
- GtkTextIter iter,begin;
- GList *l = g_object_get_data(G_OBJECT(w),"list");
+ GtkTextIter iter,begin,end;
gtk_text_buffer_get_start_iter(buffer,&begin);
int off;
gtk_text_buffer_get_end_iter(buffer,&iter);
off=gtk_text_iter_get_offset(&iter);
+ //GList *list=g_object_get_data(G_OBJECT(w),"list");
if(g_strcmp0((char *)g_object_get_data(G_OBJECT(w),"from_message"),linphone_address_as_string(from))!=0){
gtk_text_buffer_get_iter_at_offset(buffer,&iter,off);
}
gtk_text_buffer_get_end_iter(buffer,&iter);
gtk_text_buffer_get_iter_at_offset(buffer,&begin,off);
- if(me){
- l=g_list_append(l,GINT_TO_POINTER(gtk_text_iter_get_offset(&iter)));
- g_object_set_data(G_OBJECT(w),"list",l);
- }
- gtk_text_buffer_insert(buffer,&iter,"\t",-1);
gtk_text_buffer_insert(buffer,&iter,message,-1);
- gtk_text_buffer_get_end_iter(buffer,&iter);
+ gtk_text_buffer_get_end_iter(buffer,&iter);
gtk_text_buffer_insert(buffer,&iter,"\n",-1);
-
- GtkTextMark *mark=gtk_text_buffer_create_mark(buffer,NULL,&iter,FALSE);
- gtk_text_view_scroll_mark_onscreen(text,mark);
- //gtk_text_buffer_get_end_iter(b,&iter);
- //gtk_text_iter_forward_to_line_end(&iter);
- //gtk_text_view_scroll_to_iter(v,&iter,0,TRUE,1.0,1.0);
- gtk_text_buffer_get_bounds (buffer, &begin, &iter);
-
+ gtk_text_buffer_get_bounds (buffer, &begin, &end);
GHashTable *hash=(GHashTable *)g_object_get_data(G_OBJECT(linphone_gtk_get_main_window()),"history");
if(me){
g_hash_table_insert(hash,linphone_address_as_string_uri_only(linphone_chat_room_get_peer_address(cr)),
- (gpointer)gtk_text_buffer_get_text(buffer,&begin,&iter,FALSE));
+ (gpointer)gtk_text_buffer_get_text(buffer,&begin,&end,FALSE));
} else {
-
g_hash_table_insert(hash,linphone_address_as_string_uri_only(from),
- (gpointer)gtk_text_buffer_get_text(buffer,&begin,&iter,FALSE));
+ (gpointer)gtk_text_buffer_get_text(buffer,&begin,&end,FALSE));
}
- g_object_set_data(G_OBJECT(linphone_gtk_get_main_window()),"history",hash);
+ g_object_set_data(G_OBJECT(linphone_gtk_get_main_window()),"history",hash);
+
+ /*if(me){
+ gtk_text_buffer_get_end_iter(buffer,&iter);
+ list=g_list_append(list,GINT_TO_POINTER(gtk_text_iter_get_line(&iter)));
+ gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,"Message in progress..",-1, "italic","right","small",NULL);
+ gtk_text_buffer_get_end_iter(buffer,&iter);
+ gtk_text_buffer_insert(buffer,&iter,"\n",-1);
+ g_object_set_data(G_OBJECT(w),"list",list);
+ }*/
+
+ GtkTextMark *mark=gtk_text_buffer_create_mark(buffer,NULL,&iter,FALSE);
+ gtk_text_view_scroll_mark_onscreen(text,mark);
}
const LinphoneAddress* linphone_gtk_get_used_identity(){
/* function in dev for displaying ack*/
void update_chat_state_message(LinphoneChatMessageState state){
- /*GdkPixbuf *pixbuf;
-
- switch (state) {
- case LinphoneChatMessageStateInProgress:
- pixbuf=create_pixbuf("chat_message_in_progress.png");
- break;
- case LinphoneChatMessageStateDelivered:
- pixbuf=create_pixbuf("chat_message_delivered.png");
- break;
- case LinphoneChatMessageStateNotDelivered:
- pixbuf=create_pixbuf("chat_message_not_delivered.png");
- break;
- default : pixbuf=NULL;
- }
-
- GtkWidget *main_window=linphone_gtk_get_main_window();
+ /*GtkWidget *main_window=linphone_gtk_get_main_window();
GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list");
GtkWidget *page=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
+ GList *list=g_object_get_data(G_OBJECT(page),"list");
+
if(page!=NULL){
GtkTextView *text=GTK_TEXT_VIEW(linphone_gtk_get_widget(page,"textview"));
GtkTextBuffer *b=gtk_text_view_get_buffer(text);
GtkTextIter iter;
- GList *l = g_object_get_data(G_OBJECT(page),"list");
- gtk_text_buffer_get_end_iter(b,&iter);
- gtk_text_buffer_get_iter_at_offset(b,&iter,GPOINTER_TO_INT(g_list_nth_data(l,0)));
- fprintf(stdout,"offset check %i \n",GPOINTER_TO_INT(g_list_nth_data(l,0)));
- l=g_list_remove(l,g_list_nth_data(l,0));
- gtk_text_buffer_insert_pixbuf(b,&iter,pixbuf);
-
- //gtk_text_buffer_get_end_iter(b,&iter);
- //gtk_text_buffer_insert_pixbuf(b,&iter,pixbuf);
- //gtk_text_buffer_get_end_iter(b,&iter);
- //gtk_text_buffer_insert(b,&iter,"\n",-1);
- g_object_set_data(G_OBJECT(page),"list",l);
+ GtkTextIter end;
+ GtkTextIter start;
+
+ gtk_text_buffer_get_iter_at_line(b,&iter,
+ GPOINTER_TO_INT(g_list_nth_data(list,0)));
+ if(gtk_text_iter_get_chars_in_line(&iter) >0) {
+ gtk_text_buffer_get_iter_at_line_offset(b,&start,
+ GPOINTER_TO_INT(g_list_nth_data(list,0)),
+ gtk_text_iter_get_chars_in_line(&iter)-1);
+ }else {
+ gtk_text_buffer_get_iter_at_line_offset(b,&start,
+ GPOINTER_TO_INT(g_list_nth_data(list,0)),0);
+ }
+ gtk_text_buffer_get_iter_at_line_offset(b,&end,
+ GPOINTER_TO_INT(g_list_nth_data(list,0)),0);
+ gtk_text_buffer_delete(b,&start,&end);
+ gtk_text_buffer_get_iter_at_line(b,&iter,GPOINTER_TO_INT(g_list_nth_data(list,0)));
+
+ switch (state) {
+ case LinphoneChatMessageStateInProgress:
+ gtk_text_buffer_insert_with_tags_by_name(b,&iter,"Message in progress.",-1,
+ "italic","right","small",NULL);
+ break;
+ case LinphoneChatMessageStateDelivered:
+ gtk_text_buffer_insert_with_tags_by_name(b,&iter,"Message delivered",-1,
+ "italic","right","small",NULL);
+ break;
+ case LinphoneChatMessageStateNotDelivered:
+ gtk_text_buffer_insert_with_tags_by_name(b,&iter,"Message not delivered",-1,
+ "italic","right","small",NULL);
+ break;
+ default : gtk_text_buffer_insert_with_tags_by_name(b,&iter,"12",-1,
+ "italic","right","small",NULL);
+ }
+
+ list=g_list_remove(list,g_list_nth_data(list,0));
+ g_object_set_data(G_OBJECT(page),"list",list);
} else {
fprintf(stdout,"NULLLL\n");
}*/
static void on_chat_state_changed(LinphoneChatMessage *msg, LinphoneChatMessageState state, void *user_pointer){
g_message("chat message state is %s",linphone_chat_message_state_to_string(state));
- update_chat_state_message(state);
+ update_chat_state_message(state);
}
-void linphone_gtk_send_text(LinphoneChatRoom *cr){
+void linphone_gtk_send_text(){
GtkWidget *main_window=linphone_gtk_get_main_window();
GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list");
GtkWidget *w=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
GtkWidget *entry=linphone_gtk_get_widget(w,"text_entry");
const gchar *entered;
-
+ LinphoneChatRoom *cr=g_object_get_data(G_OBJECT(w),"cr");
entered=gtk_entry_get_text(GTK_ENTRY(entry));
if (strlen(entered)>0) {
LinphoneChatMessage *msg;
linphone_gtk_push_text(w,
linphone_gtk_get_used_identity(),
- entered,TRUE,g_object_get_data(G_OBJECT(w),"cr"));
- msg=linphone_chat_room_create_message(cr,entered);
+ entered,TRUE,cr);
+ msg=linphone_chat_room_create_message(cr,entered);
linphone_chat_room_send_message2(cr,msg,on_chat_state_changed,NULL);
gtk_entry_set_text(GTK_ENTRY(entry),"");
-
}
}
GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(main_window,"viewswitch");
GtkWidget *text=linphone_gtk_get_widget(chat_view,"textview");
int idx;
-
+
+
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW(text),GTK_WRAP_WORD);
gtk_text_view_set_editable (GTK_TEXT_VIEW(text),FALSE);
gtk_notebook_append_page (notebook,chat_view,create_tab_chat_header(cr,with));
gtk_notebook_set_current_page(notebook, idx);
gtk_widget_show(chat_view);
- GList *l = NULL;
+
g_object_set_data(G_OBJECT(chat_view),"cr",cr);
g_object_set_data(G_OBJECT(chat_view),"idx",GINT_TO_POINTER(idx));
g_object_set_data(G_OBJECT(chat_view),"from_message",NULL);
g_object_set_data(G_OBJECT(chat_view),"from_chatroom",linphone_address_as_string_uri_only(with));
- g_object_set_data(G_OBJECT(chat_view),"list",l);
+
+ GList *list=NULL;
+ g_object_set_data(G_OBJECT(chat_view),"list",list);
gchar *buf=g_hash_table_lookup(hash,linphone_address_as_string_uri_only(with));
if(buf != NULL){
GtkTextBuffer *text_buffer;
text_buffer=gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
gtk_text_buffer_get_bounds(text_buffer, &start, &end);
- g_object_set_data(G_OBJECT(chat_view),"cr",cr);
gtk_text_buffer_delete (text_buffer, &start, &end);
gtk_text_buffer_insert(text_buffer,&start,buf,-1);
}
gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),
- "right","justification", GTK_JUSTIFY_RIGHT,NULL);
-
+ "right","justification", GTK_JUSTIFY_RIGHT,NULL);
+ gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),
+ "bold","weight", PANGO_WEIGHT_BOLD,NULL);
+ gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),
+ "italic","style", PANGO_STYLE_ITALIC,NULL);
gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),
- "bold","weight", PANGO_WEIGHT_BOLD,NULL);
+ "small","size",8*PANGO_SCALE,NULL);
+ gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),
+ "font_grey","foreground","grey",NULL);
GtkWidget *button = linphone_gtk_get_widget(chat_view,"send");
- g_signal_connect_swapped(G_OBJECT(button),"clicked",(GCallback)linphone_gtk_send_text,cr);
+ g_signal_connect_swapped(G_OBJECT(button),"clicked",(GCallback)linphone_gtk_send_text,NULL);
GtkWidget *entry = linphone_gtk_get_widget(chat_view,"text_entry");
- g_signal_connect_swapped(G_OBJECT(entry),"activate",(GCallback)linphone_gtk_send_text,cr);
+ g_signal_connect_swapped(G_OBJECT(entry),"activate",(GCallback)linphone_gtk_send_text,NULL);
return chat_view;
}
return cr;
}
-
-
void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri,GtkWidget *chat_view){
GtkWidget *main_window=linphone_gtk_get_main_window ();
GHashTable *hash=g_object_get_data(G_OBJECT(main_window),"history");
g_object_set_data(G_OBJECT(chat_view),"cr",cr);
gtk_text_buffer_delete (text_buffer, &start, &end);
if(buf!=NULL){
- gtk_text_buffer_insert(text_buffer,&start,buf,-1);
- } else {
- g_object_set_data(G_OBJECT(chat_view),"from_message",NULL);
- GtkWidget *entry = linphone_gtk_get_widget(chat_view,"text_entry");
- g_signal_connect_swapped(G_OBJECT(entry),"activate",(GCallback)linphone_gtk_send_text,cr);
-
- GtkWidget *button = linphone_gtk_get_widget(chat_view,"send");
- g_signal_connect_swapped(G_OBJECT(button),"clicked",(GCallback)linphone_gtk_send_text,cr);
- }
-
+ gtk_text_buffer_insert_with_tags_by_name(text_buffer,&start,buf,-1,"font_grey","small",NULL);
+ GtkTextMark *mark=gtk_text_buffer_create_mark(text_buffer, NULL, &start, FALSE);
+ gtk_text_view_scroll_to_mark(text_view,mark, 0, FALSE, 0, 0);
+ }
+ g_object_set_data(G_OBJECT(chat_view),"cr",cr);
g_object_set_data(G_OBJECT(chat_view),"from_chatroom",linphone_address_as_string_uri_only(uri));
+ g_object_set_data(G_OBJECT(chat_view),"from_message",linphone_address_as_string_uri_only(uri));
+ g_object_set_data(G_OBJECT(linphone_gtk_get_widget(main_window,"contact_list")),"chatview",(gpointer)chat_view);
}
}
//gtk_window_present(GTK_WINDOW(w));
/*gtk_window_set_urgency_hint(GTK_WINDOW(w),TRUE);*/
}
-
projects / linphone / blobdiff