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

Diff Legend

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