Mercurial > pidgin
comparison src/conversation.c @ 389:5e16d37b48bf
[gaim-migrate @ 399]
Woop. More smileys.
committer: Tailor Script <tailor@pidgin.im>
| author | Rob Flynn <gaim@robflynn.com> |
|---|---|
| date | Mon, 12 Jun 2000 08:03:18 +0000 |
| parents | 1eae69f076d2 |
| children | be408b41c172 |
comparison
equal
deleted
inserted
replaced
| 388:7fb34b73946a | 389:5e16d37b48bf |
|---|---|
| 848 GdkBitmap *mask; | 848 GdkBitmap *mask; |
| 849 GdkPixmap *face; | 849 GdkPixmap *face; |
| 850 int state; | 850 int state; |
| 851 int y; | 851 int y; |
| 852 int i; | 852 int i; |
| 853 char *smiley = g_malloc(5); | 853 char *smiley = g_malloc(7); |
| 854 | 854 |
| 855 if (flags & WFLAG_SYSTEM) { | 855 if (flags & WFLAG_SYSTEM) { |
| 856 | 856 |
| 857 gtk_html_freeze(GTK_HTML(c->text)); | 857 gtk_html_freeze(GTK_HTML(c->text)); |
| 858 | 858 |
| 912 for (i = 0; i < strlen(what); i++) | 912 for (i = 0; i < strlen(what); i++) |
| 913 { | 913 { |
| 914 buf2[y] = what[i]; | 914 buf2[y] = what[i]; |
| 915 y++; | 915 y++; |
| 916 | 916 |
| 917 if ((what[i] == ':') || (what[i] == ';')) | 917 if ( (what[i] == ':') || (what[i] == ';') || (what[i] == 'O') ) |
| 918 { | 918 { |
| 919 if (state == 0) | 919 if (state < 2) |
| 920 { | 920 { |
| 921 smiley[state] = what[i]; | 921 smiley[state] = what[i]; |
| 922 state = 1; | 922 state++; |
| 923 } | 923 } |
| 924 else | 924 else |
| 925 { | |
| 925 state = 0; | 926 state = 0; |
| 927 } | |
| 926 } | 928 } |
| 927 else if ((what[i] == '-')) | 929 else if ( (what[i] == '-') || (what[i] == '^') || (what[i] == 'o') ) |
| 928 { | 930 { |
| 929 if (state == 1) | 931 if ((state == 1) || (state==2)) |
| 930 { | 932 { |
| 931 smiley[state] = what[i]; | 933 smiley[state] = what[i]; |
| 932 state = 2; | 934 state++; |
| 933 } | 935 } |
| 934 else | 936 else |
| 937 { | |
| 935 state = 0; | 938 state = 0; |
| 939 } | |
| 936 } | 940 } |
| 937 else if ((what[i] == ')') || (what[i] == '*') || (what[i] == '(') || | 941 else if ((what[i] == ')') || (what[i] == '*') || (what[i] == '(') || |
| 938 (what[i] == 'p') || (what[i] == 'P') || (what[i] == '$') || | 942 (what[i] == 'p') || (what[i] == 'P') || (what[i] == '$') || |
| 939 (what[i] == '!') || (what[i] == 'D') || (what[i] == 'X') ) | 943 (what[i] == '!') || (what[i] == 'D') || (what[i] == 'X') ) |
| 940 { | 944 { |
| 947 face = gdk_pixmap_create_from_xpm_d(c->window->window, &mask, &c->window->style->white, smile_happy_xpm); | 951 face = gdk_pixmap_create_from_xpm_d(c->window->window, &mask, &c->window->style->white, smile_happy_xpm); |
| 948 gtk_html_append_text(GTK_HTML(c->text), buf2, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0); | 952 gtk_html_append_text(GTK_HTML(c->text), buf2, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0); |
| 949 gtk_html_add_pixmap(GTK_HTML(c->text), face, 0); | 953 gtk_html_add_pixmap(GTK_HTML(c->text), face, 0); |
| 950 state = 0; | 954 state = 0; |
| 951 } | 955 } |
| 952 else if (state == 2) | 956 else if ( (state == 2) || (state == 3)) |
| 953 { | 957 { |
| 954 smiley[state] = what[i]; | 958 smiley[state] = what[i]; |
| 955 smiley[state+1] = 0; | 959 smiley[state+1] = 0; |
| 956 buf2[y - state - 1] = 0; | 960 buf2[y - state - 1] = 0; |
| 957 y = 0; | 961 y = 0; |