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.284 by root, Mon Jun 5 03:06:04 2006 UTC vs.
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC

… …
18our $BUTTON_STATE; 18our $BUTTON_STATE;
19 19
20our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21 21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 return if $ENV{CFPLUS_DEBUG} & 8;
24
25 if (!$GRAB) { 23 if (!$GRAB) {
26 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
27 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
28 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
29 $TOOLTIP->hide; 27 $TOOLTIP->hide;
30 28
31 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32 32
33 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
34 34
35 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36 36
… …
272 272
273 return unless $self->{visible}; 273 return unless $self->{visible};
274 274
275 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
276 276
277 delete $self->{visible};
277 delete $self->{root}; 278 delete $self->{root};
278 delete $self->{visible};
279 279
280 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
282 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
285 285
286 $self->focus_out; 286 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
289} 288}
290 289
291sub set_visibility { 290sub set_visibility {
292 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
315} 314}
316 315
317sub move_abs { 316sub move_abs {
318 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
319 318
320 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
323 322
324 $self->update; 323 $self->update;
325} 324}
326 325
… …
367 366
368 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
369 } 368 }
370} 369}
371 370
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 371sub children {
377 # nop 372 # nop
378} 373}
379 374
380sub visible_children { 375sub visible_children {
… …
418 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
419 414
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 416}
422 417
423sub focus_in { 418sub invoke_focus_in {
424 my ($self) = @_; 419 my ($self) = @_;
425 420
426 return if $FOCUS == $self; 421 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
428 423
429 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
430 425
431 $self->_emit (focus_in => $focus);
432
433 $focus->update if $focus; 426 $focus->update if $focus;
434 $FOCUS->update; 427 $FOCUS->update;
435}
436 428
429 0
430}
431
437sub focus_out { 432sub invoke_focus_out {
438 my ($self) = @_; 433 my ($self) = @_;
439 434
440 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
441 436
442 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
443 438
444 $self->_emit (focus_out => $focus);
445
446 $focus->update if $focus; #? 439 $focus->update if $focus; #?
447 440
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 442 unless $FOCUS;
450}
451 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
452sub mouse_motion { 0 } 453sub invoke_mouse_motion { 1 }
453sub button_up { 0 } 454sub invoke_button_up { 1 }
454sub key_down { 0 } 455sub invoke_key_down { 1 }
455sub key_up { 0 } 456sub invoke_key_up { 1 }
456 457
457sub button_down { 458sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
459 460
460 $self->focus_in; 461 $self->grab_focus;
461 462
462 0 463 1
464}
465
466sub connect {
467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 479}
464 480
465sub find_widget { 481sub find_widget {
466 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
467 483
… …
477sub set_parent { 493sub set_parent {
478 my ($self, $parent) = @_; 494 my ($self, $parent) = @_;
479 495
480 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 497 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 498}
506 499
507sub realloc { 500sub realloc {
508 my ($self) = @_; 501 my ($self) = @_;
509 502
… …
593 586
594sub DESTROY { 587sub DESTROY {
595 my ($self) = @_; 588 my ($self) = @_;
596 589
597 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
598 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 594}
600 595
601############################################################################# 596#############################################################################
602 597
603package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
768} 763}
769 764
770sub add { 765sub add {
771 my ($self, $child) = @_; 766 my ($self, $child) = @_;
772 767
773 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
776} 770}
777 771
778sub remove { 772sub remove {
779 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
788 782
789sub size_request { 783sub size_request {
790 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
791} 785}
792 786
793sub size_allocate { 787sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
795 789
796 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
797} 793}
798 794
799############################################################################# 795#############################################################################
800 796
801# back-buffered drawing area 797# back-buffered drawing area
… …
817 813
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 815 $self->SUPER::update;
820} 816}
821 817
822sub size_allocate { 818sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
824 820
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
827} 824}
828 825
829sub _render { 826sub _render {
830 my ($self) = @_; 827 my ($self) = @_;
831 828
… …
892 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
893 890
894 ($w, $h) 891 ($w, $h)
895} 892}
896 893
897sub size_allocate { 894sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
899 896
900 my $child = $self->child; 897 my $child = $self->child;
901 898
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 901
905 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
906 $self->update; 903 $self->update;
904
905 1
907} 906}
908 907
909sub set_offset { 908sub set_offset {
910 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
911 910
… …
1001 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1003}
1005 1004
1006sub size_allocate { 1005sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010 1007
1011 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
1013} 1012}
1014 1013
1015#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll 1015# update viewport offset on scroll
1017 1016
… …
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1072
1074sub new { 1073sub new {
1075 my ($class, %arg) = @_; 1074 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1075
1079 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1079 border => 0.6,
… …
1084 min_w => 16, 1081 min_w => 16,
1085 min_h => 16, 1082 min_h => 16,
1086 %arg, 1083 %arg,
1087 ); 1084 );
1088 1085
1089 $self->{title} = new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1087 align => 0,
1091 valign => 1, 1088 valign => 1,
1092 text => $title, 1089 text => $self->{title},
1093 fontsize => $self->{border} 1090 fontsize => $self->{border},
1094 if defined $title; 1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 image => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1095 1101
1096 $self 1102 $self
1097} 1103}
1098 1104
1099sub add { 1105sub add {
1100 my ($self, @widgets) = @_; 1106 my ($self, @widgets) = @_;
1101 1107
1102 $self->SUPER::add (@widgets); 1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1111}
1105 1112
1106sub border { 1113sub border {
1107 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1108} 1115}
1109 1116
1110sub size_request { 1117sub size_request {
1111 my ($self) = @_; 1118 my ($self) = @_;
1112 1119
1113 $self->{title}->size_request 1120 $self->{title_widget}->size_request
1114 if $self->{title}; 1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1115 1125
1116 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1117 1127
1118 ( 1128 (
1119 $w + $self->border * 2, 1129 $w + $self->border * 2,
1120 $h + $self->border * 2, 1130 $h + $self->border * 2,
1121 ) 1131 )
1122} 1132}
1123 1133
1124sub size_allocate { 1134sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1126 1136
1127 if ($self->{title}) { 1137 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1138 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1139 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1141 }
1132 1142
1133 my $border = $self->border; 1143 my $border = $self->border;
1134 1144
1135 $h -= List::Util::max 0, $border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1137 1147
1138 $self->child->configure ($border, $border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1139}
1140 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1141sub button_down { 1156sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1143 1158
1144 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1160 my $border = $self->border;
1146 1161
… …
1177 1192
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1194
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1196 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1198 };
1184 } else { 1199 } else {
1185 return 0; 1200 return 0;
1186 } 1201 }
1187 1202
1188 1 1203 1
1189} 1204}
1190 1205
1191sub button_up { 1206sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1193 1208
1194 !!delete $self->{motion} 1209 ! ! delete $self->{motion}
1195} 1210}
1196 1211
1197sub mouse_motion { 1212sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1199 1214
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1216
1202 !!$self->{motion} 1217 ! ! $self->{motion}
1203} 1218}
1204 1219
1205sub _draw { 1220sub _draw {
1206 my ($self) = @_; 1221 my ($self) = @_;
1207 1222
… …
1233 1248
1234 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1235 1250
1236 $child->draw; 1251 $child->draw;
1237 1252
1238 if ($self->{title}) { 1253 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1254 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1241 } 1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1242} 1262}
1243 1263
1244############################################################################# 1264#############################################################################
1245 1265
1246package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1269 1289
1270 $child->set_parent ($self); 1290 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1272 1292
1273 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1274} 1300}
1275 1301
1276# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1303sub clear {
1278 my ($self) = @_; 1304 my ($self) = @_;
… …
1319 (sum @$ws), 1345 (sum @$ws),
1320 (sum @$hs), 1346 (sum @$hs),
1321 ) 1347 )
1322} 1348}
1323 1349
1324sub size_allocate { 1350sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1326 1352
1327 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1328 1354
1329 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1361 } 1387 }
1362 1388
1363 $y += $row_h; 1389 $y += $row_h;
1364 } 1390 }
1365 1391
1392 1
1366} 1393}
1367 1394
1368sub find_widget { 1395sub find_widget {
1369 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1370 1397
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1436 )
1410} 1437}
1411 1438
1412sub size_allocate { 1439sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1414 1441
1415 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1443 my $children = $self->{children};
1417 1444
… …
1554 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1556 1583
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1586
1559 delete $self->{req_h}; 1587 delete $self->{size_req};
1560
1561 $self->realloc; 1588 $self->realloc;
1562 $self->update; 1589 $self->update;
1563} 1590}
1564 1591
1565sub set_markup { 1592sub set_markup {
… …
1570 1597
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1599
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1602
1575 delete $self->{req_h}; 1603 delete $self->{size_req};
1576
1577 $self->realloc; 1604 $self->realloc;
1578 $self->update; 1605 $self->update;
1579} 1606}
1580 1607
1581sub size_request { 1608sub size_request {
1582 my ($self) = @_; 1609 my ($self) = @_;
1583 1610
1584 if (exists $self->{req_h}) { 1611 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
… …
1600 1625
1601 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1603 } 1628 }
1604 1629
1605 ($w, $h) 1630 [$w, $h]
1606 } 1631 };
1607}
1608 1632
1633 @{ $self->{size_req} }
1634}
1635
1609sub size_allocate { 1636sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1611 1638
1612 delete $self->{ox}; 1639 delete $self->{ox};
1613 1640
1614 delete $self->{texture} 1641 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1616} 1645}
1617 1646
1618sub set_fontsize { 1647sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1620 1649
1621 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1622 delete $self->{texture}; 1651 delete $self->{texture};
1623 1652
1624 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1625} 1662}
1626 1663
1627sub _draw { 1664sub _draw {
1628 my ($self) = @_; 1665 my ($self) = @_;
1629 1666
… …
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1651 }; 1688 };
1652 1689
1653 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1694
1695 if ($tex->{format} == GL_ALPHA) {
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 {
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1655
1656 glColor_premultiply @{$self->{fg}}
1657 if $tex->{format} == GL_ALPHA;
1658
1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1660 1703
1661 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1662} 1705}
1663 1706
1664############################################################################# 1707#############################################################################
… …
1680 can_hover => 1, 1723 can_hover => 1,
1681 can_focus => 1, 1724 can_focus => 1,
1682 valign => 0, 1725 valign => 0,
1683 can_events => 1, 1726 can_events => 1,
1684 #text => ... 1727 #text => ...
1728 #hidden => "*",
1685 @_ 1729 @_
1686 ) 1730 )
1687} 1731}
1688 1732
1689sub _set_text { 1733sub _set_text {
… …
1696 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1697 $self->{text} = $text; 1741 $self->{text} = $text;
1698 1742
1699 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1700 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h}; 1745 delete $self->{size_req};
1702 1746
1703 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1704 1748
1705 $self->realloc; 1749 $self->realloc;
1706 $self->update; 1750 $self->update;
1707} 1751}
1708 1752
… …
1723 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1724 1768
1725 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1726} 1770}
1727 1771
1728sub key_down { 1772sub invoke_key_down {
1729 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1730 1774
1731 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1732 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1733 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1745 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1746 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1747 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1748 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1749 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1750 $self->_emit ('escape'); 1794 $self->emit ('escape');
1751 } elsif ($uni) { 1795 } elsif ($uni) {
1752 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1753 } else { 1797 } else {
1754 return 0; 1798 return 0;
1755 } 1799 }
… …
1759 $self->realloc; 1803 $self->realloc;
1760 1804
1761 1 1805 1
1762} 1806}
1763 1807
1764sub focus_in { 1808sub invoke_focus_in {
1765 my ($self) = @_; 1809 my ($self) = @_;
1766 1810
1767 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1768 1812
1769 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1770} 1814}
1771 1815
1772sub button_down { 1816sub invoke_button_down {
1773 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1774 1818
1775 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1776 1820
1777 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1778 1822
1779 # byte-index to char-index 1823 # byte-index to char-index
1780 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1785 $self->update; 1829 $self->update;
1786 1830
1787 1 1831 1
1788} 1832}
1789 1833
1790sub mouse_motion { 1834sub invoke_mouse_motion {
1791 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1792# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1793 1837
1794 0 1838 1
1795} 1839}
1796 1840
1797sub _draw { 1841sub _draw {
1798 my ($self) = @_; 1842 my ($self) = @_;
1799 1843
… …
1840 1884
1841our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1842 1886
1843use CFClient::OpenGL; 1887use CFClient::OpenGL;
1844 1888
1845sub key_down { 1889sub invoke_key_down {
1846 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1847 1891
1848 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1849 1893
1850 if ($sym == 13) { 1894 if ($sym == 13) {
1851 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1852 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1853 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1854 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1855 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1856 $self->update; 1901 $self->update;
1857 1902
1858 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1859 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1860 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1876 } else { 1921 } else {
1877 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1878 } 1923 }
1879 1924
1880 } else { 1925 } else {
1881 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1882 } 1927 }
1883 1928
1884 1 1929 1
1885} 1930}
1886 1931
… …
1910 can_events => 1, 1955 can_events => 1,
1911 @_ 1956 @_
1912 ) 1957 )
1913} 1958}
1914 1959
1915sub activate { }
1916
1917sub button_up { 1960sub invoke_button_up {
1918 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1919 1962
1920 $self->emit ("activate") 1963 $self->emit ("activate")
1921 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1922 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
1936 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1937 1980
1938 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1939 1982
1940 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1984}
1985
1986#############################################################################
1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
1941} 2020}
1942 2021
1943############################################################################# 2022#############################################################################
1944 2023
1945package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1972 my ($self) = @_; 2051 my ($self) = @_;
1973 2052
1974 (6) x 2 2053 (6) x 2
1975} 2054}
1976 2055
1977sub button_down { 2056sub invoke_button_down {
1978 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1979 2058
1980 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1981 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1982 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1983 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
1984 } else { 2063 } else {
1985 return 0 2064 return 0
1986 } 2065 }
1987 2066
1988 1 2067 1
… …
2285 $self->update; 2364 $self->update;
2286 2365
2287 $self 2366 $self
2288} 2367}
2289 2368
2290sub changed { }
2291
2292sub set_range { 2369sub set_range {
2293 my ($self, $range) = @_; 2370 my ($self, $range) = @_;
2294 2371
2295 ($range, $self->{range}) = ($self->{range}, $range); 2372 ($range, $self->{range}) = ($self->{range}, $range);
2296 2373
2297 $self->update
2298 if "@$range" ne "@{$self->{range}}"; 2374 if ("@$range" ne "@{$self->{range}}") {
2375 $self->update;
2376 $self->set_value ($self->{range}[0]);
2377 }
2299} 2378}
2300 2379
2301sub set_value { 2380sub set_value {
2302 my ($self, $value) = @_; 2381 my ($self, $value) = @_;
2303 2382
… …
2314 if $unit; 2393 if $unit;
2315 2394
2316 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317 2396
2318 if ($value != $old_value) { 2397 if ($value != $old_value) {
2319 $self->_emit (changed => $value); 2398 $self->emit (changed => $value);
2320 $self->update; 2399 $self->update;
2321 } 2400 }
2322} 2401}
2323 2402
2324sub size_request { 2403sub size_request {
2325 my ($self) = @_; 2404 my ($self) = @_;
2326 2405
2327 ($self->{req_w}, $self->{req_h}) 2406 ($self->{req_w}, $self->{req_h})
2328} 2407}
2329 2408
2330sub button_down { 2409sub invoke_button_down {
2331 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2332 2411
2333 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2334 2413
2335 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336 2415
2337 $self->mouse_motion ($ev, $x, $y) 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2338} 2417}
2339 2418
2340sub mouse_motion { 2419sub invoke_mouse_motion {
2341 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2342 2421
2343 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345 2424
… …
2450sub set_range { shift->{slider}->set_range (@_) } 2529sub set_range { shift->{slider}->set_range (@_) }
2451sub set_value { shift->{slider}->set_value (@_) } 2530sub set_value { shift->{slider}->set_value (@_) }
2452 2531
2453############################################################################# 2532#############################################################################
2454 2533
2455package CFClient::UI::TextView; 2534package CFClient::UI::TextScroller;
2456 2535
2457our @ISA = CFClient::UI::HBox::; 2536our @ISA = CFClient::UI::HBox::;
2458 2537
2459use CFClient::OpenGL; 2538use CFClient::OpenGL;
2460 2539
… …
2462 my $class = shift; 2541 my $class = shift;
2463 2542
2464 my $self = $class->SUPER::new ( 2543 my $self = $class->SUPER::new (
2465 fontsize => 1, 2544 fontsize => 1,
2466 can_events => 0, 2545 can_events => 0,
2546 indent => 0,
2467 #font => default_font 2547 #font => default_font
2468 @_, 2548 @_,
2469 2549
2470 layout => (new CFClient::Layout 1), 2550 layout => (new CFClient::Layout 1),
2471 par => [], 2551 par => [],
… …
2486 2566
2487 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2488 $self->reflow; 2568 $self->reflow;
2489} 2569}
2490 2570
2491sub size_allocate { 2571sub invoke_size_allocate {
2492 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2493
2494 $self->SUPER::size_allocate ($w, $h);
2495 2573
2496 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $self->{layout}->set_width ($self->{children}[0]{w}); 2576 $self->{layout}->set_width ($self->{children}[0]{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 2578
2500 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2501} 2582}
2502 2583
2503sub text_size { 2584sub text_size {
2504 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2505 2586
2506 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2507 2588
2508 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $layout->set_width ($self->{children}[0]{w} - $indent); 2590 $layout->set_width ($self->{children}[0]{w} - $indent);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 $layout->set_markup ($text); 2592 $layout->set_markup ($text);
2511 2593
2512 $layout->size 2594 $layout->size
2513} 2595}
2514 2596
… …
2553 2635
2554 return unless $self->{h} > 0; 2636 return unless $self->{h} > 0;
2555 2637
2556 delete $self->{texture}; 2638 delete $self->{texture};
2557 2639
2558 $ROOT->on_post_alloc ($self, sub { 2640 $ROOT->on_post_alloc ($self => sub {
2559 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560 2642
2561 if (delete $self->{need_reflow}) { 2643 if (delete $self->{need_reflow}) {
2562 my $height = 0; 2644 my $height = 0;
2563 2645
… …
2566 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567 2649
2568 for (@{$self->{par}}) { 2650 for (@{$self->{par}}) {
2569 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2570 $layout->set_width ($W - $_->[3]); 2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2571 $layout->set_markup ($_->[4]); 2654 $layout->set_markup ($_->[4]);
2572 my ($w, $h) = $layout->size; 2655 my ($w, $h) = $layout->size;
2573 $_->[0] = $w + $_->[3]; 2656 $_->[0] = $w + $_->[3];
2574 $_->[1] = $h; 2657 $_->[1] = $h;
2575 } 2658 }
… …
2578 } 2661 }
2579 2662
2580 $self->{height} = $height; 2663 $self->{height} = $height;
2581 2664
2582 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2583 2666
2584 delete $self->{texture}; 2667 delete $self->{texture};
2585 } 2668 }
2586 2669
2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2588 glClearColor 0, 0, 0, 0; 2671 glClearColor 0, 0, 0, 0;
… …
2607 my $h = $par->[1]; 2690 my $h = $par->[1];
2608 2691
2609 if ($y0 < $y + $h && $y < $y1) { 2692 if ($y0 < $y + $h && $y < $y1) {
2610 $layout->set_foreground (@{ $par->[2] }); 2693 $layout->set_foreground (@{ $par->[2] });
2611 $layout->set_width ($W - $par->[3]); 2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2612 $layout->set_markup ($par->[4]); 2696 $layout->set_markup ($par->[4]);
2613 2697
2614 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2698 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2615 2699
2616 glRasterPos $par->[3], $y - $y0; 2700 glRasterPos $par->[3], $y - $y0;
… …
2730 $tooltip .= "\n\n" . (ref $widget) . "\n" 2814 $tooltip .= "\n\n" . (ref $widget) . "\n"
2731 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2815 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732 . "req $widget->{req_w} $widget->{req_h}\n" 2816 . "req $widget->{req_w} $widget->{req_h}\n"
2733 . "visible $widget->{visible}"; 2817 . "visible $widget->{visible}";
2734 } 2818 }
2819
2820 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//;
2735 2822
2736 $self->add (new CFClient::UI::Label 2823 $self->add (new CFClient::UI::Label
2737 markup => $tooltip, 2824 markup => $tooltip,
2738 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2739 fontsize => 0.8, 2826 fontsize => 0.8,
… …
2749 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2750 2837
2751 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2752} 2839}
2753 2840
2754sub size_allocate { 2841sub invoke_size_allocate {
2755 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2756 2843
2757 $self->SUPER::size_allocate ($w - 4, $h - 4); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2758} 2845}
2759 2846
2760sub visibility_change { 2847sub invoke_visibility_change {
2761 my ($self, $visible) = @_; 2848 my ($self, $visible) = @_;
2762 2849
2763 return unless $visible; 2850 return unless $visible;
2764 2851
2765 $self->{root}->on_post_alloc ("move_$self" => sub { 2852 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2767 or return; 2854 or return;
2768 2855
2769 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770 2857
2771 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772 if $x + $self->{w} > $::WIDTH; 2859 if $x + $self->{w} > $self->{root}{w};
2773 2860
2774 $self->move_abs ($x, $y); 2861 $self->move_abs ($x, $y);
2775 }); 2862 });
2776} 2863}
2777 2864
… …
2872 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2874 } 2961 }
2875} 2962}
2876 2963
2877sub DESTROY { 2964sub destroy {
2878 my ($self) = @_; 2965 my ($self) = @_;
2879 2966
2880 $self->{timer}->cancel 2967 $self->{timer}->cancel
2881 if $self->{timer}; 2968 if $self->{timer};
2882 2969
2883 $self->SUPER::DESTROY; 2970 $self->SUPER::destroy;
2884} 2971}
2885 2972
2886############################################################################# 2973#############################################################################
2887 2974
2888package CFClient::UI::Buttonbar; 2975package CFClient::UI::Buttonbar;
… …
2909 ); 2996 );
2910 2997
2911 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2998 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2912 2999
2913 for my $item (@{ $self->{items} }) { 3000 for my $item (@{ $self->{items} }) {
2914 my ($widget, $cb) = @$item; 3001 my ($widget, $cb, $tooltip) = @$item;
2915 3002
2916 # handle various types of items, only text for now 3003 # handle various types of items, only text for now
2917 if (!ref $widget) { 3004 if (!ref $widget) {
2918 $widget = new CFClient::UI::Label 3005 $widget = new CFClient::UI::Label
2919 can_hover => 1, 3006 can_hover => 1,
2920 can_events => 1, 3007 can_events => 1,
2921 text => $widget; 3008 markup => $widget,
3009 tooltip => $tooltip
2922 } 3010 }
2923 3011
2924 $self->{item}{$widget} = $item; 3012 $self->{item}{$widget} = $item;
2925 3013
2926 $self->{vbox}->add ($widget); 3014 $self->{vbox}->add ($widget);
… …
2931 3019
2932# popup given the event (must be a mouse button down event currently) 3020# popup given the event (must be a mouse button down event currently)
2933sub popup { 3021sub popup {
2934 my ($self, $ev) = @_; 3022 my ($self, $ev) = @_;
2935 3023
2936 $self->_emit ("popdown"); 3024 $self->emit ("popdown");
2937 3025
2938 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2939 $GRAB = $self; 3027 $GRAB = $self;
2940 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2941 3029
2942 $self->show; 3030 $self->show;
2943 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3031 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2944} 3032}
2945 3033
2946sub mouse_motion { 3034sub invoke_mouse_motion {
2947 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2948 3036
2949 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2950 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2952 3040
2953 0 3041 0
2954} 3042}
2955 3043
2956sub button_up { 3044sub invoke_button_up {
2957 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2958 3046
2959 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2960 undef $GRAB; 3048 undef $GRAB;
2961 $self->hide; 3049 $self->hide;
2962 3050
2963 $self->_emit ("popdown"); 3051 $self->emit ("popdown");
2964 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
2965 } else { 3053 } else {
2966 return 0 3054 return 0
2967 } 3055 }
2968 3056
… …
3005 : $self->{children}[$page_or_widget]; 3093 : $self->{children}[$page_or_widget];
3006 3094
3007 $self->{current} = $widget; 3095 $self->{current} = $widget;
3008 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009 3097
3010 $self->_emit (page_changed => $self->{current}); 3098 $self->emit (page_changed => $self->{current});
3011 3099
3012 $self->realloc; 3100 $self->realloc;
3013} 3101}
3014 3102
3015sub visible_children { 3103sub visible_children {
… …
3020 my ($self) = @_; 3108 my ($self) = @_;
3021 3109
3022 $self->{current}->size_request 3110 $self->{current}->size_request
3023} 3111}
3024 3112
3025sub size_allocate { 3113sub invoke_size_allocate {
3026 my ($self, $w, $h) = @_; 3114 my ($self, $w, $h) = @_;
3027 3115
3028 $self->{current}->configure (0, 0, $w, $h); 3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3029} 3119}
3030 3120
3031sub _draw { 3121sub _draw {
3032 my ($self) = @_; 3122 my ($self) = @_;
3033 3123
… …
3072 3162
3073sub set_current_page { 3163sub set_current_page {
3074 my ($self, $page) = @_; 3164 my ($self, $page) = @_;
3075 3165
3076 $self->{multiplexer}->set_current_page ($page); 3166 $self->{multiplexer}->set_current_page ($page);
3077 $self->_emit (page_changed => $self->{multiplexer}{current}); 3167 $self->emit (page_changed => $self->{multiplexer}{current});
3168}
3169
3170#############################################################################
3171
3172package CFClient::UI::Combobox;
3173
3174use utf8;
3175
3176our @ISA = CFClient::UI::Button::;
3177
3178sub new {
3179 my $class = shift;
3180
3181 my $self = $class->SUPER::new (
3182 options => [], # [value, title, longdesc], ...
3183 value => undef,
3184 @_,
3185 );
3186
3187 $self->_set_value ($self->{value});
3188
3189 $self
3190}
3191
3192sub invoke_button_down {
3193 my ($self, $ev) = @_;
3194
3195 my @menu_items;
3196
3197 for (@{ $self->{options} }) {
3198 my ($value, $title, $tooltip) = @$_;
3199
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 }
3202
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204}
3205
3206sub _set_value {
3207 my ($self, $value) = @_;
3208
3209 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3210 or return;
3211
3212 $self->{value} = $item->[0];
3213 $self->set_markup ("$item->[1] ⇓");
3214 $self->set_tooltip ($item->[2]);
3215}
3216
3217sub set_value {
3218 my ($self, $value) = @_;
3219
3220 return unless $self->{value} ne $value;
3221
3222 $self->_set_value ($value);
3223 $self->emit (changed => $value);
3078} 3224}
3079 3225
3080############################################################################# 3226#############################################################################
3081 3227
3082package CFClient::UI::Statusbox; 3228package CFClient::UI::Statusbox;
… …
3181 $item->{count}++; 3327 $item->{count}++;
3182 } else { 3328 } else {
3183 $item->{count} = 1; 3329 $item->{count} = 1;
3184 $item->{text} = $item->{tooltip} = $text; 3330 $item->{text} = $item->{tooltip} = $text;
3185 } 3331 }
3186 $item->{id} = ++$self->{id}; 3332 $item->{id} += 0.2;#d#
3187 $item->{timeout} = $timeout; 3333 $item->{timeout} = $timeout;
3188 delete $item->{label}; 3334 delete $item->{label};
3189 } else { 3335 } else {
3190 $self->{item}{$group} = { 3336 $self->{item}{$group} = {
3191 id => ++$self->{id}, 3337 id => ++$self->{id},
… …
3210 3356
3211 $self->reorder; 3357 $self->reorder;
3212 $self->SUPER::reconfigure; 3358 $self->SUPER::reconfigure;
3213} 3359}
3214 3360
3215sub DESTROY { 3361sub destroy {
3216 my ($self) = @_; 3362 my ($self) = @_;
3217 3363
3218 $self->{timer}->cancel; 3364 $self->{timer}->cancel;
3219 3365
3220 $self->SUPER::DESTROY; 3366 $self->SUPER::destroy;
3221} 3367}
3222 3368
3223############################################################################# 3369#############################################################################
3224 3370
3225package CFClient::UI::Inventory; 3371package CFClient::UI::Inventory;
… …
3369 my ($self) = @_; 3515 my ($self) = @_;
3370 $self->ask_for_bind (1); 3516 $self->ask_for_bind (1);
3371} 3517}
3372 3518
3373sub ask_for_bind { 3519sub ask_for_bind {
3374 my ($self, $commit) = @_; 3520 my ($self, $commit, $end_cb) = @_;
3375 3521
3376 CFClient::Binder::open_binding_dialog (sub { 3522 CFClient::Binder::open_binding_dialog (sub {
3377 my ($mod, $sym) = @_; 3523 my ($mod, $sym) = @_;
3378 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379 $self->update_binding_widgets; 3525 $self->update_binding_widgets;
3380 $self->commit if $commit; 3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3381 }); 3528 });
3382} 3529}
3383 3530
3384# $mod and $sym are the modifiers and key symbol 3531# $mod and $sym are the modifiers and key symbol
3385# $cmds is a array ref of strings (the commands) 3532# $cmds is a array ref of strings (the commands)
… …
3403} 3550}
3404 3551
3405# this is a shortcut method that asks for a binding 3552# this is a shortcut method that asks for a binding
3406# and then just binds it. 3553# and then just binds it.
3407sub do_quick_binding { 3554sub do_quick_binding {
3408 my ($self, $cmds) = @_; 3555 my ($self, $cmds, $end_cb) = @_;
3409 $self->set_binding (undef, undef, $cmds, sub { 3556 $self->set_binding (undef, undef, $cmds, sub {
3410 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411 }); 3558 });
3412 $self->ask_for_bind (1); 3559 $self->ask_for_bind (1, $end_cb);
3413} 3560}
3414 3561
3415sub update_binding_widgets { 3562sub update_binding_widgets {
3416 my ($self) = @_; 3563 my ($self) = @_;
3417 my ($mod, $sym, $cmds) = $self->get_binding; 3564 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3473 commands => [], 3620 commands => [],
3474 @_, 3621 @_,
3475 ) 3622 )
3476} 3623}
3477 3624
3478# XXX: Do sorting? Argl... 3625my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638sub rebuild_spell_list {
3639 my ($self) = @_;
3640
3641 $CFClient::UI::ROOT->on_refresh ($self => sub {
3642 $self->clear;
3643
3644 return unless $::CONN;
3645
3646 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652 my $row = 0;
3653
3654 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655 my $spell = $self->{spell}{$_};
3656
3657 $row++;
3658
3659 my $spell_cb = sub {
3660 my ($widget, $ev) = @_;
3661
3662 if ($ev->{button} == 1) {
3663 $::CONN->user_send ("cast $spell->{name}");
3664 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu
3668 items => [
3669 ["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}"]) }],
3671 ],
3672 )->popup ($ev);
3673 } else {
3674 return 0;
3675 }
3676
3677 1
3678 };
3679
3680 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682 #TODO: add path info to tooltip
3683 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685 $self->add (0, $row, new CFClient::UI::Face
3686 face => $spell->{face},
3687 can_hover => 1,
3688 can_events => 1,
3689 tooltip => $tooltip,
3690 on_button_down => $spell_cb,
3691 );
3692
3693 $self->add (1, $row, new CFClient::UI::Label
3694 expand => 1,
3695 text => $spell->{name},
3696 can_hover => 1,
3697 can_events => 1,
3698 tooltip => $tooltip,
3699 on_button_down => $spell_cb,
3700 );
3701
3702 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706 }
3707 });
3708}
3709
3479sub add_spell { 3710sub add_spell {
3480 my ($self, $spell) = @_; 3711 my ($self, $spell) = @_;
3712
3481 $self->{spells}->{$spell->{name}} = $spell; 3713 $self->{spell}->{$spell->{name}} = $spell;
3482 3714 $self->rebuild_spell_list;
3483 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484 face => $spell->{face},
3485 can_hover => 1,
3486 can_events => 1,
3487 tooltip => $spell->{message});
3488
3489 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490 text => $spell->{name},
3491 can_hover => 1,
3492 can_events => 1,
3493 tooltip => $spell->{message},
3494 expand => 1);
3495
3496 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499 expand => 1);
3500
3501 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502 text => "bind to key",
3503 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504}
3505
3506sub rebuild_spell_list {
3507 my ($self) = @_;
3508 $self->{tbl_idx} = 0;
3509 $self->add_spell ($_) for values %{$self->{spells}};
3510} 3715}
3511 3716
3512sub remove_spell { 3717sub remove_spell {
3513 my ($self, $spell) = @_; 3718 my ($self, $spell) = @_;
3719
3514 delete $self->{spells}->{$spell->{name}}; 3720 delete $self->{spell}->{$spell->{name}};
3721 $self->rebuild_spell_list;
3722}
3723
3724sub clear_spells {
3725 my ($self) = @_;
3726
3727 $self->{spell} = {};
3515 $self->rebuild_spell_list; 3728 $self->rebuild_spell_list;
3516} 3729}
3517 3730
3518############################################################################# 3731#############################################################################
3519 3732
… …
3556 $coord = $max - $size if $coord > $max - $size; 3769 $coord = $max - $size if $coord > $max - $size;
3557 3770
3558 int $coord + 0.5 3771 int $coord + 0.5
3559} 3772}
3560 3773
3561sub size_allocate { 3774sub invoke_size_allocate {
3562 my ($self, $w, $h) = @_; 3775 my ($self, $w, $h) = @_;
3563 3776
3564 for my $child ($self->children) { 3777 for my $child ($self->children) {
3565 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3778 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3566 3779
… …
3570 $X = _to_pixel $X, $W, $self->{w}; 3783 $X = _to_pixel $X, $W, $self->{w};
3571 $Y = _to_pixel $Y, $H, $self->{h}; 3784 $Y = _to_pixel $Y, $H, $self->{h};
3572 3785
3573 $child->configure ($X, $Y, $W, $H); 3786 $child->configure ($X, $Y, $W, $H);
3574 } 3787 }
3788
3789 1
3575} 3790}
3576 3791
3577sub coord2local { 3792sub coord2local {
3578 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
3579 3794

Diff Legend

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