comparison: src/conversation.c
src/conversation.c
- changeset 3626
- f01abdddffa9
- parent 3612
- 7712c1e4afad
- child 3627
- 377de5a44bf2
equal
deleted
inserted
replaced
| 3625:9481a2f8feec | 3626:f01abdddffa9 |
|---|---|
| 844 close_callback(c->close, c); | 844 close_callback(c->close, c); |
| 845 c = NULL; | 845 c = NULL; |
| 846 } | 846 } |
| 847 } else if (event->keyval == GDK_Page_Up) { | 847 } else if (event->keyval == GDK_Page_Up) { |
| 848 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); | 848 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); |
| 849 gtk_imhtml_page_up(GTK_IMHTML(c->text)); | 849 if(!(event->state & GDK_CONTROL_MASK)) |
| 850 gtk_imhtml_page_up(GTK_IMHTML(c->text)); | |
| 850 } else if (event->keyval == GDK_Page_Down) { | 851 } else if (event->keyval == GDK_Page_Down) { |
| 851 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); | 852 gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event"); |
| 852 gtk_imhtml_page_down(GTK_IMHTML(c->text)); | 853 if(!(event->state & GDK_CONTROL_MASK)) |
| 854 gtk_imhtml_page_down(GTK_IMHTML(c->text)); | |
| 853 } else if ((event->keyval == GDK_F2) && (convo_options & OPT_CONVO_F2_TOGGLES)) { | 855 } else if ((event->keyval == GDK_F2) && (convo_options & OPT_CONVO_F2_TOGGLES)) { |
| 854 gtk_imhtml_show_comments(GTK_IMHTML(c->text), !GTK_IMHTML(c->text)->comments); | 856 gtk_imhtml_show_comments(GTK_IMHTML(c->text), !GTK_IMHTML(c->text)->comments); |
| 855 } else if ((event->keyval == GDK_Return) || (event->keyval == GDK_KP_Enter)) { | 857 } else if ((event->keyval == GDK_Return) || (event->keyval == GDK_KP_Enter)) { |
| 856 if ((event->state & GDK_CONTROL_MASK) && (convo_options & OPT_CONVO_CTL_ENTER)) { | 858 if ((event->state & GDK_CONTROL_MASK) && (convo_options & OPT_CONVO_CTL_ENTER)) { |
| 857 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c); | 859 gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c); |
