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.331 by root, Sun Jul 23 04:46:02 2006 UTC

… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
90 103
91 $GRAB = $widget; 104 $GRAB = $widget;
92 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
93 106
94 $TOOLTIP_WATCHER->cb->(); 107 $TOOLTIP_WATCHER->cb->();
95 } 108 }
96 109
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 111
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
100 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
189 203
190 } 204 }
191 } 205 }
192 206
193 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
194} 216}
195 217
196############################################################################# 218#############################################################################
197 219
198package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
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);
… …
403 429
404# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
405sub coord2local { 431sub coord2local {
406 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
407 433
434 Carp::confess unless $self->{parent};#d#
435
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 437}
410 438
411# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
412sub coord2global { 440sub coord2global {
… …
419 my ($self) = @_; 447 my ($self) = @_;
420 448
421 return if $FOCUS == $self; 449 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 450 return unless $self->{can_focus};
423 451
424 my $focus = $FOCUS; $FOCUS = $self; 452 $FOCUS = $self;
425 453
426 $focus->update if $focus; 454 $self->update;
427 $FOCUS->update;
428 455
429 0 456 0
430} 457}
431 458
432sub invoke_focus_out { 459sub invoke_focus_out {
433 my ($self) = @_; 460 my ($self) = @_;
434 461
435 return unless $FOCUS == $self; 462 return unless $FOCUS == $self;
436 463
437 my $focus = $FOCUS; undef $FOCUS; 464 undef $FOCUS;
438 465
439 $focus->update if $focus; #? 466 $self->update;
440 467
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 468 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 469 unless $FOCUS;
443 470
444 0 471 0
445} 472}
446 473
447sub grab_focus { 474sub grab_focus {
448 my ($self) = @_; 475 my ($self) = @_;
449 476
477 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 478 $self->emit ("focus_in");
451} 479}
452 480
453sub invoke_mouse_motion { 1 } 481sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 482sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 483sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
457 486
458sub invoke_button_down { 487sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
460 489
461 $self->grab_focus; 490 $self->grab_focus;
462 491
463 1 492 0
464} 493}
465 494
466sub connect { 495sub connect {
467 my ($self, $signal, $cb) = @_; 496 my ($self, $signal, $cb) = @_;
468 497
469 push @{ $self->{signal_cb}{$signal} }, $cb; 498 push @{ $self->{signal_cb}{$signal} }, $cb;
470} 499}
471 500
501my %has_coords = (
502 button_down => 1,
503 button_up => 1,
504 mouse_motion => 1,
505 mouse_wheel => 1,
506);
507
472sub emit { 508sub emit {
473 my ($self, $signal, @args) = @_; 509 my ($self, $signal, @args) = @_;
474 510
511 my @append
512 = $has_coords{$signal}
513 ? $args[0]->xy ($self)
514 : ();
515
516 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517
475 #d##TODO# stop propagating at first true, do not use sum 518 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 520 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479} 522}
480 523
481sub find_widget { 524sub find_widget {
482 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
483 526
… …
535 return unless $self->{h} && $self->{w}; 578 return unless $self->{h} && $self->{w};
536 579
537 # update screen rectangle 580 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 581 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 582 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 583
543 # skip widgets that are entirely outside the drawing area 584 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 585 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 586 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 587
… …
585} 626}
586 627
587sub DESTROY { 628sub DESTROY {
588 my ($self) = @_; 629 my ($self) = @_;
589 630
631 return if CFClient::in_destruct;
632
590 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
591 634
592 eval { $self->destroy }; 635 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
594} 637}
… …
973 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
974 }, 1017 },
975 ; 1018 ;
976 1019
977 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
979 slider => $slider, 1023 slider => $slider,
980 %arg, 1024 %arg,
981 ); 1025 );
982 1026
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1028 $self->add ($child) if $child;
985 1029
986 $self 1030 $self
987} 1031}
988 1032
1033#TODO# update range on size_allocate depending on child
1034
989sub add { 1035sub add {
990 my ($self, $widget) = @_; 1036 my ($self, $widget) = @_;
991 1037
992 $self->{vp}->add ($self->{child} = $widget); 1038 $self->{vp}->add ($self->{child} = $widget);
993} 1039}
994 1040
1041sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_;
1043
1044 return 0 unless $ev->{dy}; # only vertical movements
1045
1046 $self->{slider}->emit (mouse_wheel => $ev);
1047
1048 1
1049}
1050
1051sub update_slider {
1052 my ($self) = @_;
1053
1054 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1055}
1056
995sub update { 1057sub update {
996 my ($self) = @_; 1058 my ($self) = @_;
997 1059
998 $self->SUPER::update; 1060 $self->SUPER::update;
999 1061
1000 # todo: overwrite size_allocate of child 1062 $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} 1063}
1004 1064
1005sub invoke_size_allocate { 1065sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
1007 1067
1008 my $child = $self->{vp}->child; 1068 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1069
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1070 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1071}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1072
1017############################################################################# 1073#############################################################################
1018 1074
1019package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
1020 1076
… …
1076 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1135 border => 0.6,
1080 can_events => 1, 1136 can_events => 1,
1081 min_w => 16, 1137 min_w => 64,
1082 min_h => 16, 1138 min_h => 32,
1083 %arg, 1139 %arg,
1084 ); 1140 );
1085 1141
1086 $self->{title_widget} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1087 align => 0, 1143 align => 0,
… …
1091 if exists $self->{title}; 1147 if exists $self->{title};
1092 1148
1093 if ($self->{has_close_button}) { 1149 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1150 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1151 new CFClient::UI::ImageButton
1096 image => 'x1_close.png', 1152 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1153 on_activate => sub { $self->emit ("delete") };
1098 1154
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1155 $self->CFClient::UI::Container::add ($self->{close_button});
1100 } 1156 }
1101 1157
1102 $self 1158 $self
… …
1148 $self->child->configure ($border, $border, $w, $h); 1204 $self->child->configure ($border, $border, $w, $h);
1149 1205
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1206 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1207 if $self->{close_button};
1152 1208
1209 1
1210}
1211
1212sub invoke_delete {
1213 my ($self) = @_;
1214
1215 $self->hide;
1216
1153 1 1217 1
1154} 1218}
1155 1219
1156sub invoke_button_down { 1220sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
… …
1438 1502
1439sub invoke_size_allocate { 1503sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1504 my ($self, $w, $h) = @_;
1441 1505
1442 my $space = $self->{vertical} ? $h : $w; 1506 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 1507 my @children = $self->visible_children;
1444 1508
1445 my @req; 1509 my @req;
1446 1510
1447 if ($self->{homogeneous}) { 1511 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 1512 @req = ($space / (@children || 1)) x @children;
1449 } else { 1513 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1514 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 1515 my $req = List::Util::sum @req;
1452 1516
1453 if ($req > $space) { 1517 if ($req > $space) {
1454 # ah well, not enough space 1518 # ah well, not enough space
1455 $_ *= $space / $req for @req; 1519 $_ *= $space / $req for @req;
1456 } else { 1520 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1521 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 1522
1459 $space = ($space - $req) / $expand; # remaining space to give away 1523 $space = ($space - $req) / $expand; # remaining space to give away
1460 1524
1461 $req[$_] += $space * $children->[$_]{expand} 1525 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 1526 for 0 .. $#children;
1463 } 1527 }
1464 } 1528 }
1465 1529
1466 CFClient::UI::harmonize \@req; 1530 CFClient::UI::harmonize \@req;
1467 1531
1468 my $pos = 0; 1532 my $pos = 0;
1469 for (0 .. $#$children) { 1533 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1534 my $alloc = $req[$_];
1471 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1535 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472 1536
1473 $pos += $alloc; 1537 $pos += $alloc;
1474 } 1538 }
1475 1539
1476 1 1540 1
… …
1579 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1580 1644
1581 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1583 1647
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1586 1649
1587 delete $self->{size_req}; 1650 delete $self->{size_req};
1588 $self->realloc; 1651 $self->realloc;
1589 $self->update; 1652 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1597 1660
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1662
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1602 1664
1603 delete $self->{size_req}; 1665 delete $self->{size_req};
1604 $self->realloc; 1666 $self->realloc;
1605 $self->update; 1667 $self->update;
… …
1617 1679
1618 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1619 1681
1620 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1683 $self->{template}->set_font ($self->{font}) if $self->{font};
1684 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1686
1624 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1625 1688
1626 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
… …
1631 }; 1694 };
1632 1695
1633 @{ $self->{size_req} } 1696 @{ $self->{size_req} }
1634} 1697}
1635 1698
1699sub baseline_shift {
1700 $_[0]{layout}->descent
1701}
1702
1636sub invoke_size_allocate { 1703sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1704 my ($self, $w, $h) = @_;
1638 1705
1639 delete $self->{ox}; 1706 delete $self->{ox};
1640 1707
… …
1646 1713
1647sub set_fontsize { 1714sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1649 1716
1650 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1651 delete $self->{texture}; 1719 delete $self->{texture};
1652 1720
1653 $self->realloc; 1721 $self->realloc;
1654} 1722}
1655 1723
1656sub reconfigure { 1724sub reconfigure {
1657 my ($self) = @_; 1725 my ($self) = @_;
1658 1726
1659 delete $self->{size_req}; 1727 delete $self->{size_req};
1728 delete $self->{texture};
1660 1729
1661 $self->SUPER::reconfigure; 1730 $self->SUPER::reconfigure;
1662} 1731}
1663 1732
1664sub _draw { 1733sub _draw {
1665 my ($self) = @_; 1734 my ($self) = @_;
1666 1735
1667 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1668 1737
1669 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1745
1677 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1678 }; 1747 };
1679 1748
1680 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1684 1753
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1757 };
1689 1758
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1761
1695 if ($tex->{format} == GL_ALPHA) { 1762 $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} 1763}
1706 1764
1707############################################################################# 1765#############################################################################
1708 1766
1709package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1820 1878
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1880
1823 # byte-index to char-index 1881 # byte-index to char-index
1824 my $text = $self->{text}; 1882 my $text = $self->{text};
1825 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1827 1885
1828 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1829 $self->update; 1887 $self->update;
1830 1888
1831 1 1889 1
… …
2051 my ($self) = @_; 2109 my ($self) = @_;
2052 2110
2053 (6) x 2 2111 (6) x 2
2054} 2112}
2055 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
2056sub invoke_button_down { 2122sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
2058 2124
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2127 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2128 } else {
2064 return 0 2129 return 0
2065 } 2130 }
2066 2131
2067 1 2132 1
… …
2092package CFClient::UI::Image; 2157package CFClient::UI::Image;
2093 2158
2094our @ISA = CFClient::UI::Base::; 2159our @ISA = CFClient::UI::Base::;
2095 2160
2096use CFClient::OpenGL; 2161use CFClient::OpenGL;
2097use Carp qw/confess/;
2098 2162
2099our %loaded_images; 2163our %texture_cache;
2100 2164
2101sub new { 2165sub new {
2102 my $class = shift; 2166 my $class = shift;
2103 2167
2104 my $self = $class->SUPER::new (can_events => 0, @_); 2168 my $self = $class->SUPER::new (
2169 can_events => 0,
2170 @_,
2171 );
2105 2172
2106 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2173 $self->{path} || $self->{tex}
2174 or Carp::croak "'path' or 'tex' attributes required";
2107 2175
2108 $loaded_images{$self->{image}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2109 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2177 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2110 2178
2111 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2112 2180
2113 Scalar::Util::weaken $loaded_images{$self->{image}}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2114
2115 $self->{aspect} = $tex->{w} / $tex->{h};
2116 2182
2117 $self 2183 $self
2118} 2184}
2119 2185
2120sub size_request { 2186sub size_request {
2121 my ($self) = @_; 2187 my ($self) = @_;
2122 2188
2123 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
2124} 2190}
2125 2191
2126sub _draw { 2192sub _draw {
2127 my ($self) = @_; 2193 my ($self) = @_;
2128 2194
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2305
2240 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2241 my $h2 = $self->{h} * (1 - $ycut2); 2307 my $h2 = $self->{h} * (1 - $ycut2);
2308 my $h3 = $self->{h};
2309
2310 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242 2311
2243 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
… …
2265 2334
2266 if ($t3) { 2335 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2342 glEnd;
2274 } 2343 }
2275 2344
2276 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2432 } 2501 }
2433 2502
2434 1 2503 1
2435} 2504}
2436 2505
2506sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_;
2508
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2512
2513 ! ! $delta
2514}
2515
2437sub update { 2516sub update {
2438 my ($self) = @_; 2517 my ($self) = @_;
2439 2518
2440 delete $self->{knob_w}; 2519 delete $self->{knob_w};
2441 $self->SUPER::update; 2520 $self->SUPER::update;
… …
2540sub new { 2619sub new {
2541 my $class = shift; 2620 my $class = shift;
2542 2621
2543 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2544 fontsize => 1, 2623 fontsize => 1,
2545 can_events => 0, 2624 can_events => 1,
2546 indent => 0, 2625 indent => 0,
2547 #font => default_font 2626 #font => default_font
2548 @_, 2627 @_,
2549 2628
2550 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2551 par => [], 2630 par => [],
2552 height => 0, 2631 height => 0,
2553 children => [ 2632 children => [
2554 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2566 2645
2567 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2568 $self->reflow; 2647 $self->reflow;
2569} 2648}
2570 2649
2650sub size_request {
2651 my ($self) = @_;
2652
2653 my ($empty, $slider) = @{ $self->{children} };
2654
2655 local $self->{children} = [$empty, $slider];
2656 $self->SUPER::size_request
2657}
2658
2571sub invoke_size_allocate { 2659sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2573 2661
2662 my ($empty, $slider, @other) = @{ $self->{children} };
2663 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2664
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2665 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2666 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 2667 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2668 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 2669
2579 $self->reflow; 2670 $self->reflow;
2580 2671
2672 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 2673 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 2674}
2583 2675
2584sub text_size { 2676sub invoke_mouse_wheel {
2585 my ($self, $text, $indent) = @_; 2677 my ($self, $ev) = @_;
2678
2679 return 0 unless $ev->{dy}; # only vertical movements
2680
2681 $self->{children}[1]->emit (mouse_wheel => $ev);
2682
2683 1
2684}
2685
2686sub get_layout {
2687 my ($self, $para) = @_;
2586 2688
2587 my $layout = $self->{layout}; 2689 my $layout = $self->{layout};
2588 2690
2691 $layout->set_font ($self->{font}) if $self->{font};
2692 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 2694 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text); 2696 $layout->set_markup ($para->{markup});
2697
2698 $layout->set_shapes (
2699 map
2700 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2701 @{$para->{widget}}
2593 2702 );
2703
2594 $layout->size 2704 $layout
2595} 2705}
2596 2706
2597sub reflow { 2707sub reflow {
2598 my ($self) = @_; 2708 my ($self) = @_;
2599 2709
… …
2608 $self->{children}[1]->set_value ($offset); 2718 $self->{children}[1]->set_value ($offset);
2609} 2719}
2610 2720
2611sub clear { 2721sub clear {
2612 my ($self) = @_; 2722 my ($self) = @_;
2723
2724 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other;
2613 2726
2614 $self->{par} = []; 2727 $self->{par} = [];
2615 $self->{height} = 0; 2728 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 2730}
2618 2731
2619sub add_paragraph { 2732sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 2733 my ($self, $color, $para, $indent) = @_;
2621 2734
2622 for my $line (split /\n/, $text) { 2735 my ($text, @w) = ref $para ? @$para : $para;
2623 my ($w, $h) = $self->text_size ($line); 2736
2624 $self->{height} += $h; 2737 $para = {
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2738 w => 1e10,
2739 wrapped => 1,
2740 fg => $color,
2741 indent => $indent,
2742 markup => $text,
2743 widget => \@w,
2626 } 2744 };
2627 2745
2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2746 $self->add (@w) if @w;
2747 push @{$self->{par}}, $para;
2748
2749 $self->{need_reflow}++;
2750 $self->update;
2751}
2752
2753sub scroll_to_bottom {
2754 my ($self) = @_;
2755
2756 $self->{scroll_to_bottom} = 1;
2757 $self->update;
2629} 2758}
2630 2759
2631sub update { 2760sub update {
2632 my ($self) = @_; 2761 my ($self) = @_;
2633 2762
… …
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 2771
2643 if (delete $self->{need_reflow}) { 2772 if (delete $self->{need_reflow}) {
2644 my $height = 0; 2773 my $height = 0;
2645 2774
2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650 for (@{$self->{par}}) { 2775 for my $para (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2652 $layout->set_width ($W - $_->[3]); 2777 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; 2778 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3]; 2779
2657 $_->[1] = $h; 2780 $para->{w} = $w + $para->{indent};
2781 $para->{h} = $h;
2782 $para->{wrapped} = $layout->has_wrapped;
2658 } 2783 }
2659 2784
2660 $height += $_->[1]; 2785 $height += $para->{h};
2661 } 2786 }
2662 2787
2663 $self->{height} = $height; 2788 $self->{height} = $height;
2664 2789
2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2790 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2666 2791
2667 delete $self->{texture}; 2792 delete $self->{texture};
2793 }
2794
2795 if (delete $self->{scroll_to_bottom}) {
2796 $self->{children}[1]->set_value (1e10);
2668 } 2797 }
2669 2798
2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2799 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 2800 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 2801 glClear GL_COLOR_BUFFER_BIT;
… …
2676 my $y0 = $top; 2805 my $y0 = $top;
2677 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2678 2807
2679 my $y = 0; 2808 my $y = 0;
2680 2809
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}}) { 2810 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 2811 my $h = $para->{h};
2691 2812
2692 if ($y0 < $y + $h && $y < $y1) { 2813 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 2814
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2815 my $layout = $self->get_layout ($para);
2699 2816
2700 glRasterPos $par->[3], $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2818
2819 if (my @w = @{ $para->{widget} }) {
2820 my @s = $layout->get_shapes;
2821
2822 for (@w) {
2823 my ($dx, $dy) = splice @s, 0, 2, ();
2824
2825 $_->{x} = $dx + $para->{indent};
2826 $_->{y} = $dy + $y - $y0;
2827
2828 $_->draw;
2829 }
2830 }
2702 } 2831 }
2703 2832
2704 $y += $h; 2833 $y += $h;
2705 } 2834 }
2706
2707 glDisable GL_BLEND;
2708 }; 2835 };
2709 }); 2836 });
2837}
2838
2839sub reconfigure {
2840 my ($self) = @_;
2841
2842 $self->SUPER::reconfigure;
2843
2844 $_->{w} = 1e10 for @{ $self->{par} };
2845 $self->reflow;
2710} 2846}
2711 2847
2712sub _draw { 2848sub _draw {
2713 my ($self) = @_; 2849 my ($self) = @_;
2714 2850
… …
2717 glColor 0, 0, 0, 1; 2853 glColor 0, 0, 0, 1;
2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2854 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719 glDisable GL_TEXTURE_2D; 2855 glDisable GL_TEXTURE_2D;
2720 2856
2721 $self->{children}[1]->draw; 2857 $self->{children}[1]->draw;
2722
2723} 2858}
2724 2859
2725############################################################################# 2860#############################################################################
2726 2861
2727package CFClient::UI::Animator; 2862package CFClient::UI::Animator;
… …
3000 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
3001 my ($widget, $cb, $tooltip) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
3002 3137
3003 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
3004 if (!ref $widget) { 3139 if (!ref $widget) {
3140 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2;
3142
3143 $widget = new CFClient::UI::HBox
3144 can_hover => 1,
3145 can_events => 1,
3146 tooltip => $tooltip,
3147 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1),
3150 ],
3151 ;
3152
3153 } else {
3005 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
3006 can_hover => 1, 3155 can_hover => 1,
3007 can_events => 1, 3156 can_events => 1,
3008 markup => $widget, 3157 markup => $widget,
3009 tooltip => $tooltip 3158 tooltip => $tooltip;
3159 }
3010 } 3160 }
3011 3161
3012 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
3013 3163
3014 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
3081 3231
3082 $self->SUPER::add (@widgets); 3232 $self->SUPER::add (@widgets);
3083 3233
3084 $self->{current} = $self->{children}[0] 3234 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3235 if @{ $self->{children} };
3236}
3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3086} 3242}
3087 3243
3088sub set_current_page { 3244sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3245 my ($self, $page_or_widget) = @_;
3090 3246
… …
3156 tooltip => $tooltip, 3312 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 3313 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 3314 );
3159 3315
3160 $self->{multiplexer}->add ($widget); 3316 $self->{multiplexer}->add ($widget);
3317}
3318
3319sub get_current_page {
3320 my ($self) = @_;
3321
3322 $self->{multiplexer}->get_current_page
3161} 3323}
3162 3324
3163sub set_current_page { 3325sub set_current_page {
3164 my ($self, $page) = @_; 3326 my ($self, $page) = @_;
3165 3327
… …
3343 count => 1, 3505 count => 1,
3344 %arg, 3506 %arg,
3345 }; 3507 };
3346 } 3508 }
3347 3509
3510 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3511 $self->reorder;
3512 });
3349} 3513}
3350 3514
3351sub reconfigure { 3515sub reconfigure {
3352 my ($self) = @_; 3516 my ($self) = @_;
3353 3517
… …
3368 3532
3369############################################################################# 3533#############################################################################
3370 3534
3371package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3372 3536
3373our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3374 3538
3375sub new { 3539sub new {
3376 my $class = shift; 3540 my $class = shift;
3377 3541
3378 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3380 @_, 3544 @_,
3381 ); 3545 );
3382 3546
3383 $self 3547 $self
3384} 3548}
3385 3549
3386sub set_items { 3550sub set_items {
3387 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3388 3552
3389 $self->{child}->clear; 3553 $self->clear;
3390 return unless $items; 3554 return unless $items;
3391 3555
3392 my @items = sort { 3556 my @items = sort {
3393 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3395 } @$items; 3559 } values %$items;
3396 3560
3397 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3398 3562
3399 my $row = 0; 3563 my $row = 0;
3400 for my $item (@items) { 3564 for my $item (@items) {
3401 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3402 3566
3403 $self->{child}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3406 3570
3407 $row++; 3571 $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 } 3572 }
3607} 3573}
3608 3574
3609############################################################################# 3575#############################################################################
3610 3576
… …
3664 } elsif ($ev->{button} == 2) { 3630 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}"); 3631 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) { 3632 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu 3633 (new CFClient::UI::Menu
3668 items => [ 3634 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3635 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3636 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ], 3637 ],
3672 )->popup ($ev); 3638 )->popup ($ev);
3673 } else { 3639 } else {
3674 return 0; 3640 return 0;
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 3887
3922 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3924 3890
3891 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h;
3893
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896
3925 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3927 3899
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3900 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w}; 3901 $widget->{old_w} = $widget->{w};

Diff Legend

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