ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.313 by root, Sat Jun 24 00:24:09 2006 UTC vs.
Revision 1.331 by root, Sun Jul 23 04:46:02 2006 UTC

… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
90 103
91 $GRAB = $widget; 104 $GRAB = $widget;
92 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
93 106
94 $TOOLTIP_WATCHER->cb->(); 107 $TOOLTIP_WATCHER->cb->();
95 } 108 }
96 109
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 111
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
100 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
189 203
190 } 204 }
191 } 205 }
192 206
193 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
194} 216}
195 217
196############################################################################# 218#############################################################################
197 219
198package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
407 429
408# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
409sub coord2local { 431sub coord2local {
410 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
411 433
434 Carp::confess unless $self->{parent};#d#
435
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 437}
414 438
415# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
416sub coord2global { 440sub coord2global {
… …
423 my ($self) = @_; 447 my ($self) = @_;
424 448
425 return if $FOCUS == $self; 449 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 450 return unless $self->{can_focus};
427 451
428 my $focus = $FOCUS; $FOCUS = $self; 452 $FOCUS = $self;
429 453
430 $focus->update if $focus; 454 $self->update;
431 $FOCUS->update;
432 455
433 0 456 0
434} 457}
435 458
436sub invoke_focus_out { 459sub invoke_focus_out {
437 my ($self) = @_; 460 my ($self) = @_;
438 461
439 return unless $FOCUS == $self; 462 return unless $FOCUS == $self;
440 463
441 my $focus = $FOCUS; undef $FOCUS; 464 undef $FOCUS;
442 465
443 $focus->update if $focus; #? 466 $self->update;
444 467
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 468 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 469 unless $FOCUS;
447 470
448 0 471 0
449} 472}
450 473
451sub grab_focus { 474sub grab_focus {
452 my ($self) = @_; 475 my ($self) = @_;
453 476
477 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 478 $self->emit ("focus_in");
455} 479}
456 480
457sub invoke_mouse_motion { 1 } 481sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 482sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 483sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
461 486
462sub invoke_button_down { 487sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
464 489
465 $self->grab_focus; 490 $self->grab_focus;
466 491
467 1 492 0
468} 493}
469 494
470sub connect { 495sub connect {
471 my ($self, $signal, $cb) = @_; 496 my ($self, $signal, $cb) = @_;
472 497
473 push @{ $self->{signal_cb}{$signal} }, $cb; 498 push @{ $self->{signal_cb}{$signal} }, $cb;
474} 499}
475 500
501my %has_coords = (
502 button_down => 1,
503 button_up => 1,
504 mouse_motion => 1,
505 mouse_wheel => 1,
506);
507
476sub emit { 508sub emit {
477 my ($self, $signal, @args) = @_; 509 my ($self, $signal, @args) = @_;
478 510
511 my @append
512 = $has_coords{$signal}
513 ? $args[0]->xy ($self)
514 : ();
515
516 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517
479 #d##TODO# stop propagating at first true, do not use sum 518 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 520 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 522}
484 523
485sub find_widget { 524sub find_widget {
486 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
487 526
… …
587} 626}
588 627
589sub DESTROY { 628sub DESTROY {
590 my ($self) = @_; 629 my ($self) = @_;
591 630
631 return if CFClient::in_destruct;
632
592 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
593 634
594 eval { $self->destroy }; 635 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 637}
… …
975 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
976 }, 1017 },
977 ; 1018 ;
978 1019
979 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
981 slider => $slider, 1023 slider => $slider,
982 %arg, 1024 %arg,
983 ); 1025 );
984 1026
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1028 $self->add ($child) if $child;
987 1029
988 $self 1030 $self
989} 1031}
990 1032
1033#TODO# update range on size_allocate depending on child
1034
991sub add { 1035sub add {
992 my ($self, $widget) = @_; 1036 my ($self, $widget) = @_;
993 1037
994 $self->{vp}->add ($self->{child} = $widget); 1038 $self->{vp}->add ($self->{child} = $widget);
995} 1039}
996 1040
1041sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_;
1043
1044 return 0 unless $ev->{dy}; # only vertical movements
1045
1046 $self->{slider}->emit (mouse_wheel => $ev);
1047
1048 1
1049}
1050
1051sub update_slider {
1052 my ($self) = @_;
1053
1054 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1055}
1056
997sub update { 1057sub update {
998 my ($self) = @_; 1058 my ($self) = @_;
999 1059
1000 $self->SUPER::update; 1060 $self->SUPER::update;
1001 1061
1002 # todo: overwrite size_allocate of child 1062 $self->update_slider;
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1063}
1006 1064
1007sub invoke_size_allocate { 1065sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
1009 1067
1010 my $child = $self->{vp}->child; 1068 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012 1069
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1070 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1071}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1072
1019############################################################################# 1073#############################################################################
1020 1074
1021package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
1022 1076
… …
1078 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1135 border => 0.6,
1082 can_events => 1, 1136 can_events => 1,
1083 min_w => 16, 1137 min_w => 64,
1084 min_h => 16, 1138 min_h => 32,
1085 %arg, 1139 %arg,
1086 ); 1140 );
1087 1141
1088 $self->{title_widget} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1143 align => 0,
… …
1094 1148
1095 if ($self->{has_close_button}) { 1149 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1150 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1151 new CFClient::UI::ImageButton
1098 path => 'x1_close.png', 1152 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1153 on_activate => sub { $self->emit ("delete") };
1100 1154
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1155 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1156 }
1103 1157
1104 $self 1158 $self
… …
1150 $self->child->configure ($border, $border, $w, $h); 1204 $self->child->configure ($border, $border, $w, $h);
1151 1205
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1206 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1207 if $self->{close_button};
1154 1208
1209 1
1210}
1211
1212sub invoke_delete {
1213 my ($self) = @_;
1214
1215 $self->hide;
1216
1155 1 1217 1
1156} 1218}
1157 1219
1158sub invoke_button_down { 1220sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
… …
1581 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1582 1644
1583 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1585 1647
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1588 1649
1589 delete $self->{size_req}; 1650 delete $self->{size_req};
1590 $self->realloc; 1651 $self->realloc;
1591 $self->update; 1652 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1599 1660
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1662
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1604 1664
1605 delete $self->{size_req}; 1665 delete $self->{size_req};
1606 $self->realloc; 1666 $self->realloc;
1607 $self->update; 1667 $self->update;
… …
1619 1679
1620 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1621 1681
1622 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1683 $self->{template}->set_font ($self->{font}) if $self->{font};
1684 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1686
1626 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1627 1688
1628 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
… …
1652 1713
1653sub set_fontsize { 1714sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1655 1716
1656 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1657 delete $self->{texture}; 1719 delete $self->{texture};
1658 1720
1659 $self->realloc; 1721 $self->realloc;
1660} 1722}
1661 1723
1662sub reconfigure { 1724sub reconfigure {
1663 my ($self) = @_; 1725 my ($self) = @_;
1664 1726
1665 delete $self->{size_req}; 1727 delete $self->{size_req};
1728 delete $self->{texture};
1666 1729
1667 $self->SUPER::reconfigure; 1730 $self->SUPER::reconfigure;
1668} 1731}
1669 1732
1670sub _draw { 1733sub _draw {
1671 my ($self) = @_; 1734 my ($self) = @_;
1672 1735
1673 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1674 1737
1675 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 1745
1683 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1684 }; 1747 };
1685 1748
1686 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1690 1753
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 1757 };
1695 1758
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 1761
1701 if ($tex->{format} == GL_ALPHA) { 1762 $self->{layout}->render ($self->{ox}, $self->{oy});
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 }
1709
1710 glDisable GL_TEXTURE_2D;
1711} 1763}
1712 1764
1713############################################################################# 1765#############################################################################
1714 1766
1715package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1826 1878
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 1880
1829 # byte-index to char-index 1881 # byte-index to char-index
1830 my $text = $self->{text}; 1882 my $text = $self->{text};
1831 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1833 1885
1834 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1835 $self->update; 1887 $self->update;
1836 1888
1837 1 1889 1
… …
2057 my ($self) = @_; 2109 my ($self) = @_;
2058 2110
2059 (6) x 2 2111 (6) x 2
2060} 2112}
2061 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
2062sub invoke_button_down { 2122sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
2064 2124
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state}; 2127 $self->toggle;
2068 $self->emit (changed => $self->{state});
2069 } else { 2128 } else {
2070 return 0 2129 return 0
2071 } 2130 }
2072 2131
2073 1 2132 1
… …
2109 my $self = $class->SUPER::new ( 2168 my $self = $class->SUPER::new (
2110 can_events => 0, 2169 can_events => 0,
2111 @_, 2170 @_,
2112 ); 2171 );
2113 2172
2114 $self->{path} 2173 $self->{path} || $self->{tex}
2115 or Carp::croak "required attribute 'path' not set"; 2174 or Carp::croak "'path' or 'tex' attributes required";
2116 2175
2117 $self->{tex} = $texture_cache{$self->{path}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2177 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119 2178
2120 Scalar::Util::weaken $texture_cache{$self->{path}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2121 2180
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2305
2247 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2307 my $h2 = $self->{h} * (1 - $ycut2);
2308 my $h3 = $self->{h};
2309
2310 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2311
2250 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
… …
2272 2334
2273 if ($t3) { 2335 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2342 glEnd;
2281 } 2343 }
2282 2344
2283 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2439 } 2501 }
2440 2502
2441 1 2503 1
2442} 2504}
2443 2505
2506sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_;
2508
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2512
2513 ! ! $delta
2514}
2515
2444sub update { 2516sub update {
2445 my ($self) = @_; 2517 my ($self) = @_;
2446 2518
2447 delete $self->{knob_w}; 2519 delete $self->{knob_w};
2448 $self->SUPER::update; 2520 $self->SUPER::update;
… …
2547sub new { 2619sub new {
2548 my $class = shift; 2620 my $class = shift;
2549 2621
2550 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2551 fontsize => 1, 2623 fontsize => 1,
2552 can_events => 0, 2624 can_events => 1,
2553 indent => 0, 2625 indent => 0,
2554 #font => default_font 2626 #font => default_font
2555 @_, 2627 @_,
2556 2628
2557 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2558 par => [], 2630 par => [],
2559 height => 0, 2631 height => 0,
2560 children => [ 2632 children => [
2561 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2597 2669
2598 $self->reflow; 2670 $self->reflow;
2599 2671
2600 local $self->{children} = [$empty, $slider]; 2672 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 2673 $self->SUPER::invoke_size_allocate ($w, $h)
2674}
2675
2676sub invoke_mouse_wheel {
2677 my ($self, $ev) = @_;
2678
2679 return 0 unless $ev->{dy}; # only vertical movements
2680
2681 $self->{children}[1]->emit (mouse_wheel => $ev);
2682
2683 1
2602} 2684}
2603 2685
2604sub get_layout { 2686sub get_layout {
2605 my ($self, $para) = @_; 2687 my ($self, $para) = @_;
2606 2688
… …
2723 my $y0 = $top; 2805 my $y0 = $top;
2724 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2725 2807
2726 my $y = 0; 2808 my $y = 0;
2727 2809
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 2810 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 2811 my $h = $para->{h};
2734 2812
2735 if ($y0 < $y + $h && $y < $y1) { 2813 if ($y0 < $y + $h && $y < $y1) {
2736 2814
2737 my $layout = $self->get_layout ($para); 2815 my $layout = $self->get_layout ($para);
2738 2816
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 2818
2744 if (my @w = @{ $para->{widget} }) { 2819 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 2820 my @s = $layout->get_shapes;
2746 2821
2747 glDisable GL_BLEND;
2748 for (@w) { 2822 for (@w) {
2749 my ($dx, $dy) = splice @s, 0, 2, (); 2823 my ($dx, $dy) = splice @s, 0, 2, ();
2750 2824
2751 $_->{x} = $dx + $para->{indent}; 2825 $_->{x} = $dx + $para->{indent};
2752 $_->{y} = $dy + $y - $y0; 2826 $_->{y} = $dy + $y - $y0;
2753 2827
2754 $_->draw; 2828 $_->draw;
2755 } 2829 }
2756 glEnable GL_BLEND;
2757 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758 } 2830 }
2759 } 2831 }
2760 2832
2761 $y += $h; 2833 $y += $h;
2762 } 2834 }
2763
2764 glDisable GL_BLEND;
2765 }; 2835 };
2766 }); 2836 });
2767} 2837}
2768 2838
2769sub reconfigure { 2839sub reconfigure {
… …
3065 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
3066 my ($widget, $cb, $tooltip) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
3067 3137
3068 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
3069 if (!ref $widget) { 3139 if (!ref $widget) {
3140 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2;
3142
3143 $widget = new CFClient::UI::HBox
3144 can_hover => 1,
3145 can_events => 1,
3146 tooltip => $tooltip,
3147 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1),
3150 ],
3151 ;
3152
3153 } else {
3070 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
3071 can_hover => 1, 3155 can_hover => 1,
3072 can_events => 1, 3156 can_events => 1,
3073 markup => $widget, 3157 markup => $widget,
3074 tooltip => $tooltip 3158 tooltip => $tooltip;
3159 }
3075 } 3160 }
3076 3161
3077 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
3078 3163
3079 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
3146 3231
3147 $self->SUPER::add (@widgets); 3232 $self->SUPER::add (@widgets);
3148 3233
3149 $self->{current} = $self->{children}[0] 3234 $self->{current} = $self->{children}[0]
3150 if @{ $self->{children} }; 3235 if @{ $self->{children} };
3236}
3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3151} 3242}
3152 3243
3153sub set_current_page { 3244sub set_current_page {
3154 my ($self, $page_or_widget) = @_; 3245 my ($self, $page_or_widget) = @_;
3155 3246
… …
3221 tooltip => $tooltip, 3312 tooltip => $tooltip,
3222 on_activate => sub { $self->set_current_page ($widget) }, 3313 on_activate => sub { $self->set_current_page ($widget) },
3223 ); 3314 );
3224 3315
3225 $self->{multiplexer}->add ($widget); 3316 $self->{multiplexer}->add ($widget);
3317}
3318
3319sub get_current_page {
3320 my ($self) = @_;
3321
3322 $self->{multiplexer}->get_current_page
3226} 3323}
3227 3324
3228sub set_current_page { 3325sub set_current_page {
3229 my ($self, $page) = @_; 3326 my ($self, $page) = @_;
3230 3327
… …
3408 count => 1, 3505 count => 1,
3409 %arg, 3506 %arg,
3410 }; 3507 };
3411 } 3508 }
3412 3509
3510 $ROOT->on_refresh (reorder => sub {
3413 $self->reorder; 3511 $self->reorder;
3512 });
3414} 3513}
3415 3514
3416sub reconfigure { 3515sub reconfigure {
3417 my ($self) = @_; 3516 my ($self) = @_;
3418 3517
… …
3433 3532
3434############################################################################# 3533#############################################################################
3435 3534
3436package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3437 3536
3438our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3439 3538
3440sub new { 3539sub new {
3441 my $class = shift; 3540 my $class = shift;
3442 3541
3443 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3444 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3445 @_, 3544 @_,
3446 ); 3545 );
3447 3546
3448 $self 3547 $self
3449} 3548}
3450 3549
3451sub set_items { 3550sub set_items {
3452 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3453 3552
3454 $self->{child}->clear; 3553 $self->clear;
3455 return unless $items; 3554 return unless $items;
3456 3555
3457 my @items = sort { 3556 my @items = sort {
3458 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3459 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3460 } @$items; 3559 } values %$items;
3461 3560
3462 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3463 3562
3464 my $row = 0; 3563 my $row = 0;
3465 for my $item (@items) { 3564 for my $item (@items) {
3466 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3467 3566
3468 $self->{child}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3469 $self->{child}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3470 $self->{child}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3471 3570
3472 $row++; 3571 $row++;
3473 }
3474}
3475
3476#############################################################################
3477
3478package CFClient::UI::BindEditor;
3479
3480our @ISA = CFClient::UI::FancyFrame::;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3486
3487 $self->add (my $vb = new CFClient::UI::VBox);
3488
3489
3490 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3491 text => "start recording",
3492 tooltip => "Start/Stops recording of actions."
3493 ."All subsequent actions after the recording started will be captured."
3494 ."The actions are displayed after the record was stopped."
3495 ."To bind the action you have to click on the 'Bind' button",
3496 on_activate => sub {
3497 unless ($self->{recording}) {
3498 $self->start;
3499 } else {
3500 $self->stop;
3501 }
3502 });
3503
3504 $vb->add (new CFClient::UI::Label text => "Actions:");
3505 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3506
3507 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3508 $vb->add (my $hb = new CFClient::UI::HBox);
3509 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3510 $hb->add (new CFClient::UI::Button
3511 text => "bind",
3512 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3513 on_activate => sub {
3514 $self->ask_for_bind;
3515 });
3516
3517 $vb->add (my $hb = new CFClient::UI::HBox);
3518 $hb->add (new CFClient::UI::Button
3519 text => "ok",
3520 expand => 1,
3521 tooltip => "This closes the binding editor and saves the binding",
3522 on_activate => sub {
3523 $self->hide;
3524 $self->commit;
3525 });
3526
3527 $hb->add (new CFClient::UI::Button
3528 text => "cancel",
3529 expand => 1,
3530 tooltip => "This closes the binding editor without saving",
3531 on_activate => sub {
3532 $self->hide;
3533 $self->{binding_cancel}->()
3534 if $self->{binding_cancel};
3535 });
3536
3537 $self->update_binding_widgets;
3538
3539 $self
3540}
3541
3542sub cfg_bind {
3543 my ($self, $mod, $sym, $cmds) = @_;
3544 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3545 ::update_bindings ();
3546}
3547
3548sub cfg_unbind {
3549 my ($self, $mod, $sym, $cmds) = @_;
3550 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3551 ::update_bindings ();
3552}
3553
3554sub commit {
3555 my ($self) = @_;
3556 my ($mod, $sym, $cmds) = $self->get_binding;
3557 if ($sym != 0 && @$cmds > 0) {
3558 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3559 ."'. Don't forget 'Save Config'!");
3560 $self->{binding_change}->($mod, $sym, $cmds)
3561 if $self->{binding_change};
3562 } else {
3563 $::STATUSBOX->add ("No action bound, no key or action specified!");
3564 $self->{binding_cancel}->()
3565 if $self->{binding_cancel};
3566 }
3567}
3568
3569sub start {
3570 my ($self) = @_;
3571
3572 $self->{rec_btn}->set_text ("stop recording");
3573 $self->{recording} = 1;
3574 $self->clear_command_list;
3575 $::CONN->start_record if $::CONN;
3576}
3577
3578sub stop {
3579 my ($self) = @_;
3580
3581 $self->{rec_btn}->set_text ("start recording");
3582 $self->{recording} = 0;
3583
3584 my $rec;
3585 $rec = $::CONN->stop_record if $::CONN;
3586 return unless ref $rec eq 'ARRAY';
3587 $self->set_command_list ($rec);
3588}
3589
3590
3591sub ask_for_bind_and_commit {
3592 my ($self) = @_;
3593 $self->ask_for_bind (1);
3594}
3595
3596sub ask_for_bind {
3597 my ($self, $commit, $end_cb) = @_;
3598
3599 CFClient::Binder::open_binding_dialog (sub {
3600 my ($mod, $sym) = @_;
3601 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3602 $self->update_binding_widgets;
3603 $self->commit if $commit;
3604 $end_cb->() if $end_cb;
3605 });
3606}
3607
3608# $mod and $sym are the modifiers and key symbol
3609# $cmds is a array ref of strings (the commands)
3610# $cb is the callback that is executed on OK
3611# $ccb is the callback that is executed on CANCEL and
3612# when the binding was unsuccessful on OK
3613sub set_binding {
3614 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3615
3616 $self->clear_command_list;
3617 $self->{recording} = 0;
3618 $self->{rec_btn}->set_text ("start recording");
3619
3620 $self->{binding} = [$mod, $sym];
3621 $self->{commands} = $cmds;
3622
3623 $self->{binding_change} = $cb;
3624 $self->{binding_cancel} = $ccb;
3625
3626 $self->update_binding_widgets;
3627}
3628
3629# this is a shortcut method that asks for a binding
3630# and then just binds it.
3631sub do_quick_binding {
3632 my ($self, $cmds, $end_cb) = @_;
3633 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3634 $self->ask_for_bind (1, $end_cb);
3635}
3636
3637sub update_binding_widgets {
3638 my ($self) = @_;
3639 my ($mod, $sym, $cmds) = $self->get_binding;
3640 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3641 $self->set_command_list ($cmds);
3642}
3643
3644sub get_binding {
3645 my ($self) = @_;
3646 return (
3647 $self->{binding}->[0],
3648 $self->{binding}->[1],
3649 [ grep { defined $_ } @{$self->{commands}} ]
3650 );
3651}
3652
3653sub clear_command_list {
3654 my ($self) = @_;
3655 $self->{cmdbox}->clear ();
3656}
3657
3658sub set_command_list {
3659 my ($self, $cmds) = @_;
3660
3661 $self->{cmdbox}->clear ();
3662 $self->{commands} = $cmds;
3663
3664 my $idx = 0;
3665
3666 for (@$cmds) {
3667 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3668
3669 my $i = $idx;
3670 $hb->add (new CFClient::UI::Label text => $_);
3671 $hb->add (new CFClient::UI::Button
3672 text => "delete",
3673 tooltip => "Deletes the action from the record",
3674 on_activate => sub {
3675 $self->{cmdbox}->remove ($hb);
3676 $cmds->[$i] = undef;
3677 });
3678
3679
3680 $idx++
3681 } 3572 }
3682} 3573}
3683 3574
3684############################################################################# 3575#############################################################################
3685 3576
… …
3739 } elsif ($ev->{button} == 2) { 3630 } elsif ($ev->{button} == 2) {
3740 $::CONN->user_send ("invoke $spell->{name}"); 3631 $::CONN->user_send ("invoke $spell->{name}");
3741 } elsif ($ev->{button} == 3) { 3632 } elsif ($ev->{button} == 3) {
3742 (new CFClient::UI::Menu 3633 (new CFClient::UI::Menu
3743 items => [ 3634 items => [
3744 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3635 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3745 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3636 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3746 ], 3637 ],
3747 )->popup ($ev); 3638 )->popup ($ev);
3748 } else { 3639 } else {
3749 return 0; 3640 return 0;
… …
3995 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3996 3887
3997 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3998 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3999 3890
3891 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h;
3893
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896
4000 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
4001 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
4002 3899
4003 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3900 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4004 $widget->{old_w} = $widget->{w}; 3901 $widget->{old_w} = $widget->{w};

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines