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.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.334 by root, Sun Jul 23 16:11:12 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 {
413 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
414 442
443 Carp::confess unless $self->{parent};#d#
444
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 446}
417 447
418sub invoke_focus_in { 448sub invoke_focus_in {
419 my ($self) = @_; 449 my ($self) = @_;
420 450
421 return if $FOCUS == $self; 451 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
423 453
424 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
425 455
426 $focus->update if $focus; 456 $self->update;
427 $FOCUS->update;
428 457
429 0 458 0
430} 459}
431 460
432sub invoke_focus_out { 461sub invoke_focus_out {
433 my ($self) = @_; 462 my ($self) = @_;
434 463
435 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
436 465
437 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
438 467
439 $focus->update if $focus; #? 468 $self->update;
440 469
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 471 unless $FOCUS;
443 472
444 0 473 0
445} 474}
446 475
447sub grab_focus { 476sub grab_focus {
448 my ($self) = @_; 477 my ($self) = @_;
449 478
479 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 480 $self->emit ("focus_in");
451} 481}
452 482
453sub invoke_mouse_motion { 1 } 483sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 484sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 485sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
457 488
458sub invoke_button_down { 489sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
460 491
461 $self->grab_focus; 492 $self->grab_focus;
462 493
463 1 494 0
464} 495}
465 496
466sub connect { 497sub connect {
467 my ($self, $signal, $cb) = @_; 498 my ($self, $signal, $cb) = @_;
468 499
469 push @{ $self->{signal_cb}{$signal} }, $cb; 500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
470} 506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
471 514
472sub emit { 515sub emit {
473 my ($self, $signal, @args) = @_; 516 my ($self, $signal, @args) = @_;
474 517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
475 #d##TODO# stop propagating at first true, do not use sum 527 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479} 531}
480 532
481sub find_widget { 533sub find_widget {
482 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
483 535
… …
535 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
536 588
537 # update screen rectangle 589 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 592
543 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 596
… …
585} 635}
586 636
587sub DESTROY { 637sub DESTROY {
588 my ($self) = @_; 638 my ($self) = @_;
589 639
640 return if CFClient::in_destruct;
641
590 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
591 643
592 eval { $self->destroy }; 644 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
594} 646}
… …
677 729
678 $self->add (@$children) 730 $self->add (@$children)
679 if $children; 731 if $children;
680 732
681 $self 733 $self
734}
735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
682} 742}
683 743
684sub add { 744sub add {
685 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
686 746
… …
973 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
974 }, 1034 },
975 ; 1035 ;
976 1036
977 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
979 slider => $slider, 1040 slider => $slider,
980 %arg, 1041 %arg,
981 ); 1042 );
982 1043
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
985 1046
986 $self 1047 $self
987} 1048}
988 1049
1050#TODO# update range on size_allocate depending on child
1051
989sub add { 1052sub add {
990 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
991 1054
992 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
993} 1056}
994 1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
995sub update { 1074sub update {
996 my ($self) = @_; 1075 my ($self) = @_;
997 1076
998 $self->SUPER::update; 1077 $self->SUPER::update;
999 1078
1000 # todo: overwrite size_allocate of child 1079 $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} 1080}
1004 1081
1005sub invoke_size_allocate { 1082sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1007 1084
1008 my $child = $self->{vp}->child; 1085 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1086
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1088}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1089
1017############################################################################# 1090#############################################################################
1018 1091
1019package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1020 1093
… …
1076 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1152 border => 0.6,
1080 can_events => 1, 1153 can_events => 1,
1081 min_w => 16, 1154 min_w => 64,
1082 min_h => 16, 1155 min_h => 32,
1083 %arg, 1156 %arg,
1084 ); 1157 );
1085 1158
1086 $self->{title_widget} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1087 align => 0, 1160 align => 0,
… …
1092 1165
1093 if ($self->{has_close_button}) { 1166 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1167 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1168 new CFClient::UI::ImageButton
1096 path => 'x1_close.png', 1169 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1170 on_activate => sub { $self->emit ("delete") };
1098 1171
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1172 $self->CFClient::UI::Container::add ($self->{close_button});
1100 } 1173 }
1101 1174
1102 $self 1175 $self
… …
1148 $self->child->configure ($border, $border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1149 1222
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1224 if $self->{close_button};
1152 1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1233
1153 1 1234 1
1154} 1235}
1155 1236
1156sub invoke_button_down { 1237sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
… …
1283sub children { 1364sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285} 1366}
1286 1367
1287sub add { 1368sub add {
1288 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1289 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1290 $child->set_parent ($self); 1373 $child->set_parent ($self);
1291 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1292 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1293 $self->realloc; 1379 $self->realloc;
1294} 1380}
1295 1381
1296sub remove { 1382sub remove {
1297 my ($self, $child) = @_; 1383 my ($self, $child) = @_;
… …
1549 } 1635 }
1550 1636
1551 $self 1637 $self
1552} 1638}
1553 1639
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 1640sub update {
1565 my ($self) = @_; 1641 my ($self) = @_;
1566 1642
1567 delete $self->{texture}; 1643 delete $self->{texture};
1568 $self->SUPER::update; 1644 $self->SUPER::update;
… …
1579 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1580 1656
1581 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1583 1659
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1586 1661
1587 delete $self->{size_req}; 1662 delete $self->{size_req};
1588 $self->realloc; 1663 $self->realloc;
1589 $self->update; 1664 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1597 1672
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1674
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1602 1676
1603 delete $self->{size_req}; 1677 delete $self->{size_req};
1604 $self->realloc; 1678 $self->realloc;
1605 $self->update; 1679 $self->update;
… …
1617 1691
1618 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1619 1693
1620 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1695 $self->{template}->set_font ($self->{font}) if $self->{font};
1696 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1698
1624 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1625 1700
1626 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
… …
1631 }; 1706 };
1632 1707
1633 @{ $self->{size_req} } 1708 @{ $self->{size_req} }
1634} 1709}
1635 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1636sub invoke_size_allocate { 1715sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1638 1717
1639 delete $self->{ox}; 1718 delete $self->{ox};
1640 1719
… …
1646 1725
1647sub set_fontsize { 1726sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1649 1728
1650 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1651 delete $self->{texture}; 1731 delete $self->{texture};
1652 1732
1653 $self->realloc; 1733 $self->realloc;
1654} 1734}
1655 1735
1656sub reconfigure { 1736sub reconfigure {
1657 my ($self) = @_; 1737 my ($self) = @_;
1658 1738
1659 delete $self->{size_req}; 1739 delete $self->{size_req};
1740 delete $self->{texture};
1660 1741
1661 $self->SUPER::reconfigure; 1742 $self->SUPER::reconfigure;
1662} 1743}
1663 1744
1664sub _draw { 1745sub _draw {
1665 my ($self) = @_; 1746 my ($self) = @_;
1666 1747
1667 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1668 1749
1669 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1757
1677 new_from_layout CFClient::Texture $self->{layout} 1758 [$self->{layout}->size]
1678 }; 1759 };
1679 1760
1680 unless (exists $self->{ox}) { 1761 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1684 1765
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1769 };
1689 1770
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1773
1695 if ($tex->{format} == GL_ALPHA) { 1774 $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} 1775}
1706 1776
1707############################################################################# 1777#############################################################################
1708 1778
1709package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1820 1890
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1892
1823 # byte-index to char-index 1893 # byte-index to char-index
1824 my $text = $self->{text}; 1894 my $text = $self->{text};
1825 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1827 1897
1828 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1829 $self->update; 1899 $self->update;
1830 1900
1831 1 1901 1
… …
2051 my ($self) = @_; 2121 my ($self) = @_;
2052 2122
2053 (6) x 2 2123 (6) x 2
2054} 2124}
2055 2125
2126sub toggle {
2127 my ($self) = @_;
2128
2129 $self->{state} = !$self->{state};
2130 $self->emit (changed => $self->{state});
2131 $self->update;
2132}
2133
2056sub invoke_button_down { 2134sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_; 2135 my ($self, $ev, $x, $y) = @_;
2058 2136
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2137 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2138 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state}; 2139 $self->toggle;
2062 $self->emit (changed => $self->{state});
2063 } else { 2140 } else {
2064 return 0 2141 return 0
2065 } 2142 }
2066 2143
2067 1 2144 1
… …
2103 my $self = $class->SUPER::new ( 2180 my $self = $class->SUPER::new (
2104 can_events => 0, 2181 can_events => 0,
2105 @_, 2182 @_,
2106 ); 2183 );
2107 2184
2185 $self->{path} || $self->{tex}
2186 or Carp::croak "'path' or 'tex' attributes required";
2187
2188 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2189 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2190
2191 Scalar::Util::weaken $texture_cache{$self->{path}};
2192
2193 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2194
2195 $self
2196}
2197
2198sub STORABLE_freeze {
2199 my ($self, $cloning) = @_;
2200
2201 warn "freeze<$self>\n";#d#
2202
2108 $self->{path} 2203 $self->{path}
2109 or Carp::croak "required attribute 'path' not set"; 2204 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2110 2205
2111 $self->{tex} = $texture_cache{$self->{path}} ||= 2206 $self->{path}
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2207}
2113 2208
2114 Scalar::Util::weaken $texture_cache{$self->{path}}; 2209sub STORABLE_attach {
2210 my ($self, $cloning, $path) = @_;
2211 warn "attach<@_>\n";#d#
2115 2212
2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2213 $self->new (path => $path)
2117
2118 $self
2119} 2214}
2120 2215
2121sub size_request { 2216sub size_request {
2122 my ($self) = @_; 2217 my ($self) = @_;
2123 2218
… …
2139 } 2234 }
2140 2235
2141 glEnable GL_TEXTURE_2D; 2236 glEnable GL_TEXTURE_2D;
2142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2237 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2143 2238
2144 $tex->draw_quad_alpha (0, 0, $w, $h); 2239 $tex->draw_quad (0, 0, $w, $h);
2145 2240
2146 glDisable GL_TEXTURE_2D; 2241 glDisable GL_TEXTURE_2D;
2147} 2242}
2148 2243
2149############################################################################# 2244#############################################################################
… …
2238 my $ycut1 = max 0, min 1, $ycut; 2333 my $ycut1 = max 0, min 1, $ycut;
2239 my $ycut2 = max 0, min 1, $ycut - 1; 2334 my $ycut2 = max 0, min 1, $ycut - 1;
2240 2335
2241 my $h1 = $self->{h} * (1 - $ycut1); 2336 my $h1 = $self->{h} * (1 - $ycut1);
2242 my $h2 = $self->{h} * (1 - $ycut2); 2337 my $h2 = $self->{h} * (1 - $ycut2);
2338 my $h3 = $self->{h};
2339
2340 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243 2341
2244 glEnable GL_BLEND; 2342 glEnable GL_BLEND;
2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2343 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2344 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glEnable GL_TEXTURE_2D; 2345 glEnable GL_TEXTURE_2D;
… …
2266 2364
2267 if ($t3) { 2365 if ($t3) {
2268 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2366 glBindTexture GL_TEXTURE_2D, $t3->{name};
2269 glBegin GL_QUADS; 2367 glBegin GL_QUADS;
2270 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2368 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2369 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2370 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2371 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274 glEnd; 2372 glEnd;
2275 } 2373 }
2276 2374
2277 glDisable GL_BLEND; 2375 glDisable GL_BLEND;
… …
2433 } 2531 }
2434 2532
2435 1 2533 1
2436} 2534}
2437 2535
2536sub invoke_mouse_wheel {
2537 my ($self, $ev) = @_;
2538
2539 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2540
2541 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2542
2543 ! ! $delta
2544}
2545
2438sub update { 2546sub update {
2439 my ($self) = @_; 2547 my ($self) = @_;
2440 2548
2441 delete $self->{knob_w}; 2549 delete $self->{knob_w};
2442 $self->SUPER::update; 2550 $self->SUPER::update;
… …
2541sub new { 2649sub new {
2542 my $class = shift; 2650 my $class = shift;
2543 2651
2544 my $self = $class->SUPER::new ( 2652 my $self = $class->SUPER::new (
2545 fontsize => 1, 2653 fontsize => 1,
2546 can_events => 0, 2654 can_events => 1,
2547 indent => 0, 2655 indent => 0,
2548 #font => default_font 2656 #font => default_font
2549 @_, 2657 @_,
2550 2658
2551 layout => (new CFClient::Layout 1), 2659 layout => (new CFClient::Layout),
2552 par => [], 2660 par => [],
2553 height => 0, 2661 height => 0,
2554 children => [ 2662 children => [
2555 (new CFClient::UI::Empty expand => 1), 2663 (new CFClient::UI::Empty expand => 1),
2556 (new CFClient::UI::Slider vertical => 1), 2664 (new CFClient::UI::Slider vertical => 1),
… …
2567 2675
2568 $self->{fontsize} = $fontsize; 2676 $self->{fontsize} = $fontsize;
2569 $self->reflow; 2677 $self->reflow;
2570} 2678}
2571 2679
2572sub visible_children { 2680sub size_request {
2573 my ($self) = @_; 2681 my ($self) = @_;
2574 2682
2575 @{$self->{children}}[0,1] 2683 my ($empty, $slider) = @{ $self->{children} };
2684
2685 local $self->{children} = [$empty, $slider];
2686 $self->SUPER::size_request
2576} 2687}
2577 2688
2578sub invoke_size_allocate { 2689sub invoke_size_allocate {
2579 my ($self, $w, $h) = @_; 2690 my ($self, $w, $h) = @_;
2580 2691
2581 my (undef, undef, @other) = @{ $self->{children} }; 2692 my ($empty, $slider, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other; 2693 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583 2694
2584 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2695 $self->{layout}->set_font ($self->{font}) if $self->{font};
2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2696 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586 $self->{layout}->set_width ($self->{children}[0]{w}); 2697 $self->{layout}->set_width ($empty->{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2698 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588 2699
2589 $self->reflow; 2700 $self->reflow;
2590 2701
2702 local $self->{children} = [$empty, $slider];
2591 $self->SUPER::invoke_size_allocate ($w, $h) 2703 $self->SUPER::invoke_size_allocate ($w, $h)
2704}
2705
2706sub invoke_mouse_wheel {
2707 my ($self, $ev) = @_;
2708
2709 return 0 unless $ev->{dy}; # only vertical movements
2710
2711 $self->{children}[1]->emit (mouse_wheel => $ev);
2712
2713 1
2592} 2714}
2593 2715
2594sub get_layout { 2716sub get_layout {
2595 my ($self, $para) = @_; 2717 my ($self, $para) = @_;
2596 2718
2597 my $layout = $self->{layout}; 2719 my $layout = $self->{layout};
2598 2720
2599 $layout->set_font ($self->{font}) if $self->{font}; 2721 $layout->set_font ($self->{font}) if $self->{font};
2722 $layout->set_foreground (@{$para->{fg}});
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2723 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent}); 2724 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2725 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup}); 2726 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}}); 2727
2728 $layout->set_shapes (
2729 map
2730 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2731 @{$para->{widget}}
2732 );
2605 2733
2606 $layout 2734 $layout
2607} 2735}
2608 2736
2609sub reflow { 2737sub reflow {
… …
2677 for my $para (@{$self->{par}}) { 2805 for my $para (@{$self->{par}}) {
2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 2806 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679 my $layout = $self->get_layout ($para); 2807 my $layout = $self->get_layout ($para);
2680 my ($w, $h) = $layout->size; 2808 my ($w, $h) = $layout->size;
2681 2809
2682 $para->{w} = $w + $para->{indent}; 2810 $para->{w} = $w + $para->{indent};
2683 $para->{h} = $h; 2811 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped; 2812 $para->{wrapped} = $layout->has_wrapped;
2685 } 2813 }
2686 2814
2687 $height += $para->{h}; 2815 $height += $para->{h};
2688 } 2816 }
… …
2707 my $y0 = $top; 2835 my $y0 = $top;
2708 my $y1 = $top + $H; 2836 my $y1 = $top + $H;
2709 2837
2710 my $y = 0; 2838 my $y = 0;
2711 2839
2712 glEnable GL_BLEND;
2713 #TODO# not correct in windows where rgba is forced off
2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2715
2716 for my $para (@{$self->{par}}) { 2840 for my $para (@{$self->{par}}) {
2717 my $h = $para->{h}; 2841 my $h = $para->{h};
2718 2842
2719 if ($y0 < $y + $h && $y < $y1) { 2843 if ($y0 < $y + $h && $y < $y1) {
2720 2844
2721 my $layout = $self->get_layout ($para); 2845 my $layout = $self->get_layout ($para);
2722 2846
2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0; 2847 $layout->render ($para->{indent}, $y - $y0);
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727 2848
2728 if (my @w = @{ $para->{widget} }) { 2849 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes; 2850 my @s = $layout->get_shapes;
2730 2851
2731 for (@w) { 2852 for (@w) {
… …
2739 } 2860 }
2740 } 2861 }
2741 2862
2742 $y += $h; 2863 $y += $h;
2743 } 2864 }
2744
2745 glDisable GL_BLEND;
2746 }; 2865 };
2747 }); 2866 });
2748} 2867}
2749 2868
2750sub reconfigure { 2869sub reconfigure {
… …
2897 3016
2898 $self->{root}->on_post_alloc ("move_$self" => sub { 3017 $self->{root}->on_post_alloc ("move_$self" => sub {
2899 my $widget = $self->{owner} 3018 my $widget = $self->{owner}
2900 or return; 3019 or return;
2901 3020
3021 if ($widget->{visible}) {
2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3022 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903 3023
2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3024 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905 if $x + $self->{w} > $self->{root}{w}; 3025 if $x + $self->{w} > $self->{root}{w};
2906 3026
2907 $self->move_abs ($x, $y); 3027 $self->move_abs ($x, $y);
3028 } else {
3029 $self->hide;
3030 }
2908 }); 3031 });
2909} 3032}
2910 3033
2911sub _draw { 3034sub _draw {
2912 my ($self) = @_; 3035 my ($self) = @_;
… …
3046 for my $item (@{ $self->{items} }) { 3169 for my $item (@{ $self->{items} }) {
3047 my ($widget, $cb, $tooltip) = @$item; 3170 my ($widget, $cb, $tooltip) = @$item;
3048 3171
3049 # handle various types of items, only text for now 3172 # handle various types of items, only text for now
3050 if (!ref $widget) { 3173 if (!ref $widget) {
3174 if ($widget =~ /\t/) {
3175 my ($left, $right) = split /\t/, $widget, 2;
3176
3177 $widget = new CFClient::UI::HBox
3178 can_hover => 1,
3179 can_events => 1,
3180 tooltip => $tooltip,
3181 children => [
3182 (new CFClient::UI::Label markup => $left, expand => 1),
3183 (new CFClient::UI::Label markup => $right, align => +1),
3184 ],
3185 ;
3186
3187 } else {
3051 $widget = new CFClient::UI::Label 3188 $widget = new CFClient::UI::Label
3052 can_hover => 1, 3189 can_hover => 1,
3053 can_events => 1, 3190 can_events => 1,
3054 markup => $widget, 3191 markup => $widget,
3055 tooltip => $tooltip 3192 tooltip => $tooltip;
3193 }
3056 } 3194 }
3057 3195
3058 $self->{item}{$widget} = $item; 3196 $self->{item}{$widget} = $item;
3059 3197
3060 $self->{vbox}->add ($widget); 3198 $self->{vbox}->add ($widget);
… …
3127 3265
3128 $self->SUPER::add (@widgets); 3266 $self->SUPER::add (@widgets);
3129 3267
3130 $self->{current} = $self->{children}[0] 3268 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} }; 3269 if @{ $self->{children} };
3270}
3271
3272sub get_current_page {
3273 my ($self) = @_;
3274
3275 $self->{current}
3132} 3276}
3133 3277
3134sub set_current_page { 3278sub set_current_page {
3135 my ($self, $page_or_widget) = @_; 3279 my ($self, $page_or_widget) = @_;
3136 3280
… …
3202 tooltip => $tooltip, 3346 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) }, 3347 on_activate => sub { $self->set_current_page ($widget) },
3204 ); 3348 );
3205 3349
3206 $self->{multiplexer}->add ($widget); 3350 $self->{multiplexer}->add ($widget);
3351}
3352
3353sub get_current_page {
3354 my ($self) = @_;
3355
3356 $self->{multiplexer}->get_current_page
3207} 3357}
3208 3358
3209sub set_current_page { 3359sub set_current_page {
3210 my ($self, $page) = @_; 3360 my ($self, $page) = @_;
3211 3361
… …
3389 count => 1, 3539 count => 1,
3390 %arg, 3540 %arg,
3391 }; 3541 };
3392 } 3542 }
3393 3543
3544 $ROOT->on_refresh (reorder => sub {
3394 $self->reorder; 3545 $self->reorder;
3546 });
3395} 3547}
3396 3548
3397sub reconfigure { 3549sub reconfigure {
3398 my ($self) = @_; 3550 my ($self) = @_;
3399 3551
… …
3414 3566
3415############################################################################# 3567#############################################################################
3416 3568
3417package CFClient::UI::Inventory; 3569package CFClient::UI::Inventory;
3418 3570
3419our @ISA = CFClient::UI::ScrolledWindow::; 3571our @ISA = CFClient::UI::Table::;
3420 3572
3421sub new { 3573sub new {
3422 my $class = shift; 3574 my $class = shift;
3423 3575
3424 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3577 col_expand => [0, 1, 0],
3578 items => [],
3426 @_, 3579 @_,
3427 ); 3580 );
3428 3581
3582 $self->set_sort_order (undef);
3583
3429 $self 3584 $self
3585}
3586
3587sub update_items {
3588 my ($self) = @_;
3589
3590 $self->clear;
3591
3592 my @item = $self->{sort}->(@{ $self->{items} });
3593
3594 my @adds;
3595 my $row = 0;
3596 for my $item ($self->{sort}->(@{ $self->{items} })) {
3597 CFClient::Item::update_widgets $item;
3598
3599 push @adds, 0, $row, $item->{face_widget};
3600 push @adds, 1, $row, $item->{desc_widget};
3601 push @adds, 2, $row, $item->{weight_widget};
3602
3603 $row++;
3604 }
3605
3606 $self->add (@adds);
3607}
3608
3609sub set_sort_order {
3610 my ($self, $order) = @_;
3611
3612 $self->{sort} = $order ||= sub {
3613 sort {
3614 $a->{type} <=> $b->{type}
3615 or $a->{name} cmp $b->{name}
3616 } @_
3617 };
3618
3619 $self->update_items;
3430} 3620}
3431 3621
3432sub set_items { 3622sub set_items {
3433 my ($self, $items) = @_; 3623 my ($self, $items) = @_;
3434 3624
3435 $self->{child}->clear; 3625 $self->{items} = [$items ? values %$items : ()];
3436 return unless $items;
3437
3438 my @items = sort {
3439 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name})
3441 } @$items;
3442
3443 $self->{real_items} = \@items;
3444
3445 my $row = 0;
3446 for my $item (@items) {
3447 CFClient::Item::update_widgets $item;
3448
3449 $self->{child}->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget});
3452
3453 $row++;
3454 }
3455}
3456
3457#############################################################################
3458
3459package CFClient::UI::BindEditor;
3460
3461our @ISA = CFClient::UI::FancyFrame::;
3462
3463sub new {
3464 my $class = shift;
3465
3466 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468 $self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472 text => "start recording",
3473 tooltip => "Start/Stops recording of actions."
3474 ."All subsequent actions after the recording started will be captured."
3475 ."The actions are displayed after the record was stopped."
3476 ."To bind the action you have to click on the 'Bind' button",
3477 on_activate => sub {
3478 unless ($self->{recording}) {
3479 $self->start;
3480 } else {
3481 $self->stop;
3482 }
3483 });
3484
3485 $vb->add (new CFClient::UI::Label text => "Actions:");
3486 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3489 $vb->add (my $hb = new CFClient::UI::HBox);
3490 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491 $hb->add (new CFClient::UI::Button
3492 text => "bind",
3493 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494 on_activate => sub {
3495 $self->ask_for_bind;
3496 });
3497
3498 $vb->add (my $hb = new CFClient::UI::HBox);
3499 $hb->add (new CFClient::UI::Button
3500 text => "ok",
3501 expand => 1,
3502 tooltip => "This closes the binding editor and saves the binding",
3503 on_activate => sub {
3504 $self->hide;
3505 $self->commit;
3506 });
3507
3508 $hb->add (new CFClient::UI::Button
3509 text => "cancel",
3510 expand => 1,
3511 tooltip => "This closes the binding editor without saving",
3512 on_activate => sub {
3513 $self->hide;
3514 $self->{binding_cancel}->()
3515 if $self->{binding_cancel};
3516 });
3517
3518 $self->update_binding_widgets; 3626 $self->update_items;
3519
3520 $self
3521}
3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3535sub commit {
3536 my ($self) = @_;
3537 my ($mod, $sym, $cmds) = $self->get_binding;
3538 if ($sym != 0 && @$cmds > 0) {
3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540 ."'. Don't forget 'Save Config'!");
3541 $self->{binding_change}->($mod, $sym, $cmds)
3542 if $self->{binding_change};
3543 } else {
3544 $::STATUSBOX->add ("No action bound, no key or action specified!");
3545 $self->{binding_cancel}->()
3546 if $self->{binding_cancel};
3547 }
3548}
3549
3550sub start {
3551 my ($self) = @_;
3552
3553 $self->{rec_btn}->set_text ("stop recording");
3554 $self->{recording} = 1;
3555 $self->clear_command_list;
3556 $::CONN->start_record if $::CONN;
3557}
3558
3559sub stop {
3560 my ($self) = @_;
3561
3562 $self->{rec_btn}->set_text ("start recording");
3563 $self->{recording} = 0;
3564
3565 my $rec;
3566 $rec = $::CONN->stop_record if $::CONN;
3567 return unless ref $rec eq 'ARRAY';
3568 $self->set_command_list ($rec);
3569}
3570
3571
3572sub ask_for_bind_and_commit {
3573 my ($self) = @_;
3574 $self->ask_for_bind (1);
3575}
3576
3577sub ask_for_bind {
3578 my ($self, $commit, $end_cb) = @_;
3579
3580 CFClient::Binder::open_binding_dialog (sub {
3581 my ($mod, $sym) = @_;
3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583 $self->update_binding_widgets;
3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3586 });
3587}
3588
3589# $mod and $sym are the modifiers and key symbol
3590# $cmds is a array ref of strings (the commands)
3591# $cb is the callback that is executed on OK
3592# $ccb is the callback that is executed on CANCEL and
3593# when the binding was unsuccessful on OK
3594sub set_binding {
3595 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597 $self->clear_command_list;
3598 $self->{recording} = 0;
3599 $self->{rec_btn}->set_text ("start recording");
3600
3601 $self->{binding} = [$mod, $sym];
3602 $self->{commands} = $cmds;
3603
3604 $self->{binding_change} = $cb;
3605 $self->{binding_cancel} = $ccb;
3606
3607 $self->update_binding_widgets;
3608}
3609
3610# this is a shortcut method that asks for a binding
3611# and then just binds it.
3612sub do_quick_binding {
3613 my ($self, $cmds, $end_cb) = @_;
3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615 $self->ask_for_bind (1, $end_cb);
3616}
3617
3618sub update_binding_widgets {
3619 my ($self) = @_;
3620 my ($mod, $sym, $cmds) = $self->get_binding;
3621 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622 $self->set_command_list ($cmds);
3623}
3624
3625sub get_binding {
3626 my ($self) = @_;
3627 return (
3628 $self->{binding}->[0],
3629 $self->{binding}->[1],
3630 [ grep { defined $_ } @{$self->{commands}} ]
3631 );
3632}
3633
3634sub clear_command_list {
3635 my ($self) = @_;
3636 $self->{cmdbox}->clear ();
3637}
3638
3639sub set_command_list {
3640 my ($self, $cmds) = @_;
3641
3642 $self->{cmdbox}->clear ();
3643 $self->{commands} = $cmds;
3644
3645 my $idx = 0;
3646
3647 for (@$cmds) {
3648 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650 my $i = $idx;
3651 $hb->add (new CFClient::UI::Label text => $_);
3652 $hb->add (new CFClient::UI::Button
3653 text => "delete",
3654 tooltip => "Deletes the action from the record",
3655 on_activate => sub {
3656 $self->{cmdbox}->remove ($hb);
3657 $cmds->[$i] = undef;
3658 });
3659
3660
3661 $idx++
3662 }
3663} 3627}
3664 3628
3665############################################################################# 3629#############################################################################
3666 3630
3667package CFClient::UI::SpellList; 3631package CFClient::UI::SpellList;
… …
3720 } elsif ($ev->{button} == 2) { 3684 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}"); 3685 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) { 3686 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu 3687 (new CFClient::UI::Menu
3724 items => [ 3688 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3689 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3690 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ], 3691 ],
3728 )->popup ($ev); 3692 )->popup ($ev);
3729 } else { 3693 } else {
3730 return 0; 3694 return 0;
… …
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 3941
3978 $w = 0 if $w < 0; 3942 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0; 3943 $h = 0 if $h < 0;
3980 3944
3945 $w = max $widget->{min_w}, $w;
3946 $h = max $widget->{min_h}, $h;
3947
3948 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3949 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3950
3981 $w = int $w + 0.5; 3951 $w = int $w + 0.5;
3982 $h = int $h + 0.5; 3952 $h = int $h + 0.5;
3983 3953
3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3954 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w}; 3955 $widget->{old_w} = $widget->{w};

Diff Legend

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