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.304 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC

… …
82} 82}
83 83
84sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
85 my ($ev) = @_; 85 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
87
88 warn "button down $ev->{button}\n";#d#
87 89
88 if (!$BUTTON_STATE) { 90 if (!$BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 91 my $widget = $ROOT->find_widget ($x, $y);
90 92
91 $GRAB = $widget; 93 $GRAB = $widget;
… …
281 undef $HOVER if $HOVER == $self; 283 undef $HOVER if $HOVER == $self;
282 284
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 285 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 286 if $TOOLTIP->{owner} == $self;
285 287
286 $self->focus_out; 288 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 289 $self->emit (visibility_change => 0);
289} 290}
290 291
291sub set_visibility { 292sub set_visibility {
292 my ($self, $visible) = @_; 293 my ($self, $visible) = @_;
… …
334} 335}
335 336
336sub size_request { 337sub size_request {
337 require Carp; 338 require Carp;
338 Carp::confess "size_request is abstract"; 339 Carp::confess "size_request is abstract";
340}
341
342sub baseline_shift {
343 0
339} 344}
340 345
341sub configure { 346sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 347 my ($self, $x, $y, $w, $h) = @_;
343 348
… …
367 372
368 $self->{root}{size_alloc}{$self+0} = $self; 373 $self->{root}{size_alloc}{$self+0} = $self;
369 } 374 }
370} 375}
371 376
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 377sub children {
377 # nop 378 # nop
378} 379}
379 380
380sub visible_children { 381sub visible_children {
… …
418 my ($self, $x, $y) = @_; 419 my ($self, $x, $y) = @_;
419 420
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 422}
422 423
423sub focus_in { 424sub invoke_focus_in {
424 my ($self) = @_; 425 my ($self) = @_;
425 426
426 return if $FOCUS == $self; 427 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
428 429
429 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
430 431
431 $self->_emit (focus_in => $focus); 432 $self->update;
432 433
433 $focus->update if $focus; 434 0
434 $FOCUS->update;
435} 435}
436 436
437sub focus_out { 437sub invoke_focus_out {
438 my ($self) = @_; 438 my ($self) = @_;
439 439
440 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
441 441
442 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
443 443
444 $self->_emit (focus_out => $focus); 444 $self->update;
445 445
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 446 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 447 unless $FOCUS;
450}
451 448
449 0
450}
451
452sub grab_focus {
453 my ($self) = @_;
454
455 $FOCUS->emit ("focus_out") if $FOCUS;
456 $self->emit ("focus_in");
457}
458
452sub mouse_motion { 0 } 459sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 460sub invoke_button_up { 0 }
454sub key_down { 0 } 461sub invoke_key_down { 0 }
455sub key_up { 0 } 462sub invoke_key_up { 0 }
456 463
457sub button_down { 464sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
459 466
460 $self->focus_in; 467 $self->grab_focus;
468
469 warn "button down $ev->{button} $x $y\n";#d#
461 470
462 0 471 0
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub emit {
481 my ($self, $signal, @args) = @_;
482
483 #d##TODO# stop propagating at first true, do not use sum
484 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
485 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
486 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 487}
464 488
465sub find_widget { 489sub find_widget {
466 my ($self, $x, $y) = @_; 490 my ($self, $x, $y) = @_;
467 491
… …
477sub set_parent { 501sub set_parent {
478 my ($self, $parent) = @_; 502 my ($self, $parent) = @_;
479 503
480 Scalar::Util::weaken ($self->{parent} = $parent); 504 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 505 $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} 506}
506 507
507sub realloc { 508sub realloc {
508 my ($self) = @_; 509 my ($self) = @_;
509 510
… …
542 return unless $self->{h} && $self->{w}; 543 return unless $self->{h} && $self->{w};
543 544
544 # update screen rectangle 545 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 546 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 547 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 548
550 # skip widgets that are entirely outside the drawing area 549 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 552
… …
592} 591}
593 592
594sub DESTROY { 593sub DESTROY {
595 my ($self) = @_; 594 my ($self) = @_;
596 595
596 return if CFClient::in_destruct;
597
597 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
598 599
599 eval { $self->destroy }; 600 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
601} 602}
… …
789 790
790sub size_request { 791sub size_request {
791 $_[0]{children}[0]->size_request 792 $_[0]{children}[0]->size_request
792} 793}
793 794
794sub size_allocate { 795sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
796 797
797 $self->{children}[0]->configure (0, 0, $w, $h); 798 $self->{children}[0]->configure (0, 0, $w, $h);
799
800 1
798} 801}
799 802
800############################################################################# 803#############################################################################
801 804
802# back-buffered drawing area 805# back-buffered drawing area
… …
818 821
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 823 $self->SUPER::update;
821} 824}
822 825
823sub size_allocate { 826sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 827 my ($self, $w, $h) = @_;
825 828
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 829 $self->update;
830
831 $self->SUPER::invoke_size_allocate ($w, $h)
828} 832}
829 833
830sub _render { 834sub _render {
831 my ($self) = @_; 835 my ($self) = @_;
832 836
… …
893 $h = 10 if $self->{scroll_y}; 897 $h = 10 if $self->{scroll_y};
894 898
895 ($w, $h) 899 ($w, $h)
896} 900}
897 901
898sub size_allocate { 902sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 903 my ($self, $w, $h) = @_;
900 904
901 my $child = $self->child; 905 my $child = $self->child;
902 906
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 907 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 908 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 909
906 $self->child->configure (0, 0, $w, $h); 910 $self->child->configure (0, 0, $w, $h);
907 $self->update; 911 $self->update;
912
913 1
908} 914}
909 915
910sub set_offset { 916sub set_offset {
911 my ($self, $x, $y) = @_; 917 my ($self, $x, $y) = @_;
912 918
… …
986 $self->add ($child) if $child; 992 $self->add ($child) if $child;
987 993
988 $self 994 $self
989} 995}
990 996
997#TODO# update range on size_allocate depending on child
998
991sub add { 999sub add {
992 my ($self, $widget) = @_; 1000 my ($self, $widget) = @_;
993 1001
994 $self->{vp}->add ($self->{child} = $widget); 1002 $self->{vp}->add ($self->{child} = $widget);
995} 1003}
996 1004
1005sub invoke_button_down {
1006 my ($self, $ev) = @_;
1007
1008 warn "button down $ev->{button}\n";#d#
1009
1010 0
1011}
1012
1013sub update_slider {
1014 my ($self) = @_;
1015
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1017}
1018
997sub update { 1019sub update {
998 my ($self) = @_; 1020 my ($self) = @_;
999 1021
1000 $self->SUPER::update; 1022 $self->SUPER::update;
1001 1023
1002 # todo: overwrite size_allocate of child 1024 $self->update_slider;
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1025}
1006 1026
1007sub size_allocate { 1027sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1028 my ($self, $w, $h) = @_;
1009 1029
1030 $self->update_slider;
1031
1010 $self->SUPER::size_allocate ($w, $h); 1032 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1033}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1034
1019############################################################################# 1035#############################################################################
1020 1036
1021package CFClient::UI::Frame; 1037package CFClient::UI::Frame;
1022 1038
… …
1078 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1097 border => 0.6,
1082 can_events => 1, 1098 can_events => 1,
1083 min_w => 16, 1099 min_w => 64,
1084 min_h => 16, 1100 min_h => 32,
1085 %arg, 1101 %arg,
1086 ); 1102 );
1087 1103
1088 $self->{title_widget} = new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1105 align => 0,
1090 valign => 1, 1106 valign => 1,
1091 text => $self->{title}, 1107 text => $self->{title},
1092 fontsize => $self->{border}, 1108 fontsize => $self->{border},
1093 if exists $self->{title}; 1109 if exists $self->{title};
1094 1110
1095 unless ($self->{no_close_button}) { 1111 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1112 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1113 new CFClient::UI::ImageButton
1098 image => 'x1_close.png', 1114 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1115 on_activate => sub { $self->emit ("delete") };
1100 1116
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1117 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1118 }
1103 1119
1104 $self 1120 $self
1105} 1121}
1106 1122
1107sub add { 1123sub add {
1108 my ($self, @widgets) = @_; 1124 my ($self, @widgets) = @_;
1109 1125
1110 $self->SUPER::add (@widgets); 1126 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1127 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1128 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1129}
1114 1130
1115sub border { 1131sub border {
1116 int $_[0]{border} * $::FONTSIZE 1132 int $_[0]{border} * $::FONTSIZE
… …
1120 my ($self) = @_; 1136 my ($self) = @_;
1121 1137
1122 $self->{title_widget}->size_request 1138 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1139 if $self->{title_widget};
1124 1140
1125 $self->{close_btn}->size_request 1141 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1142 if $self->{close_button};
1127 1143
1128 my ($w, $h) = $self->SUPER::size_request; 1144 my ($w, $h) = $self->SUPER::size_request;
1129 1145
1130 ( 1146 (
1131 $w + $self->border * 2, 1147 $w + $self->border * 2,
1132 $h + $self->border * 2, 1148 $h + $self->border * 2,
1133 ) 1149 )
1134} 1150}
1135 1151
1136sub size_allocate { 1152sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1153 my ($self, $w, $h) = @_;
1138 1154
1139 if ($self->{title_widget}) { 1155 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1156 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1157 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1158 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1159 }
1144 1160
1145 my $border = $self->border; 1161 my $border = $self->border;
1146 1162
1147 $h -= List::Util::max 0, $border * 2; 1163 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1164 $w -= List::Util::max 0, $border * 2;
1149 1165
1150 $self->child->configure ($border, $border, $w, $h); 1166 $self->child->configure ($border, $border, $w, $h);
1151 1167
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1168 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1169 if $self->{close_button};
1154}
1155 1170
1171 1
1172}
1173
1174sub invoke_delete {
1175 my ($self) = @_;
1176
1177 $self->hide;
1178
1179 1
1180}
1181
1156sub button_down { 1182sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
1158 1184
1159 my ($w, $h) = @$self{qw(w h)}; 1185 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1186 my $border = $self->border;
1161 1187
… …
1192 1218
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1219 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1220
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1221 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1222 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1223 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1224 };
1199 } else { 1225 } else {
1200 return 0; 1226 return 0;
1201 } 1227 }
1202 1228
1203 1 1229 1
1204} 1230}
1205 1231
1206sub button_up { 1232sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1233 my ($self, $ev, $x, $y) = @_;
1208 1234
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1235 ! ! delete $self->{motion}
1213} 1236}
1214 1237
1215sub mouse_motion { 1238sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
1217 1240
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1241 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1242
1220 !!$self->{motion} 1243 ! ! $self->{motion}
1221} 1244}
1222 1245
1223sub _draw { 1246sub _draw {
1224 my ($self) = @_; 1247 my ($self) = @_;
1225 1248
… …
1258 $self->{title_widget}->_draw; 1281 $self->{title_widget}->_draw;
1259 1282
1260 glTranslate 0, - ($border - $self->{h}); 1283 glTranslate 0, - ($border - $self->{h});
1261 } 1284 }
1262 1285
1263 $self->{close_btn}->draw 1286 $self->{close_button}->draw
1264 if $self->{close_btn}; 1287 if $self->{close_button};
1265} 1288}
1266 1289
1267############################################################################# 1290#############################################################################
1268 1291
1269package CFClient::UI::Table; 1292package CFClient::UI::Table;
… …
1348 (sum @$ws), 1371 (sum @$ws),
1349 (sum @$hs), 1372 (sum @$hs),
1350 ) 1373 )
1351} 1374}
1352 1375
1353sub size_allocate { 1376sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1377 my ($self, $w, $h) = @_;
1355 1378
1356 my ($ws, $hs) = $self->get_wh; 1379 my ($ws, $hs) = $self->get_wh;
1357 1380
1358 my $req_w = (sum @$ws) || 1; 1381 my $req_w = (sum @$ws) || 1;
… …
1390 } 1413 }
1391 1414
1392 $y += $row_h; 1415 $y += $row_h;
1393 } 1416 }
1394 1417
1418 1
1395} 1419}
1396 1420
1397sub find_widget { 1421sub find_widget {
1398 my ($self, $x, $y) = @_; 1422 my ($self, $x, $y) = @_;
1399 1423
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1460 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1461 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1462 )
1439} 1463}
1440 1464
1441sub size_allocate { 1465sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1466 my ($self, $w, $h) = @_;
1443 1467
1444 my $space = $self->{vertical} ? $h : $w; 1468 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1469 my @children = $self->visible_children;
1446 1470
1447 my @req; 1471 my @req;
1448 1472
1449 if ($self->{homogeneous}) { 1473 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1474 @req = ($space / (@children || 1)) x @children;
1451 } else { 1475 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1476 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1477 my $req = List::Util::sum @req;
1454 1478
1455 if ($req > $space) { 1479 if ($req > $space) {
1456 # ah well, not enough space 1480 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1481 $_ *= $space / $req for @req;
1458 } else { 1482 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1483 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1484
1461 $space = ($space - $req) / $expand; # remaining space to give away 1485 $space = ($space - $req) / $expand; # remaining space to give away
1462 1486
1463 $req[$_] += $space * $children->[$_]{expand} 1487 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1488 for 0 .. $#children;
1465 } 1489 }
1466 } 1490 }
1467 1491
1468 CFClient::UI::harmonize \@req; 1492 CFClient::UI::harmonize \@req;
1469 1493
1470 my $pos = 0; 1494 my $pos = 0;
1471 for (0 .. $#$children) { 1495 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1496 my $alloc = $req[$_];
1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1497 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474 1498
1475 $pos += $alloc; 1499 $pos += $alloc;
1476 } 1500 }
1477 1501
1478 1 1502 1
… …
1581 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1582 1606
1583 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1585 1609
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1588 1611
1589 delete $self->{size_req}; 1612 delete $self->{size_req};
1590 $self->realloc; 1613 $self->realloc;
1591 $self->update; 1614 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1599 1622
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1624
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1604 1626
1605 delete $self->{size_req}; 1627 delete $self->{size_req};
1606 $self->realloc; 1628 $self->realloc;
1607 $self->update; 1629 $self->update;
… …
1619 1641
1620 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1621 1643
1622 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1645 $self->{template}->set_font ($self->{font}) if $self->{font};
1646 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1648
1626 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1627 1650
1628 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
… …
1633 }; 1656 };
1634 1657
1635 @{ $self->{size_req} } 1658 @{ $self->{size_req} }
1636} 1659}
1637 1660
1661sub baseline_shift {
1662 $_[0]{layout}->descent
1663}
1664
1638sub size_allocate { 1665sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
1640 1667
1641 delete $self->{ox}; 1668 delete $self->{ox};
1642 1669
1643 delete $self->{texture} 1670 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1671 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1672
1673 1
1645} 1674}
1646 1675
1647sub set_fontsize { 1676sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1649 1678
1650 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1651 delete $self->{texture}; 1681 delete $self->{texture};
1652 1682
1653 $self->realloc; 1683 $self->realloc;
1654} 1684}
1655 1685
1656sub reconfigure { 1686sub reconfigure {
1657 my ($self) = @_; 1687 my ($self) = @_;
1658 1688
1659 delete $self->{size_req}; 1689 delete $self->{size_req};
1690 delete $self->{texture};
1660 1691
1661 $self->SUPER::reconfigure; 1692 $self->SUPER::reconfigure;
1662} 1693}
1663 1694
1664sub _draw { 1695sub _draw {
1665 my ($self) = @_; 1696 my ($self) = @_;
1666 1697
1667 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1668 1699
1669 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1707
1677 new_from_layout CFClient::Texture $self->{layout} 1708 [$self->{layout}->size]
1678 }; 1709 };
1679 1710
1680 unless (exists $self->{ox}) { 1711 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1712 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1713 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1714 : ($self->{w} - $size->[0]) * 0.5);
1684 1715
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1718 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1719 };
1689 1720
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1721 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1722 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1723
1695 if ($tex->{format} == GL_ALPHA) { 1724 $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} 1725}
1706 1726
1707############################################################################# 1727#############################################################################
1708 1728
1709package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1742 1762
1743 $text =~ s/./*/g if $self->{hidden}; 1763 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1764 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1765 delete $self->{size_req};
1746 1766
1747 $self->_emit (changed => $self->{text}); 1767 $self->emit (changed => $self->{text});
1748 1768
1749 $self->realloc; 1769 $self->realloc;
1750 $self->update; 1770 $self->update;
1751} 1771}
1752 1772
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1787 my ($w, $h) = $self->SUPER::size_request;
1768 1788
1769 ($w + 1, $h) # add 1 for cursor 1789 ($w + 1, $h) # add 1 for cursor
1770} 1790}
1771 1791
1772sub key_down { 1792sub invoke_key_down {
1773 my ($self, $ev) = @_; 1793 my ($self, $ev) = @_;
1774 1794
1775 my $mod = $ev->{mod}; 1795 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1796 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1797 my $uni = $ev->{unicode};
… …
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1809 } elsif ($sym == CFClient::SDLK_HOME) {
1790 $self->{cursor} = 0; 1810 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1811 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text; 1812 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1813 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1814 $self->emit ('escape');
1795 } elsif ($uni) { 1815 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1816 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1817 } else {
1798 return 0; 1818 return 0;
1799 } 1819 }
… …
1803 $self->realloc; 1823 $self->realloc;
1804 1824
1805 1 1825 1
1806} 1826}
1807 1827
1808sub focus_in { 1828sub invoke_focus_in {
1809 my ($self) = @_; 1829 my ($self) = @_;
1810 1830
1811 $self->{last_activity} = $::NOW; 1831 $self->{last_activity} = $::NOW;
1812 1832
1813 $self->SUPER::focus_in; 1833 $self->SUPER::invoke_focus_in
1814} 1834}
1815 1835
1816sub button_down { 1836sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1818 1838
1819 $self->SUPER::button_down ($ev, $x, $y); 1839 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1840
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1842
1823 # byte-index to char-index 1843 # byte-index to char-index
1824 my $text = $self->{text}; 1844 my $text = $self->{text};
1825 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1827 1847
1828 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1829 $self->update; 1849 $self->update;
1830 1850
1831 1 1851 1
1832} 1852}
1833 1853
1834sub mouse_motion { 1854sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1855 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1856# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 1857
1838 0 1858 1
1839} 1859}
1840 1860
1841sub _draw { 1861sub _draw {
1842 my ($self) = @_; 1862 my ($self) = @_;
1843 1863
… …
1884 1904
1885our @ISA = CFClient::UI::EntryBase::; 1905our @ISA = CFClient::UI::EntryBase::;
1886 1906
1887use CFClient::OpenGL; 1907use CFClient::OpenGL;
1888 1908
1889sub key_down { 1909sub invoke_key_down {
1890 my ($self, $ev) = @_; 1910 my ($self, $ev) = @_;
1891 1911
1892 my $sym = $ev->{sym}; 1912 my $sym = $ev->{sym};
1893 1913
1894 if ($sym == 13) { 1914 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1915 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1916 my $txt = $self->get_text;
1917
1897 $self->{history_pointer} = -1; 1918 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1919 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1920 $self->emit (activate => $txt);
1900 $self->update; 1921 $self->update;
1901 1922
1902 } elsif ($sym == CFClient::SDLK_UP) { 1923 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1924 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1925 $self->{history_saveback} = $self->get_text;
… …
1920 } else { 1941 } else {
1921 $self->set_text ($self->{history_saveback}); 1942 $self->set_text ($self->{history_saveback});
1922 } 1943 }
1923 1944
1924 } else { 1945 } else {
1925 return $self->SUPER::key_down ($ev) 1946 return $self->SUPER::invoke_key_down ($ev)
1926 } 1947 }
1927 1948
1928 1 1949 1
1929} 1950}
1930 1951
… …
1954 can_events => 1, 1975 can_events => 1,
1955 @_ 1976 @_
1956 ) 1977 )
1957} 1978}
1958 1979
1959sub activate { }
1960
1961sub button_up { 1980sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1963 1982
1964 $self->emit ("activate") 1983 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 1984 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 1985 && $y >= 0 && $y < $self->{h};
… …
2008 can_events => 1, 2027 can_events => 1,
2009 @_ 2028 @_
2010 ); 2029 );
2011} 2030}
2012 2031
2013sub activate { }
2014
2015sub button_up { 2032sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2033 my ($self, $ev, $x, $y) = @_;
2017 2034
2018 $self->emit ("activate") 2035 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2036 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2037 && $y >= 0 && $y < $self->{h};
… …
2054 my ($self) = @_; 2071 my ($self) = @_;
2055 2072
2056 (6) x 2 2073 (6) x 2
2057} 2074}
2058 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
2059sub button_down { 2084sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
2061 2086
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2089 $self->toggle;
2065 $self->_emit (changed => $self->{state});
2066 } else { 2090 } else {
2067 return 0 2091 return 0
2068 } 2092 }
2069 2093
2070 1 2094 1
… …
2095package CFClient::UI::Image; 2119package CFClient::UI::Image;
2096 2120
2097our @ISA = CFClient::UI::Base::; 2121our @ISA = CFClient::UI::Base::;
2098 2122
2099use CFClient::OpenGL; 2123use CFClient::OpenGL;
2100use Carp qw/confess/;
2101 2124
2102our %loaded_images; 2125our %texture_cache;
2103 2126
2104sub new { 2127sub new {
2105 my $class = shift; 2128 my $class = shift;
2106 2129
2107 my $self = $class->SUPER::new (can_events => 0, @_); 2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
2108 2134
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2135 $self->{path} || $self->{tex}
2136 or Carp::croak "'path' or 'tex' attributes required";
2110 2137
2111 $loaded_images{$self->{image}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113 2140
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2142
2116 Scalar::Util::weaken $loaded_images{$self->{image}}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119 2144
2120 $self 2145 $self
2121} 2146}
2122 2147
2123sub size_request { 2148sub size_request {
2124 my ($self) = @_; 2149 my ($self) = @_;
2125 2150
2126 ($self->{tex}->{w}, $self->{tex}->{h}) 2151 ($self->{tex}{w}, $self->{tex}{h})
2127} 2152}
2128 2153
2129sub _draw { 2154sub _draw {
2130 my ($self) = @_; 2155 my ($self) = @_;
2131 2156
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2267
2243 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
2244 my $h2 = $self->{h} * (1 - $ycut2); 2269 my $h2 = $self->{h} * (1 - $ycut2);
2270 my $h3 = $self->{h};
2271
2272 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245 2273
2246 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2275 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2276 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
… …
2268 2296
2269 if ($t3) { 2297 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2304 glEnd;
2277 } 2305 }
2278 2306
2279 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2367 $self->update; 2395 $self->update;
2368 2396
2369 $self 2397 $self
2370} 2398}
2371 2399
2372sub changed { }
2373
2374sub set_range { 2400sub set_range {
2375 my ($self, $range) = @_; 2401 my ($self, $range) = @_;
2376 2402
2377 ($range, $self->{range}) = ($self->{range}, $range); 2403 ($range, $self->{range}) = ($self->{range}, $range);
2378 2404
… …
2398 if $unit; 2424 if $unit;
2399 2425
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2426 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2427
2402 if ($value != $old_value) { 2428 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2429 $self->emit (changed => $value);
2404 $self->update; 2430 $self->update;
2405 } 2431 }
2406} 2432}
2407 2433
2408sub size_request { 2434sub size_request {
2409 my ($self) = @_; 2435 my ($self) = @_;
2410 2436
2411 ($self->{req_w}, $self->{req_h}) 2437 ($self->{req_w}, $self->{req_h})
2412} 2438}
2413 2439
2414sub button_down { 2440sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2416 2442
2417 $self->SUPER::button_down ($ev, $x, $y); 2443 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2444
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2445 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2446
2421 $self->mouse_motion ($ev, $x, $y) 2447 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2448}
2423 2449
2424sub mouse_motion { 2450sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2451 my ($self, $ev, $x, $y) = @_;
2426 2452
2427 if ($GRAB == $self) { 2453 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2454 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2455
… …
2550 can_events => 0, 2576 can_events => 0,
2551 indent => 0, 2577 indent => 0,
2552 #font => default_font 2578 #font => default_font
2553 @_, 2579 @_,
2554 2580
2555 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2556 par => [], 2582 par => [],
2557 height => 0, 2583 height => 0,
2558 children => [ 2584 children => [
2559 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
… …
2571 2597
2572 $self->{fontsize} = $fontsize; 2598 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2599 $self->reflow;
2574} 2600}
2575 2601
2602sub size_request {
2603 my ($self) = @_;
2604
2605 my ($empty, $slider) = @{ $self->{children} };
2606
2607 local $self->{children} = [$empty, $slider];
2608 $self->SUPER::size_request
2609}
2610
2576sub size_allocate { 2611sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2612 my ($self, $w, $h) = @_;
2578 2613
2579 $self->SUPER::size_allocate ($w, $h); 2614 my ($empty, $slider, @other) = @{ $self->{children} };
2615 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2616
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2617 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2619 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2620 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2621
2586 $self->reflow; 2622 $self->reflow;
2587}
2588 2623
2589sub text_size { 2624 local $self->{children} = [$empty, $slider];
2590 my ($self, $text, $indent) = @_; 2625 $self->SUPER::invoke_size_allocate ($w, $h)
2626}
2627
2628sub get_layout {
2629 my ($self, $para) = @_;
2591 2630
2592 my $layout = $self->{layout}; 2631 my $layout = $self->{layout};
2593 2632
2633 $layout->set_font ($self->{font}) if $self->{font};
2634 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2635 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2636 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2637 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 2638 $layout->set_markup ($para->{markup});
2639
2640 $layout->set_shapes (
2641 map
2642 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2643 @{$para->{widget}}
2598 2644 );
2645
2599 $layout->size 2646 $layout
2600} 2647}
2601 2648
2602sub reflow { 2649sub reflow {
2603 my ($self) = @_; 2650 my ($self) = @_;
2604 2651
… …
2613 $self->{children}[1]->set_value ($offset); 2660 $self->{children}[1]->set_value ($offset);
2614} 2661}
2615 2662
2616sub clear { 2663sub clear {
2617 my ($self) = @_; 2664 my ($self) = @_;
2665
2666 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other;
2618 2668
2619 $self->{par} = []; 2669 $self->{par} = [];
2620 $self->{height} = 0; 2670 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2672}
2623 2673
2624sub add_paragraph { 2674sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2675 my ($self, $color, $para, $indent) = @_;
2626 2676
2627 for my $line (split /\n/, $text) { 2677 my ($text, @w) = ref $para ? @$para : $para;
2628 my ($w, $h) = $self->text_size ($line); 2678
2629 $self->{height} += $h; 2679 $para = {
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2680 w => 1e10,
2681 wrapped => 1,
2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2631 } 2686 };
2632 2687
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2688 $self->add (@w) if @w;
2689 push @{$self->{par}}, $para;
2690
2691 $self->{need_reflow}++;
2692 $self->update;
2693}
2694
2695sub scroll_to_bottom {
2696 my ($self) = @_;
2697
2698 $self->{scroll_to_bottom} = 1;
2699 $self->update;
2634} 2700}
2635 2701
2636sub update { 2702sub update {
2637 my ($self) = @_; 2703 my ($self) = @_;
2638 2704
… …
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 2713
2648 if (delete $self->{need_reflow}) { 2714 if (delete $self->{need_reflow}) {
2649 my $height = 0; 2715 my $height = 0;
2650 2716
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) { 2717 for my $para (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2718 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657 $layout->set_width ($W - $_->[3]); 2719 my $layout = $self->get_layout ($para);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size; 2720 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3]; 2721
2662 $_->[1] = $h; 2722 $para->{w} = $w + $para->{indent};
2723 $para->{h} = $h;
2724 $para->{wrapped} = $layout->has_wrapped;
2663 } 2725 }
2664 2726
2665 $height += $_->[1]; 2727 $height += $para->{h};
2666 } 2728 }
2667 2729
2668 $self->{height} = $height; 2730 $self->{height} = $height;
2669 2731
2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2732 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2671 2733
2672 delete $self->{texture}; 2734 delete $self->{texture};
2735 }
2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2673 } 2739 }
2674 2740
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2741 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 2742 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 2743 glClear GL_COLOR_BUFFER_BIT;
… …
2681 my $y0 = $top; 2747 my $y0 = $top;
2682 my $y1 = $top + $H; 2748 my $y1 = $top + $H;
2683 2749
2684 my $y = 0; 2750 my $y = 0;
2685 2751
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2694 for my $par (@{$self->{par}}) { 2752 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 2753 my $h = $para->{h};
2696 2754
2697 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] });
2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 2756
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2757 my $layout = $self->get_layout ($para);
2704 2758
2705 glRasterPos $par->[3], $y - $y0; 2759 $layout->render ($para->{indent}, $y - $y0);
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2760
2761 if (my @w = @{ $para->{widget} }) {
2762 my @s = $layout->get_shapes;
2763
2764 for (@w) {
2765 my ($dx, $dy) = splice @s, 0, 2, ();
2766
2767 $_->{x} = $dx + $para->{indent};
2768 $_->{y} = $dy + $y - $y0;
2769
2770 $_->draw;
2771 }
2772 }
2707 } 2773 }
2708 2774
2709 $y += $h; 2775 $y += $h;
2710 } 2776 }
2711
2712 glDisable GL_BLEND;
2713 }; 2777 };
2714 }); 2778 });
2779}
2780
2781sub reconfigure {
2782 my ($self) = @_;
2783
2784 $self->SUPER::reconfigure;
2785
2786 $_->{w} = 1e10 for @{ $self->{par} };
2787 $self->reflow;
2715} 2788}
2716 2789
2717sub _draw { 2790sub _draw {
2718 my ($self) = @_; 2791 my ($self) = @_;
2719 2792
… …
2722 glColor 0, 0, 0, 1; 2795 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2796 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2725 2798
2726 $self->{children}[1]->draw; 2799 $self->{children}[1]->draw;
2727
2728} 2800}
2729 2801
2730############################################################################# 2802#############################################################################
2731 2803
2732package CFClient::UI::Animator; 2804package CFClient::UI::Animator;
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2913 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 2914
2843 ($w + 4, $h + 4) 2915 ($w + 4, $h + 4)
2844} 2916}
2845 2917
2846sub size_allocate { 2918sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 2919 my ($self, $w, $h) = @_;
2848 2920
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 2921 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 2922}
2851 2923
2852sub visibility_change { 2924sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 2925 my ($self, $visible) = @_;
2854 2926
2855 return unless $visible; 2927 return unless $visible;
2856 2928
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 2929 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
3005 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
3007 3079
3008 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
3009 if (!ref $widget) { 3081 if (!ref $widget) {
3082 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2;
3084
3085 $widget = new CFClient::UI::HBox
3086 can_hover => 1,
3087 can_events => 1,
3088 tooltip => $tooltip,
3089 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1),
3092 ],
3093 ;
3094
3095 } else {
3010 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
3011 can_hover => 1, 3097 can_hover => 1,
3012 can_events => 1, 3098 can_events => 1,
3013 markup => $widget, 3099 markup => $widget,
3014 tooltip => $tooltip 3100 tooltip => $tooltip;
3101 }
3015 } 3102 }
3016 3103
3017 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
3018 3105
3019 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
3024 3111
3025# popup given the event (must be a mouse button down event currently) 3112# popup given the event (must be a mouse button down event currently)
3026sub popup { 3113sub popup {
3027 my ($self, $ev) = @_; 3114 my ($self, $ev) = @_;
3028 3115
3029 $self->_emit ("popdown"); 3116 $self->emit ("popdown");
3030 3117
3031 # maybe save $GRAB? must be careful about events... 3118 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3119 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3120 $self->{button} = $ev->{button};
3034 3121
3035 $self->show; 3122 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3123 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3124}
3038 3125
3039sub mouse_motion { 3126sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3127 my ($self, $ev, $x, $y) = @_;
3041 3128
3042 # TODO: should use vbox->find_widget or so 3129 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3130 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3131 $self->{hover} = $self->{item}{$HOVER};
3045 3132
3046 0 3133 0
3047} 3134}
3048 3135
3049sub button_up { 3136sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3137 my ($self, $ev, $x, $y) = @_;
3051 3138
3052 if ($ev->{button} == $self->{button}) { 3139 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3140 undef $GRAB;
3054 $self->hide; 3141 $self->hide;
3055 3142
3056 $self->_emit ("popdown"); 3143 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3144 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3145 } else {
3059 return 0 3146 return 0
3060 } 3147 }
3061 3148
… …
3088 3175
3089 $self->{current} = $self->{children}[0] 3176 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3177 if @{ $self->{children} };
3091} 3178}
3092 3179
3180sub get_current_page {
3181 my ($self) = @_;
3182
3183 $self->{current}
3184}
3185
3093sub set_current_page { 3186sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3187 my ($self, $page_or_widget) = @_;
3095 3188
3096 my $widget = ref $page_or_widget 3189 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3190 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3191 : $self->{children}[$page_or_widget];
3099 3192
3100 $self->{current} = $widget; 3193 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3194 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3195
3103 $self->_emit (page_changed => $self->{current}); 3196 $self->emit (page_changed => $self->{current});
3104 3197
3105 $self->realloc; 3198 $self->realloc;
3106} 3199}
3107 3200
3108sub visible_children { 3201sub visible_children {
… …
3113 my ($self) = @_; 3206 my ($self) = @_;
3114 3207
3115 $self->{current}->size_request 3208 $self->{current}->size_request
3116} 3209}
3117 3210
3118sub size_allocate { 3211sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3212 my ($self, $w, $h) = @_;
3120 3213
3121 $self->{current}->configure (0, 0, $w, $h); 3214 $self->{current}->configure (0, 0, $w, $h);
3215
3216 1
3122} 3217}
3123 3218
3124sub _draw { 3219sub _draw {
3125 my ($self) = @_; 3220 my ($self) = @_;
3126 3221
… …
3161 ); 3256 );
3162 3257
3163 $self->{multiplexer}->add ($widget); 3258 $self->{multiplexer}->add ($widget);
3164} 3259}
3165 3260
3261sub get_current_page {
3262 my ($self) = @_;
3263
3264 $self->{multiplexer}->get_current_page
3265}
3266
3166sub set_current_page { 3267sub set_current_page {
3167 my ($self, $page) = @_; 3268 my ($self, $page) = @_;
3168 3269
3169 $self->{multiplexer}->set_current_page ($page); 3270 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3271 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3272}
3172 3273
3173############################################################################# 3274#############################################################################
3174 3275
3175package CFClient::UI::Combobox; 3276package CFClient::UI::Combobox;
… …
3190 $self->_set_value ($self->{value}); 3291 $self->_set_value ($self->{value});
3191 3292
3192 $self 3293 $self
3193} 3294}
3194 3295
3195sub button_down { 3296sub invoke_button_down {
3196 my ($self, $ev) = @_; 3297 my ($self, $ev) = @_;
3197 3298
3198 my @menu_items; 3299 my @menu_items;
3199 3300
3200 for (@{ $self->{options} }) { 3301 for (@{ $self->{options} }) {
… …
3221 my ($self, $value) = @_; 3322 my ($self, $value) = @_;
3222 3323
3223 return unless $self->{value} ne $value; 3324 return unless $self->{value} ne $value;
3224 3325
3225 $self->_set_value ($value); 3326 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3327 $self->emit (changed => $value);
3227} 3328}
3228 3329
3229############################################################################# 3330#############################################################################
3230 3331
3231package CFClient::UI::Statusbox; 3332package CFClient::UI::Statusbox;
… …
3346 count => 1, 3447 count => 1,
3347 %arg, 3448 %arg,
3348 }; 3449 };
3349 } 3450 }
3350 3451
3452 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 3453 $self->reorder;
3454 });
3352} 3455}
3353 3456
3354sub reconfigure { 3457sub reconfigure {
3355 my ($self) = @_; 3458 my ($self) = @_;
3356 3459
… …
3371 3474
3372############################################################################# 3475#############################################################################
3373 3476
3374package CFClient::UI::Inventory; 3477package CFClient::UI::Inventory;
3375 3478
3376our @ISA = CFClient::UI::ScrolledWindow::; 3479our @ISA = CFClient::UI::Table::;
3377 3480
3378sub new { 3481sub new {
3379 my $class = shift; 3482 my $class = shift;
3380 3483
3381 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3485 col_expand => [0, 1, 0],
3383 @_, 3486 @_,
3384 ); 3487 );
3385 3488
3386 $self 3489 $self
3387} 3490}
3388 3491
3389sub set_items { 3492sub set_items {
3390 my ($self, $items) = @_; 3493 my ($self, $items) = @_;
3391 3494
3392 $self->{child}->clear; 3495 $self->clear;
3393 return unless $items; 3496 return unless $items;
3394 3497
3395 my @items = sort { 3498 my @items = sort {
3396 ($a->{type} <=> $b->{type}) 3499 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name}) 3500 or ($a->{name} cmp $b->{name})
3398 } @$items; 3501 } values %$items;
3399 3502
3400 $self->{real_items} = \@items; 3503 $self->{real_items} = \@items;
3401 3504
3402 my $row = 0; 3505 my $row = 0;
3403 for my $item (@items) { 3506 for my $item (@items) {
3404 CFClient::Item::update_widgets $item; 3507 CFClient::Item::update_widgets $item;
3405 3508
3406 $self->{child}->add (0, $row, $item->{face_widget}); 3509 $self->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget}); 3510 $self->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget}); 3511 $self->add (2, $row, $item->{weight_widget});
3409 3512
3410 $row++; 3513 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 } 3514 }
3610} 3515}
3611 3516
3612############################################################################# 3517#############################################################################
3613 3518
… …
3667 } elsif ($ev->{button} == 2) { 3572 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}"); 3573 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) { 3574 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu 3575 (new CFClient::UI::Menu
3671 items => [ 3576 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3577 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3578 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ], 3579 ],
3675 )->popup ($ev); 3580 )->popup ($ev);
3676 } else { 3581 } else {
3677 return 0; 3582 return 0;
… …
3772 $coord = $max - $size if $coord > $max - $size; 3677 $coord = $max - $size if $coord > $max - $size;
3773 3678
3774 int $coord + 0.5 3679 int $coord + 0.5
3775} 3680}
3776 3681
3777sub size_allocate { 3682sub invoke_size_allocate {
3778 my ($self, $w, $h) = @_; 3683 my ($self, $w, $h) = @_;
3779 3684
3780 for my $child ($self->children) { 3685 for my $child ($self->children) {
3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3686 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782 3687
… …
3786 $X = _to_pixel $X, $W, $self->{w}; 3691 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h}; 3692 $Y = _to_pixel $Y, $H, $self->{h};
3788 3693
3789 $child->configure ($X, $Y, $W, $H); 3694 $child->configure ($X, $Y, $W, $H);
3790 } 3695 }
3696
3697 1
3791} 3698}
3792 3699
3793sub coord2local { 3700sub coord2local {
3794 my ($self, $x, $y) = @_; 3701 my ($self, $x, $y) = @_;
3795 3702
… …
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3828 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3922 3829
3923 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3924 $h = 0 if $h < 0; 3831 $h = 0 if $h < 0;
3925 3832
3833 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h;
3835
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838
3926 $w = int $w + 0.5; 3839 $w = int $w + 0.5;
3927 $h = int $h + 0.5; 3840 $h = int $h + 0.5;
3928 3841
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3842 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w}; 3843 $widget->{old_w} = $widget->{w};

Diff Legend

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