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.311 by root, Fri Jun 23 22:35:16 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
… …
539 return unless $self->{h} && $self->{w}; 578 return unless $self->{h} && $self->{w};
540 579
541 # update screen rectangle 580 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 581 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 582 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 583
547 # skip widgets that are entirely outside the drawing area 584 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 585 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 586 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 587
… …
589} 626}
590 627
591sub DESTROY { 628sub DESTROY {
592 my ($self) = @_; 629 my ($self) = @_;
593 630
631 return if CFClient::in_destruct;
632
594 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
595 634
596 eval { $self->destroy }; 635 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 637}
… …
977 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
978 }, 1017 },
979 ; 1018 ;
980 1019
981 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
983 slider => $slider, 1023 slider => $slider,
984 %arg, 1024 %arg,
985 ); 1025 );
986 1026
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child; 1028 $self->add ($child) if $child;
989 1029
990 $self 1030 $self
991} 1031}
992 1032
1033#TODO# update range on size_allocate depending on child
1034
993sub add { 1035sub add {
994 my ($self, $widget) = @_; 1036 my ($self, $widget) = @_;
995 1037
996 $self->{vp}->add ($self->{child} = $widget); 1038 $self->{vp}->add ($self->{child} = $widget);
997} 1039}
998 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
999sub update { 1057sub update {
1000 my ($self) = @_; 1058 my ($self) = @_;
1001 1059
1002 $self->SUPER::update; 1060 $self->SUPER::update;
1003 1061
1004 # todo: overwrite size_allocate of child 1062 $self->update_slider;
1005 my $child = $self->{vp}->child;
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1007} 1063}
1008 1064
1009sub invoke_size_allocate { 1065sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
1011 1067
1012 my $child = $self->{vp}->child; 1068 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014 1069
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1070 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1071}
1017
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020 1072
1021############################################################################# 1073#############################################################################
1022 1074
1023package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
1024 1076
… …
1080 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1135 border => 0.6,
1084 can_events => 1, 1136 can_events => 1,
1085 min_w => 16, 1137 min_w => 64,
1086 min_h => 16, 1138 min_h => 32,
1087 %arg, 1139 %arg,
1088 ); 1140 );
1089 1141
1090 $self->{title_widget} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1143 align => 0,
… …
1096 1148
1097 if ($self->{has_close_button}) { 1149 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1150 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1151 new CFClient::UI::ImageButton
1100 path => 'x1_close.png', 1152 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1153 on_activate => sub { $self->emit ("delete") };
1102 1154
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1155 $self->CFClient::UI::Container::add ($self->{close_button});
1104 } 1156 }
1105 1157
1106 $self 1158 $self
… …
1152 $self->child->configure ($border, $border, $w, $h); 1204 $self->child->configure ($border, $border, $w, $h);
1153 1205
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1206 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1207 if $self->{close_button};
1156 1208
1209 1
1210}
1211
1212sub invoke_delete {
1213 my ($self) = @_;
1214
1215 $self->hide;
1216
1157 1 1217 1
1158} 1218}
1159 1219
1160sub invoke_button_down { 1220sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
… …
1583 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1584 1644
1585 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1587 1647
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1590 1649
1591 delete $self->{size_req}; 1650 delete $self->{size_req};
1592 $self->realloc; 1651 $self->realloc;
1593 $self->update; 1652 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1601 1660
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1662
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1606 1664
1607 delete $self->{size_req}; 1665 delete $self->{size_req};
1608 $self->realloc; 1666 $self->realloc;
1609 $self->update; 1667 $self->update;
… …
1621 1679
1622 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1623 1681
1624 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1625 $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);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1686
1628 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1629 1688
1630 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
… …
1654 1713
1655sub set_fontsize { 1714sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1657 1716
1658 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1659 delete $self->{texture}; 1719 delete $self->{texture};
1660 1720
1661 $self->realloc; 1721 $self->realloc;
1662} 1722}
1663 1723
1664sub reconfigure { 1724sub reconfigure {
1665 my ($self) = @_; 1725 my ($self) = @_;
1666 1726
1667 delete $self->{size_req}; 1727 delete $self->{size_req};
1728 delete $self->{texture};
1668 1729
1669 $self->SUPER::reconfigure; 1730 $self->SUPER::reconfigure;
1670} 1731}
1671 1732
1672sub _draw { 1733sub _draw {
1673 my ($self) = @_; 1734 my ($self) = @_;
1674 1735
1675 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1676 1737
1677 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1745
1685 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1686 }; 1747 };
1687 1748
1688 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1692 1753
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1757 };
1697 1758
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1761
1703 if ($tex->{format} == GL_ALPHA) { 1762 $self->{layout}->render ($self->{ox}, $self->{oy});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 1763}
1714 1764
1715############################################################################# 1765#############################################################################
1716 1766
1717package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1828 1878
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 1880
1831 # byte-index to char-index 1881 # byte-index to char-index
1832 my $text = $self->{text}; 1882 my $text = $self->{text};
1833 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1835 1885
1836 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1837 $self->update; 1887 $self->update;
1838 1888
1839 1 1889 1
… …
2059 my ($self) = @_; 2109 my ($self) = @_;
2060 2110
2061 (6) x 2 2111 (6) x 2
2062} 2112}
2063 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
2064sub invoke_button_down { 2122sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
2066 2124
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state}; 2127 $self->toggle;
2070 $self->emit (changed => $self->{state});
2071 } else { 2128 } else {
2072 return 0 2129 return 0
2073 } 2130 }
2074 2131
2075 1 2132 1
… …
2111 my $self = $class->SUPER::new ( 2168 my $self = $class->SUPER::new (
2112 can_events => 0, 2169 can_events => 0,
2113 @_, 2170 @_,
2114 ); 2171 );
2115 2172
2116 $self->{path} 2173 $self->{path} || $self->{tex}
2117 or Carp::croak "required attribute 'path' not set"; 2174 or Carp::croak "'path' or 'tex' attributes required";
2118 2175
2119 $self->{tex} = $texture_cache{$self->{path}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2120 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;
2121 2178
2122 Scalar::Util::weaken $texture_cache{$self->{path}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2123 2180
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2305
2249 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2250 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);
2251 2311
2252 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
… …
2274 2334
2275 if ($t3) { 2335 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2342 glEnd;
2283 } 2343 }
2284 2344
2285 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2441 } 2501 }
2442 2502
2443 1 2503 1
2444} 2504}
2445 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
2446sub update { 2516sub update {
2447 my ($self) = @_; 2517 my ($self) = @_;
2448 2518
2449 delete $self->{knob_w}; 2519 delete $self->{knob_w};
2450 $self->SUPER::update; 2520 $self->SUPER::update;
… …
2549sub new { 2619sub new {
2550 my $class = shift; 2620 my $class = shift;
2551 2621
2552 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2553 fontsize => 1, 2623 fontsize => 1,
2554 can_events => 0, 2624 can_events => 1,
2555 indent => 0, 2625 indent => 0,
2556 #font => default_font 2626 #font => default_font
2557 @_, 2627 @_,
2558 2628
2559 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2560 par => [], 2630 par => [],
2561 height => 0, 2631 height => 0,
2562 children => [ 2632 children => [
2563 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2575 2645
2576 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2577 $self->reflow; 2647 $self->reflow;
2578} 2648}
2579 2649
2580sub visible_children { 2650sub size_request {
2581 my ($self) = @_; 2651 my ($self) = @_;
2582 2652
2583 @{$self->{children}}[0,1] 2653 my ($empty, $slider) = @{ $self->{children} };
2654
2655 local $self->{children} = [$empty, $slider];
2656 $self->SUPER::size_request
2584} 2657}
2585 2658
2586sub invoke_size_allocate { 2659sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2588 2661
… …
2594 $self->{layout}->set_width ($empty->{w}); 2667 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2668 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 2669
2597 $self->reflow; 2670 $self->reflow;
2598 2671
2672 local $self->{children} = [$empty, $slider];
2599 $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
2600} 2684}
2601 2685
2602sub get_layout { 2686sub get_layout {
2603 my ($self, $para) = @_; 2687 my ($self, $para) = @_;
2604 2688
… …
2721 my $y0 = $top; 2805 my $y0 = $top;
2722 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2723 2807
2724 my $y = 0; 2808 my $y = 0;
2725 2809
2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730 for my $para (@{$self->{par}}) { 2810 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 2811 my $h = $para->{h};
2732 2812
2733 if ($y0 < $y + $h && $y < $y1) { 2813 if ($y0 < $y + $h && $y < $y1) {
2734 2814
2735 my $layout = $self->get_layout ($para); 2815 my $layout = $self->get_layout ($para);
2736 2816
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 2818
2742 if (my @w = @{ $para->{widget} }) { 2819 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 2820 my @s = $layout->get_shapes;
2744 2821
2745 for (@w) { 2822 for (@w) {
… …
2753 } 2830 }
2754 } 2831 }
2755 2832
2756 $y += $h; 2833 $y += $h;
2757 } 2834 }
2758
2759 glDisable GL_BLEND;
2760 }; 2835 };
2761 }); 2836 });
2762} 2837}
2763 2838
2764sub reconfigure { 2839sub reconfigure {
… …
3060 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
3062 3137
3063 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
3064 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 {
3065 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
3066 can_hover => 1, 3155 can_hover => 1,
3067 can_events => 1, 3156 can_events => 1,
3068 markup => $widget, 3157 markup => $widget,
3069 tooltip => $tooltip 3158 tooltip => $tooltip;
3159 }
3070 } 3160 }
3071 3161
3072 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
3073 3163
3074 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
3141 3231
3142 $self->SUPER::add (@widgets); 3232 $self->SUPER::add (@widgets);
3143 3233
3144 $self->{current} = $self->{children}[0] 3234 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3235 if @{ $self->{children} };
3236}
3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3146} 3242}
3147 3243
3148sub set_current_page { 3244sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3245 my ($self, $page_or_widget) = @_;
3150 3246
… …
3216 tooltip => $tooltip, 3312 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3313 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3314 );
3219 3315
3220 $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
3221} 3323}
3222 3324
3223sub set_current_page { 3325sub set_current_page {
3224 my ($self, $page) = @_; 3326 my ($self, $page) = @_;
3225 3327
… …
3403 count => 1, 3505 count => 1,
3404 %arg, 3506 %arg,
3405 }; 3507 };
3406 } 3508 }
3407 3509
3510 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 3511 $self->reorder;
3512 });
3409} 3513}
3410 3514
3411sub reconfigure { 3515sub reconfigure {
3412 my ($self) = @_; 3516 my ($self) = @_;
3413 3517
… …
3428 3532
3429############################################################################# 3533#############################################################################
3430 3534
3431package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3432 3536
3433our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3434 3538
3435sub new { 3539sub new {
3436 my $class = shift; 3540 my $class = shift;
3437 3541
3438 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3440 @_, 3544 @_,
3441 ); 3545 );
3442 3546
3443 $self 3547 $self
3444} 3548}
3445 3549
3446sub set_items { 3550sub set_items {
3447 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3448 3552
3449 $self->{child}->clear; 3553 $self->clear;
3450 return unless $items; 3554 return unless $items;
3451 3555
3452 my @items = sort { 3556 my @items = sort {
3453 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3455 } @$items; 3559 } values %$items;
3456 3560
3457 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3458 3562
3459 my $row = 0; 3563 my $row = 0;
3460 for my $item (@items) { 3564 for my $item (@items) {
3461 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3462 3566
3463 $self->{child}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3466 3570
3467 $row++; 3571 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 } 3572 }
3677} 3573}
3678 3574
3679############################################################################# 3575#############################################################################
3680 3576
… …
3734 } elsif ($ev->{button} == 2) { 3630 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}"); 3631 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) { 3632 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu 3633 (new CFClient::UI::Menu
3738 items => [ 3634 items => [
3739 ["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}"]) }],
3740 ["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}"]) }],
3741 ], 3637 ],
3742 )->popup ($ev); 3638 )->popup ($ev);
3743 } else { 3639 } else {
3744 return 0; 3640 return 0;
… …
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 3887
3992 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3993 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3994 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
3995 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3997 3899
3998 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}) {
3999 $widget->{old_w} = $widget->{w}; 3901 $widget->{old_w} = $widget->{w};

Diff Legend

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