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.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,
… …
1091 if exists $self->{title}; 1164 if exists $self->{title};
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 image => '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) = @_;
… …
1438 1524
1439sub invoke_size_allocate { 1525sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1441 1527
1442 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1444 1530
1445 my @req; 1531 my @req;
1446 1532
1447 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1449 } else { 1535 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1452 1538
1453 if ($req > $space) { 1539 if ($req > $space) {
1454 # ah well, not enough space 1540 # ah well, not enough space
1455 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1456 } else { 1542 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 1544
1459 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1460 1546
1461 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 1548 for 0 .. $#children;
1463 } 1549 }
1464 } 1550 }
1465 1551
1466 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1467 1553
1468 my $pos = 0; 1554 my $pos = 0;
1469 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1471 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472 1558
1473 $pos += $alloc; 1559 $pos += $alloc;
1474 } 1560 }
1475 1561
1476 1 1562 1
… …
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
… …
2092package CFClient::UI::Image; 2169package CFClient::UI::Image;
2093 2170
2094our @ISA = CFClient::UI::Base::; 2171our @ISA = CFClient::UI::Base::;
2095 2172
2096use CFClient::OpenGL; 2173use CFClient::OpenGL;
2097use Carp qw/confess/;
2098 2174
2099our %loaded_images; 2175our %texture_cache;
2100 2176
2101sub new { 2177sub new {
2102 my $class = shift; 2178 my $class = shift;
2103 2179
2104 my $self = $class->SUPER::new (can_events => 0, @_); 2180 my $self = $class->SUPER::new (
2181 can_events => 0,
2182 @_,
2183 );
2105 2184
2106 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2185 $self->{path} || $self->{tex}
2186 or Carp::croak "'path' or 'tex' attributes required";
2107 2187
2108 $loaded_images{$self->{image}} ||= 2188 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2109 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2189 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2110 2190
2111 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2191 Scalar::Util::weaken $texture_cache{$self->{path}};
2112 2192
2113 Scalar::Util::weaken $loaded_images{$self->{image}}; 2193 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2114
2115 $self->{aspect} = $tex->{w} / $tex->{h};
2116 2194
2117 $self 2195 $self
2118} 2196}
2119 2197
2198sub STORABLE_freeze {
2199 my ($self, $cloning) = @_;
2200
2201 warn "freeze<$self>\n";#d#
2202
2203 $self->{path}
2204 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2205
2206 $self->{path}
2207}
2208
2209sub STORABLE_attach {
2210 my ($self, $cloning, $path) = @_;
2211 warn "attach<@_>\n";#d#
2212
2213 $self->new (path => $path)
2214}
2215
2120sub size_request { 2216sub size_request {
2121 my ($self) = @_; 2217 my ($self) = @_;
2122 2218
2123 ($self->{tex}->{w}, $self->{tex}->{h}) 2219 ($self->{tex}{w}, $self->{tex}{h})
2124} 2220}
2125 2221
2126sub _draw { 2222sub _draw {
2127 my ($self) = @_; 2223 my ($self) = @_;
2128 2224
… …
2138 } 2234 }
2139 2235
2140 glEnable GL_TEXTURE_2D; 2236 glEnable GL_TEXTURE_2D;
2141 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2237 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2142 2238
2143 $tex->draw_quad_alpha (0, 0, $w, $h); 2239 $tex->draw_quad (0, 0, $w, $h);
2144 2240
2145 glDisable GL_TEXTURE_2D; 2241 glDisable GL_TEXTURE_2D;
2146} 2242}
2147 2243
2148############################################################################# 2244#############################################################################
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2333 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2334 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2335
2240 my $h1 = $self->{h} * (1 - $ycut1); 2336 my $h1 = $self->{h} * (1 - $ycut1);
2241 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);
2242 2341
2243 glEnable GL_BLEND; 2342 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2343 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2344 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2345 glEnable GL_TEXTURE_2D;
… …
2265 2364
2266 if ($t3) { 2365 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2366 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2367 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2368 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2369 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2370 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2371 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2372 glEnd;
2274 } 2373 }
2275 2374
2276 glDisable GL_BLEND; 2375 glDisable GL_BLEND;
… …
2432 } 2531 }
2433 2532
2434 1 2533 1
2435} 2534}
2436 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
2437sub update { 2546sub update {
2438 my ($self) = @_; 2547 my ($self) = @_;
2439 2548
2440 delete $self->{knob_w}; 2549 delete $self->{knob_w};
2441 $self->SUPER::update; 2550 $self->SUPER::update;
… …
2540sub new { 2649sub new {
2541 my $class = shift; 2650 my $class = shift;
2542 2651
2543 my $self = $class->SUPER::new ( 2652 my $self = $class->SUPER::new (
2544 fontsize => 1, 2653 fontsize => 1,
2545 can_events => 0, 2654 can_events => 1,
2546 indent => 0, 2655 indent => 0,
2547 #font => default_font 2656 #font => default_font
2548 @_, 2657 @_,
2549 2658
2550 layout => (new CFClient::Layout 1), 2659 layout => (new CFClient::Layout),
2551 par => [], 2660 par => [],
2552 height => 0, 2661 height => 0,
2553 children => [ 2662 children => [
2554 (new CFClient::UI::Empty expand => 1), 2663 (new CFClient::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 2664 (new CFClient::UI::Slider vertical => 1),
… …
2566 2675
2567 $self->{fontsize} = $fontsize; 2676 $self->{fontsize} = $fontsize;
2568 $self->reflow; 2677 $self->reflow;
2569} 2678}
2570 2679
2680sub size_request {
2681 my ($self) = @_;
2682
2683 my ($empty, $slider) = @{ $self->{children} };
2684
2685 local $self->{children} = [$empty, $slider];
2686 $self->SUPER::size_request
2687}
2688
2571sub invoke_size_allocate { 2689sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 2690 my ($self, $w, $h) = @_;
2573 2691
2692 my ($empty, $slider, @other) = @{ $self->{children} };
2693 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2694
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2695 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2696 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 2697 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2698 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 2699
2579 $self->reflow; 2700 $self->reflow;
2580 2701
2702 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 2703 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 2704}
2583 2705
2584sub text_size { 2706sub invoke_mouse_wheel {
2585 my ($self, $text, $indent) = @_; 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
2714}
2715
2716sub get_layout {
2717 my ($self, $para) = @_;
2586 2718
2587 my $layout = $self->{layout}; 2719 my $layout = $self->{layout};
2588 2720
2721 $layout->set_font ($self->{font}) if $self->{font};
2722 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2723 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 2724 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2725 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($text); 2726 $layout->set_markup ($para->{markup});
2727
2728 $layout->set_shapes (
2729 map
2730 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2731 @{$para->{widget}}
2593 2732 );
2733
2594 $layout->size 2734 $layout
2595} 2735}
2596 2736
2597sub reflow { 2737sub reflow {
2598 my ($self) = @_; 2738 my ($self) = @_;
2599 2739
… …
2608 $self->{children}[1]->set_value ($offset); 2748 $self->{children}[1]->set_value ($offset);
2609} 2749}
2610 2750
2611sub clear { 2751sub clear {
2612 my ($self) = @_; 2752 my ($self) = @_;
2753
2754 my (undef, undef, @other) = @{ $self->{children} };
2755 $self->remove ($_) for @other;
2613 2756
2614 $self->{par} = []; 2757 $self->{par} = [];
2615 $self->{height} = 0; 2758 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2759 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 2760}
2618 2761
2619sub add_paragraph { 2762sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 2763 my ($self, $color, $para, $indent) = @_;
2621 2764
2622 for my $line (split /\n/, $text) { 2765 my ($text, @w) = ref $para ? @$para : $para;
2623 my ($w, $h) = $self->text_size ($line); 2766
2624 $self->{height} += $h; 2767 $para = {
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2768 w => 1e10,
2769 wrapped => 1,
2770 fg => $color,
2771 indent => $indent,
2772 markup => $text,
2773 widget => \@w,
2626 } 2774 };
2627 2775
2628 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2776 $self->add (@w) if @w;
2777 push @{$self->{par}}, $para;
2778
2779 $self->{need_reflow}++;
2780 $self->update;
2781}
2782
2783sub scroll_to_bottom {
2784 my ($self) = @_;
2785
2786 $self->{scroll_to_bottom} = 1;
2787 $self->update;
2629} 2788}
2630 2789
2631sub update { 2790sub update {
2632 my ($self) = @_; 2791 my ($self) = @_;
2633 2792
… …
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2800 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 2801
2643 if (delete $self->{need_reflow}) { 2802 if (delete $self->{need_reflow}) {
2644 my $height = 0; 2803 my $height = 0;
2645 2804
2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650 for (@{$self->{par}}) { 2805 for my $para (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2806 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2652 $layout->set_width ($W - $_->[3]); 2807 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; 2808 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3]; 2809
2657 $_->[1] = $h; 2810 $para->{w} = $w + $para->{indent};
2811 $para->{h} = $h;
2812 $para->{wrapped} = $layout->has_wrapped;
2658 } 2813 }
2659 2814
2660 $height += $_->[1]; 2815 $height += $para->{h};
2661 } 2816 }
2662 2817
2663 $self->{height} = $height; 2818 $self->{height} = $height;
2664 2819
2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2820 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2666 2821
2667 delete $self->{texture}; 2822 delete $self->{texture};
2823 }
2824
2825 if (delete $self->{scroll_to_bottom}) {
2826 $self->{children}[1]->set_value (1e10);
2668 } 2827 }
2669 2828
2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2829 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 2830 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 2831 glClear GL_COLOR_BUFFER_BIT;
… …
2676 my $y0 = $top; 2835 my $y0 = $top;
2677 my $y1 = $top + $H; 2836 my $y1 = $top + $H;
2678 2837
2679 my $y = 0; 2838 my $y = 0;
2680 2839
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}}) { 2840 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 2841 my $h = $para->{h};
2691 2842
2692 if ($y0 < $y + $h && $y < $y1) { 2843 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 2844
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2845 my $layout = $self->get_layout ($para);
2699 2846
2700 glRasterPos $par->[3], $y - $y0; 2847 $layout->render ($para->{indent}, $y - $y0);
2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2848
2849 if (my @w = @{ $para->{widget} }) {
2850 my @s = $layout->get_shapes;
2851
2852 for (@w) {
2853 my ($dx, $dy) = splice @s, 0, 2, ();
2854
2855 $_->{x} = $dx + $para->{indent};
2856 $_->{y} = $dy + $y - $y0;
2857
2858 $_->draw;
2859 }
2860 }
2702 } 2861 }
2703 2862
2704 $y += $h; 2863 $y += $h;
2705 } 2864 }
2706
2707 glDisable GL_BLEND;
2708 }; 2865 };
2709 }); 2866 });
2867}
2868
2869sub reconfigure {
2870 my ($self) = @_;
2871
2872 $self->SUPER::reconfigure;
2873
2874 $_->{w} = 1e10 for @{ $self->{par} };
2875 $self->reflow;
2710} 2876}
2711 2877
2712sub _draw { 2878sub _draw {
2713 my ($self) = @_; 2879 my ($self) = @_;
2714 2880
… …
2717 glColor 0, 0, 0, 1; 2883 glColor 0, 0, 0, 1;
2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2884 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719 glDisable GL_TEXTURE_2D; 2885 glDisable GL_TEXTURE_2D;
2720 2886
2721 $self->{children}[1]->draw; 2887 $self->{children}[1]->draw;
2722
2723} 2888}
2724 2889
2725############################################################################# 2890#############################################################################
2726 2891
2727package CFClient::UI::Animator; 2892package CFClient::UI::Animator;
… …
2851 3016
2852 $self->{root}->on_post_alloc ("move_$self" => sub { 3017 $self->{root}->on_post_alloc ("move_$self" => sub {
2853 my $widget = $self->{owner} 3018 my $widget = $self->{owner}
2854 or return; 3019 or return;
2855 3020
3021 if ($widget->{visible}) {
2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3022 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857 3023
2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3024 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859 if $x + $self->{w} > $self->{root}{w}; 3025 if $x + $self->{w} > $self->{root}{w};
2860 3026
2861 $self->move_abs ($x, $y); 3027 $self->move_abs ($x, $y);
3028 } else {
3029 $self->hide;
3030 }
2862 }); 3031 });
2863} 3032}
2864 3033
2865sub _draw { 3034sub _draw {
2866 my ($self) = @_; 3035 my ($self) = @_;
… …
3000 for my $item (@{ $self->{items} }) { 3169 for my $item (@{ $self->{items} }) {
3001 my ($widget, $cb, $tooltip) = @$item; 3170 my ($widget, $cb, $tooltip) = @$item;
3002 3171
3003 # handle various types of items, only text for now 3172 # handle various types of items, only text for now
3004 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 {
3005 $widget = new CFClient::UI::Label 3188 $widget = new CFClient::UI::Label
3006 can_hover => 1, 3189 can_hover => 1,
3007 can_events => 1, 3190 can_events => 1,
3008 markup => $widget, 3191 markup => $widget,
3009 tooltip => $tooltip 3192 tooltip => $tooltip;
3193 }
3010 } 3194 }
3011 3195
3012 $self->{item}{$widget} = $item; 3196 $self->{item}{$widget} = $item;
3013 3197
3014 $self->{vbox}->add ($widget); 3198 $self->{vbox}->add ($widget);
… …
3081 3265
3082 $self->SUPER::add (@widgets); 3266 $self->SUPER::add (@widgets);
3083 3267
3084 $self->{current} = $self->{children}[0] 3268 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3269 if @{ $self->{children} };
3270}
3271
3272sub get_current_page {
3273 my ($self) = @_;
3274
3275 $self->{current}
3086} 3276}
3087 3277
3088sub set_current_page { 3278sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3279 my ($self, $page_or_widget) = @_;
3090 3280
… …
3156 tooltip => $tooltip, 3346 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 3347 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 3348 );
3159 3349
3160 $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
3161} 3357}
3162 3358
3163sub set_current_page { 3359sub set_current_page {
3164 my ($self, $page) = @_; 3360 my ($self, $page) = @_;
3165 3361
… …
3343 count => 1, 3539 count => 1,
3344 %arg, 3540 %arg,
3345 }; 3541 };
3346 } 3542 }
3347 3543
3544 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3545 $self->reorder;
3546 });
3349} 3547}
3350 3548
3351sub reconfigure { 3549sub reconfigure {
3352 my ($self) = @_; 3550 my ($self) = @_;
3353 3551
… …
3368 3566
3369############################################################################# 3567#############################################################################
3370 3568
3371package CFClient::UI::Inventory; 3569package CFClient::UI::Inventory;
3372 3570
3373our @ISA = CFClient::UI::ScrolledWindow::; 3571our @ISA = CFClient::UI::Table::;
3374 3572
3375sub new { 3573sub new {
3376 my $class = shift; 3574 my $class = shift;
3377 3575
3378 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3577 col_expand => [0, 1, 0],
3578 items => [],
3380 @_, 3579 @_,
3381 ); 3580 );
3382 3581
3582 $self->set_sort_order (undef);
3583
3383 $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;
3384} 3620}
3385 3621
3386sub set_items { 3622sub set_items {
3387 my ($self, $items) = @_; 3623 my ($self, $items) = @_;
3388 3624
3389 $self->{child}->clear; 3625 $self->{items} = [$items ? values %$items : ()];
3390 return unless $items;
3391
3392 my @items = sort {
3393 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name})
3395 } @$items;
3396
3397 $self->{real_items} = \@items;
3398
3399 my $row = 0;
3400 for my $item (@items) {
3401 CFClient::Item::update_widgets $item;
3402
3403 $self->{child}->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget});
3406
3407 $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; 3626 $self->update_items;
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 }
3607} 3627}
3608 3628
3609############################################################################# 3629#############################################################################
3610 3630
3611package CFClient::UI::SpellList; 3631package CFClient::UI::SpellList;
… …
3664 } elsif ($ev->{button} == 2) { 3684 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}"); 3685 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) { 3686 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu 3687 (new CFClient::UI::Menu
3668 items => [ 3688 items => [
3669 ["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}"]) }],
3670 ["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}"]) }],
3671 ], 3691 ],
3672 )->popup ($ev); 3692 )->popup ($ev);
3673 } else { 3693 } else {
3674 return 0; 3694 return 0;
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 3941
3922 $w = 0 if $w < 0; 3942 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 3943 $h = 0 if $h < 0;
3924 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
3925 $w = int $w + 0.5; 3951 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 3952 $h = int $h + 0.5;
3927 3953
3928 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}) {
3929 $widget->{old_w} = $widget->{w}; 3955 $widget->{old_w} = $widget->{w};

Diff Legend

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