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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.330 by root, Sun Jul 23 04:37:51 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;
… …
335sub size_request { 357sub size_request {
336 require Carp; 358 require Carp;
337 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
338} 360}
339 361
362sub baseline_shift {
363 0
364}
365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
343 if ($self->{aspect}) { 369 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
… …
419 my ($self) = @_; 445 my ($self) = @_;
420 446
421 return if $FOCUS == $self; 447 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
423 449
424 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
425 451
426 $focus->update if $focus; 452 $self->update;
427 $FOCUS->update;
428 453
429 0 454 0
430} 455}
431 456
432sub invoke_focus_out { 457sub invoke_focus_out {
433 my ($self) = @_; 458 my ($self) = @_;
434 459
435 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
436 461
437 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
438 463
439 $focus->update if $focus; #? 464 $self->update;
440 465
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 467 unless $FOCUS;
443 468
444 0 469 0
445} 470}
446 471
447sub grab_focus { 472sub grab_focus {
448 my ($self) = @_; 473 my ($self) = @_;
449 474
475 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 476 $self->emit ("focus_in");
451} 477}
452 478
453sub invoke_mouse_motion { 1 } 479sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 480sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 481sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
457 484
458sub invoke_button_down { 485sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
460 487
461 $self->grab_focus; 488 $self->grab_focus;
462 489
463 1 490 0
464} 491}
465 492
466sub connect { 493sub connect {
467 my ($self, $signal, $cb) = @_; 494 my ($self, $signal, $cb) = @_;
468 495
… …
470} 497}
471 498
472sub emit { 499sub emit {
473 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
474 501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
475 #d##TODO# stop propagating at first true, do not use sum 509 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479} 513}
480 514
481sub find_widget { 515sub find_widget {
482 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
483 517
… …
535 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
536 570
537 # update screen rectangle 571 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 572 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 573 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 574
543 # skip widgets that are entirely outside the drawing area 575 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 578
… …
585} 617}
586 618
587sub DESTROY { 619sub DESTROY {
588 my ($self) = @_; 620 my ($self) = @_;
589 621
622 return if CFClient::in_destruct;
623
590 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
591 625
592 eval { $self->destroy }; 626 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
594} 628}
… …
973 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
974 }, 1008 },
975 ; 1009 ;
976 1010
977 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
979 slider => $slider, 1014 slider => $slider,
980 %arg, 1015 %arg,
981 ); 1016 );
982 1017
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1019 $self->add ($child) if $child;
985 1020
986 $self 1021 $self
987} 1022}
988 1023
1024#TODO# update range on size_allocate depending on child
1025
989sub add { 1026sub add {
990 my ($self, $widget) = @_; 1027 my ($self, $widget) = @_;
991 1028
992 $self->{vp}->add ($self->{child} = $widget); 1029 $self->{vp}->add ($self->{child} = $widget);
993} 1030}
994 1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
1040}
1041
1042sub update_slider {
1043 my ($self) = @_;
1044
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1046}
1047
995sub update { 1048sub update {
996 my ($self) = @_; 1049 my ($self) = @_;
997 1050
998 $self->SUPER::update; 1051 $self->SUPER::update;
999 1052
1000 # todo: overwrite size_allocate of child 1053 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1054}
1004 1055
1005sub invoke_size_allocate { 1056sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
1007 1058
1008 my $child = $self->{vp}->child; 1059 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1060
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1061 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1062}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1063
1017############################################################################# 1064#############################################################################
1018 1065
1019package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1020 1067
… …
1076 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1126 border => 0.6,
1080 can_events => 1, 1127 can_events => 1,
1081 min_w => 16, 1128 min_w => 64,
1082 min_h => 16, 1129 min_h => 32,
1083 %arg, 1130 %arg,
1084 ); 1131 );
1085 1132
1086 $self->{title_widget} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1087 align => 0, 1134 align => 0,
… …
1091 if exists $self->{title}; 1138 if exists $self->{title};
1092 1139
1093 if ($self->{has_close_button}) { 1140 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1141 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1142 new CFClient::UI::ImageButton
1096 image => 'x1_close.png', 1143 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1144 on_activate => sub { $self->emit ("delete") };
1098 1145
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1146 $self->CFClient::UI::Container::add ($self->{close_button});
1100 } 1147 }
1101 1148
1102 $self 1149 $self
… …
1148 $self->child->configure ($border, $border, $w, $h); 1195 $self->child->configure ($border, $border, $w, $h);
1149 1196
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1198 if $self->{close_button};
1152 1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1207
1153 1 1208 1
1154} 1209}
1155 1210
1156sub invoke_button_down { 1211sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
… …
1438 1493
1439sub invoke_size_allocate { 1494sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1441 1496
1442 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1444 1499
1445 my @req; 1500 my @req;
1446 1501
1447 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1449 } else { 1504 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1452 1507
1453 if ($req > $space) { 1508 if ($req > $space) {
1454 # ah well, not enough space 1509 # ah well, not enough space
1455 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1456 } else { 1511 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 1513
1459 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1460 1515
1461 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 1517 for 0 .. $#children;
1463 } 1518 }
1464 } 1519 }
1465 1520
1466 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1467 1522
1468 my $pos = 0; 1523 my $pos = 0;
1469 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1471 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472 1527
1473 $pos += $alloc; 1528 $pos += $alloc;
1474 } 1529 }
1475 1530
1476 1 1531 1
… …
1579 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1580 1635
1581 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1583 1638
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1586 1640
1587 delete $self->{size_req}; 1641 delete $self->{size_req};
1588 $self->realloc; 1642 $self->realloc;
1589 $self->update; 1643 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1597 1651
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1653
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1602 1655
1603 delete $self->{size_req}; 1656 delete $self->{size_req};
1604 $self->realloc; 1657 $self->realloc;
1605 $self->update; 1658 $self->update;
… …
1617 1670
1618 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1619 1672
1620 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1677
1624 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1625 1679
1626 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
… …
1631 }; 1685 };
1632 1686
1633 @{ $self->{size_req} } 1687 @{ $self->{size_req} }
1634} 1688}
1635 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1636sub invoke_size_allocate { 1694sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1638 1696
1639 delete $self->{ox}; 1697 delete $self->{ox};
1640 1698
… …
1646 1704
1647sub set_fontsize { 1705sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1649 1707
1650 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1651 delete $self->{texture}; 1710 delete $self->{texture};
1652 1711
1653 $self->realloc; 1712 $self->realloc;
1654} 1713}
1655 1714
1656sub reconfigure { 1715sub reconfigure {
1657 my ($self) = @_; 1716 my ($self) = @_;
1658 1717
1659 delete $self->{size_req}; 1718 delete $self->{size_req};
1719 delete $self->{texture};
1660 1720
1661 $self->SUPER::reconfigure; 1721 $self->SUPER::reconfigure;
1662} 1722}
1663 1723
1664sub _draw { 1724sub _draw {
1665 my ($self) = @_; 1725 my ($self) = @_;
1666 1726
1667 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1668 1728
1669 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1736
1677 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1678 }; 1738 };
1679 1739
1680 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1684 1744
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1748 };
1689 1749
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1752
1695 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 1754}
1706 1755
1707############################################################################# 1756#############################################################################
1708 1757
1709package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1820 1869
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1871
1823 # byte-index to char-index 1872 # byte-index to char-index
1824 my $text = $self->{text}; 1873 my $text = $self->{text};
1825 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1827 1876
1828 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1829 $self->update; 1878 $self->update;
1830 1879
1831 1 1880 1
… …
2051 my ($self) = @_; 2100 my ($self) = @_;
2052 2101
2053 (6) x 2 2102 (6) x 2
2054} 2103}
2055 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
2056sub invoke_button_down { 2113sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
2058 2115
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2118 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2119 } else {
2064 return 0 2120 return 0
2065 } 2121 }
2066 2122
2067 1 2123 1
… …
2092package CFClient::UI::Image; 2148package CFClient::UI::Image;
2093 2149
2094our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
2095 2151
2096use CFClient::OpenGL; 2152use CFClient::OpenGL;
2097use Carp qw/confess/;
2098 2153
2099our %loaded_images; 2154our %texture_cache;
2100 2155
2101sub new { 2156sub new {
2102 my $class = shift; 2157 my $class = shift;
2103 2158
2104 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2105 2163
2106 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
2107 2166
2108 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2109 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2110 2169
2111 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2112 2171
2113 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2114
2115 $self->{aspect} = $tex->{w} / $tex->{h};
2116 2173
2117 $self 2174 $self
2118} 2175}
2119 2176
2120sub size_request { 2177sub size_request {
2121 my ($self) = @_; 2178 my ($self) = @_;
2122 2179
2123 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2124} 2181}
2125 2182
2126sub _draw { 2183sub _draw {
2127 my ($self) = @_; 2184 my ($self) = @_;
2128 2185
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2296
2240 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2241 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242 2302
2243 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
… …
2265 2325
2266 if ($t3) { 2326 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2333 glEnd;
2274 } 2334 }
2275 2335
2276 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2432 } 2492 }
2433 2493
2434 1 2494 1
2435} 2495}
2436 2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2505}
2506
2437sub update { 2507sub update {
2438 my ($self) = @_; 2508 my ($self) = @_;
2439 2509
2440 delete $self->{knob_w}; 2510 delete $self->{knob_w};
2441 $self->SUPER::update; 2511 $self->SUPER::update;
… …
2540sub new { 2610sub new {
2541 my $class = shift; 2611 my $class = shift;
2542 2612
2543 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2544 fontsize => 1, 2614 fontsize => 1,
2545 can_events => 0, 2615 can_events => 1,
2546 indent => 0, 2616 indent => 0,
2547 #font => default_font 2617 #font => default_font
2548 @_, 2618 @_,
2549 2619
2550 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2551 par => [], 2621 par => [],
2552 height => 0, 2622 height => 0,
2553 children => [ 2623 children => [
2554 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2566 2636
2567 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2568 $self->reflow; 2638 $self->reflow;
2569} 2639}
2570 2640
2641sub size_request {
2642 my ($self) = @_;
2643
2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2648}
2649
2571sub invoke_size_allocate { 2650sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2573 2652
2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2655
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 2658 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 2660
2579 $self->reflow; 2661 $self->reflow;
2580 2662
2663 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 2664 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 2665}
2583 2666
2584sub text_size { 2667sub invoke_mouse_wheel {
2585 my ($self, $text, $indent) = @_; 2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2675}
2676
2677sub get_layout {
2678 my ($self, $para) = @_;
2586 2679
2587 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2588 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text); 2687 $layout->set_markup ($para->{markup});
2688
2689 $layout->set_shapes (
2690 map
2691 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2692 @{$para->{widget}}
2593 2693 );
2694
2594 $layout->size 2695 $layout
2595} 2696}
2596 2697
2597sub reflow { 2698sub reflow {
2598 my ($self) = @_; 2699 my ($self) = @_;
2599 2700
… …
2608 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2609} 2710}
2610 2711
2611sub clear { 2712sub clear {
2612 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2613 2717
2614 $self->{par} = []; 2718 $self->{par} = [];
2615 $self->{height} = 0; 2719 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 2721}
2618 2722
2619sub add_paragraph { 2723sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2621 2725
2622 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2623 my ($w, $h) = $self->text_size ($line); 2727
2624 $self->{height} += $h; 2728 $para = {
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2729 w => 1e10,
2730 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2626 } 2735 };
2627 2736
2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2739
2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2743
2744sub scroll_to_bottom {
2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2629} 2749}
2630 2750
2631sub update { 2751sub update {
2632 my ($self) = @_; 2752 my ($self) = @_;
2633 2753
… …
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 2762
2643 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2644 my $height = 0; 2764 my $height = 0;
2645 2765
2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2652 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654 $layout->set_markup ($_->[4]);
2655 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3]; 2770
2657 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2658 } 2774 }
2659 2775
2660 $height += $_->[1]; 2776 $height += $para->{h};
2661 } 2777 }
2662 2778
2663 $self->{height} = $height; 2779 $self->{height} = $height;
2664 2780
2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2666 2782
2667 delete $self->{texture}; 2783 delete $self->{texture};
2784 }
2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2668 } 2788 }
2669 2789
2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 2791 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
… …
2676 my $y0 = $top; 2796 my $y0 = $top;
2677 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2678 2798
2679 my $y = 0; 2799 my $y = 0;
2680 2800
2681 my $layout = $self->{layout};
2682
2683 $layout->set_font ($self->{font}) if $self->{font};
2684
2685 glEnable GL_BLEND;
2686 #TODO# not correct in windows where rgba is forced off
2687 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 2802 my $h = $para->{h};
2691 2803
2692 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2693 $layout->set_foreground (@{ $par->[2] });
2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696 $layout->set_markup ($par->[4]);
2697 2805
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2699 2807
2700 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2809
2810 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes;
2812
2813 for (@w) {
2814 my ($dx, $dy) = splice @s, 0, 2, ();
2815
2816 $_->{x} = $dx + $para->{indent};
2817 $_->{y} = $dy + $y - $y0;
2818
2819 $_->draw;
2820 }
2821 }
2702 } 2822 }
2703 2823
2704 $y += $h; 2824 $y += $h;
2705 } 2825 }
2706
2707 glDisable GL_BLEND;
2708 }; 2826 };
2709 }); 2827 });
2828}
2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2710} 2837}
2711 2838
2712sub _draw { 2839sub _draw {
2713 my ($self) = @_; 2840 my ($self) = @_;
2714 2841
… …
2717 glColor 0, 0, 0, 1; 2844 glColor 0, 0, 0, 1;
2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2845 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2720 2847
2721 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2722
2723} 2849}
2724 2850
2725############################################################################# 2851#############################################################################
2726 2852
2727package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
3000 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
3001 my ($widget, $cb, $tooltip) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
3002 3128
3003 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
3004 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
3005 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
3006 can_hover => 1, 3146 can_hover => 1,
3007 can_events => 1, 3147 can_events => 1,
3008 markup => $widget, 3148 markup => $widget,
3009 tooltip => $tooltip 3149 tooltip => $tooltip;
3150 }
3010 } 3151 }
3011 3152
3012 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
3013 3154
3014 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
3081 3222
3082 $self->SUPER::add (@widgets); 3223 $self->SUPER::add (@widgets);
3083 3224
3084 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3226 if @{ $self->{children} };
3227}
3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3086} 3233}
3087 3234
3088sub set_current_page { 3235sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
3090 3237
… …
3156 tooltip => $tooltip, 3303 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 3304 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 3305 );
3159 3306
3160 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3308}
3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3161} 3314}
3162 3315
3163sub set_current_page { 3316sub set_current_page {
3164 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3165 3318
… …
3343 count => 1, 3496 count => 1,
3344 %arg, 3497 %arg,
3345 }; 3498 };
3346 } 3499 }
3347 3500
3501 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3502 $self->reorder;
3503 });
3349} 3504}
3350 3505
3351sub reconfigure { 3506sub reconfigure {
3352 my ($self) = @_; 3507 my ($self) = @_;
3353 3508
… …
3368 3523
3369############################################################################# 3524#############################################################################
3370 3525
3371package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3372 3527
3373our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3374 3529
3375sub new { 3530sub new {
3376 my $class = shift; 3531 my $class = shift;
3377 3532
3378 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3380 @_, 3535 @_,
3381 ); 3536 );
3382 3537
3383 $self 3538 $self
3384} 3539}
3385 3540
3386sub set_items { 3541sub set_items {
3387 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3388 3543
3389 $self->{child}->clear; 3544 $self->clear;
3390 return unless $items; 3545 return unless $items;
3391 3546
3392 my @items = sort { 3547 my @items = sort {
3393 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3395 } @$items; 3550 } values %$items;
3396 3551
3397 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3398 3553
3399 my $row = 0; 3554 my $row = 0;
3400 for my $item (@items) { 3555 for my $item (@items) {
3401 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3402 3557
3403 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3406 3561
3407 $row++; 3562 $row++;
3408 }
3409}
3410
3411#############################################################################
3412
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub commit {
3478 my ($self) = @_;
3479 my ($mod, $sym, $cmds) = $self->get_binding;
3480 if ($sym != 0 && @$cmds > 0) {
3481 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482 ."'. Don't forget 'Save Config'!");
3483 $self->{binding_change}->($mod, $sym, $cmds)
3484 if $self->{binding_change};
3485 } else {
3486 $::STATUSBOX->add ("No action bound, no key or action specified!");
3487 $self->{binding_cancel}->()
3488 if $self->{binding_cancel};
3489 }
3490}
3491
3492sub start {
3493 my ($self) = @_;
3494
3495 $self->{rec_btn}->set_text ("stop recording");
3496 $self->{recording} = 1;
3497 $self->clear_command_list;
3498 $::CONN->start_record if $::CONN;
3499}
3500
3501sub stop {
3502 my ($self) = @_;
3503
3504 $self->{rec_btn}->set_text ("start recording");
3505 $self->{recording} = 0;
3506
3507 my $rec;
3508 $rec = $::CONN->stop_record if $::CONN;
3509 return unless ref $rec eq 'ARRAY';
3510 $self->set_command_list ($rec);
3511}
3512
3513
3514sub ask_for_bind_and_commit {
3515 my ($self) = @_;
3516 $self->ask_for_bind (1);
3517}
3518
3519sub ask_for_bind {
3520 my ($self, $commit, $end_cb) = @_;
3521
3522 CFClient::Binder::open_binding_dialog (sub {
3523 my ($mod, $sym) = @_;
3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525 $self->update_binding_widgets;
3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3528 });
3529}
3530
3531# $mod and $sym are the modifiers and key symbol
3532# $cmds is a array ref of strings (the commands)
3533# $cb is the callback that is executed on OK
3534# $ccb is the callback that is executed on CANCEL and
3535# when the binding was unsuccessful on OK
3536sub set_binding {
3537 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539 $self->clear_command_list;
3540 $self->{recording} = 0;
3541 $self->{rec_btn}->set_text ("start recording");
3542
3543 $self->{binding} = [$mod, $sym];
3544 $self->{commands} = $cmds;
3545
3546 $self->{binding_change} = $cb;
3547 $self->{binding_cancel} = $ccb;
3548
3549 $self->update_binding_widgets;
3550}
3551
3552# this is a shortcut method that asks for a binding
3553# and then just binds it.
3554sub do_quick_binding {
3555 my ($self, $cmds, $end_cb) = @_;
3556 $self->set_binding (undef, undef, $cmds, sub {
3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558 });
3559 $self->ask_for_bind (1, $end_cb);
3560}
3561
3562sub update_binding_widgets {
3563 my ($self) = @_;
3564 my ($mod, $sym, $cmds) = $self->get_binding;
3565 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566 $self->set_command_list ($cmds);
3567}
3568
3569sub get_binding {
3570 my ($self) = @_;
3571 return (
3572 $self->{binding}->[0],
3573 $self->{binding}->[1],
3574 [ grep { defined $_ } @{$self->{commands}} ]
3575 );
3576}
3577
3578sub clear_command_list {
3579 my ($self) = @_;
3580 $self->{cmdbox}->clear ();
3581}
3582
3583sub set_command_list {
3584 my ($self, $cmds) = @_;
3585
3586 $self->{cmdbox}->clear ();
3587 $self->{commands} = $cmds;
3588
3589 my $idx = 0;
3590
3591 for (@$cmds) {
3592 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594 my $i = $idx;
3595 $hb->add (new CFClient::UI::Label text => $_);
3596 $hb->add (new CFClient::UI::Button
3597 text => "delete",
3598 tooltip => "Deletes the action from the record",
3599 on_activate => sub {
3600 $self->{cmdbox}->remove ($hb);
3601 $cmds->[$i] = undef;
3602 });
3603
3604
3605 $idx++
3606 } 3563 }
3607} 3564}
3608 3565
3609############################################################################# 3566#############################################################################
3610 3567
… …
3664 } elsif ($ev->{button} == 2) { 3621 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}"); 3622 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) { 3623 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu 3624 (new CFClient::UI::Menu
3668 items => [ 3625 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ], 3628 ],
3672 )->popup ($ev); 3629 )->popup ($ev);
3673 } else { 3630 } else {
3674 return 0; 3631 return 0;
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 3878
3922 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3924 3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887
3925 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3927 3890
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w}; 3892 $widget->{old_w} = $widget->{w};

Diff Legend

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