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.264 by root, Thu Jun 1 02:58:30 2006 UTC vs.
Revision 1.427 by root, Sun Aug 19 10:32:49 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 76# class methods for events
72sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 79 if $FOCUS;
75} 80}
… …
77sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
78 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS; 84 if $FOCUS;
80} 85}
81 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
82sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
83 my ($ev) = @_; 101 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
85 103
86 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
87 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
88 108
89 $GRAB = $widget; 109 $GRAB = $widget;
90 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
91 111
92 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
93 } 113 }
94 114
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
96 120
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
98 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
99} 129}
100 130
101sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
102 my ($ev) = @_; 132 my ($ev) = @_;
103 my ($x, $y) = ($ev->{x}, $ev->{y});
104 133
105 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
106 135
107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
108 137
109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
110 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
111 140
112 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 143 $grab->update if $grab;
115 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
116 145
117 check_tooltip; 146 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->();
118 } 148 }
119} 149}
120 150
121sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
122 my ($ev) = @_; 152 my ($ev) = @_;
123 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
124 154
125 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
126 156
127 if ($widget != $HOVER) { 157 check_hover $widget;
128 my $hover = $HOVER; $HOVER = $widget;
129 158
130 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
131 $HOVER->update if $HOVER && $HOVER->{can_hover};
132
133 check_tooltip;
134 }
135
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 160 if $HOVER;
138} 161}
139 162
140# convert position array to integers 163# convert position array to integers
141sub harmonize { 164sub harmonize {
… …
170sub rescale_widgets { 193sub rescale_widgets {
171 my ($sx, $sy) = @_; 194 my ($sx, $sy) = @_;
172 195
173 for my $widget (values %WIDGET) { 196 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 197 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 200
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 203 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 204 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 205 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 206 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 207
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 208 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 209 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 210
188 } 211 }
189 } 212 }
190 213
191 reconfigure_widgets; 214 reconfigure_widgets;
192} 215}
193 216
194############################################################################# 217#############################################################################
195 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
196package CFClient::UI::Base; 227package CFPlus::UI::Base;
197 228
198use strict; 229use strict;
199 230
200use CFClient::OpenGL; 231use CFPlus::OpenGL;
201 232
202sub new { 233sub new {
203 my $class = shift; 234 my $class = shift;
204 235
205 my $self = bless { 236 my $self = bless {
… …
210 h => undef, 241 h => undef,
211 can_events => 1, 242 can_events => 1,
212 @_ 243 @_
213 }, $class; 244 }, $class;
214 245
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
216 247
217 for (keys %$self) { 248 for (keys %$self) {
218 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
219 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
220 } 251 }
221 } 252 }
222 253
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
228 259
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231 262
232 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
237 268
238sub destroy { 269sub destroy {
239 my ($self) = @_; 270 my ($self) = @_;
240 271
241 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
242 %$self = (); 274 %$self = ();
243} 275}
244 276
277sub TO_JSON {
278 { __w_ => $_[0]{s_id} }
279}
280
245sub show { 281sub show {
246 my ($self) = @_; 282 my ($self) = @_;
247 283
248 return if $self->{parent}; 284 return if $self->{parent};
249 285
250 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
251} 287}
252 288
253sub set_visible { 289sub set_visible {
254 my ($self) = @_; 290 my ($self) = @_;
255 291
… …
270 306
271 return unless $self->{visible}; 307 return unless $self->{visible};
272 308
273 $_->set_invisible for $self->children; 309 $_->set_invisible for $self->children;
274 310
311 delete $self->{visible};
275 delete $self->{root}; 312 delete $self->{root};
276 delete $self->{visible};
277 313
278 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
280 316
281 CFClient::UI::check_tooltip 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
283 319
284 $self->focus_out; 320 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
287} 322}
288 323
289sub set_visibility { 324sub set_visibility {
290 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
291 326
292 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
293 328
294 $visible ? $self->hide 329 $visible ? $self->show
295 : $self->show; 330 : $self->hide;
296} 331}
297 332
298sub toggle_visibility { 333sub toggle_visibility {
299 my ($self) = @_; 334 my ($self) = @_;
300 335
… …
313} 348}
314 349
315sub move_abs { 350sub move_abs {
316 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
317 352
318 $self->{x} = List::Util::max 0, int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
321 356
322 $self->update; 357 $self->update;
323} 358}
324 359
… …
334sub size_request { 369sub size_request {
335 require Carp; 370 require Carp;
336 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
337} 372}
338 373
374sub baseline_shift {
375 0
376}
377
339sub configure { 378sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
341 380
342 if ($self->{aspect}) { 381 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
344 383
345 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
346 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
347 386
348 # use alignment to adjust x, y 387 # use alignment to adjust x, y
349 388
350 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
351 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
365 404
366 $self->{root}{size_alloc}{$self+0} = $self; 405 $self->{root}{size_alloc}{$self+0} = $self;
367 } 406 }
368} 407}
369 408
370sub size_allocate {
371 # nothing to be done
372}
373
374sub children { 409sub children {
410 # nop
411}
412
413sub visible_children {
414 $_[0]->children
375} 415}
376 416
377sub set_max_size { 417sub set_max_size {
378 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
379 419
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 420 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 421 $self->{max_h} = int $h if defined $h;
422
423 $self->realloc;
382} 424}
383 425
384sub set_tooltip { 426sub set_tooltip {
385 my ($self, $tooltip) = @_; 427 my ($self, $tooltip) = @_;
386 428
… …
389 431
390 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
391 433
392 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
393 435
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
397 } 439 }
398} 440}
399 441
400# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
401sub coord2local { 443sub coord2local {
402 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
403 445
446 Carp::confess unless $self->{parent};#d#
447
404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
405} 449}
406 450
407# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
408sub coord2global { 452sub coord2global {
409 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
410 454
455 Carp::confess unless $self->{parent};#d#
456
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
412} 458}
413 459
414sub focus_in { 460sub invoke_focus_in {
415 my ($self) = @_; 461 my ($self) = @_;
416 462
417 return if $FOCUS == $self; 463 return if $FOCUS == $self;
418 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
419 465
420 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
421 467
422 $self->_emit (focus_in => $focus); 468 $self->update;
423 469
424 $focus->update if $focus; 470 0
425 $FOCUS->update;
426} 471}
427 472
428sub focus_out { 473sub invoke_focus_out {
429 my ($self) = @_; 474 my ($self) = @_;
430 475
431 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
432 477
433 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
434 479
435 $self->_emit (focus_out => $focus); 480 $self->update;
436 481
437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 483 unless $FOCUS;
441}
442 484
485 0
486}
487
488sub grab_focus {
489 my ($self) = @_;
490
491 $FOCUS->emit ("focus_out") if $FOCUS;
492 $self->emit ("focus_in");
493}
494
443sub mouse_motion { } 495sub invoke_mouse_motion { 0 }
444sub button_up { } 496sub invoke_button_up { 0 }
445sub key_down { } 497sub invoke_key_down { 0 }
446sub key_up { } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
447 500
448sub button_down { 501sub invoke_button_down {
449 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
450 503
451 $self->focus_in; 504 $self->grab_focus;
452}
453 505
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 506 0
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 507}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459 508
509sub connect {
510 my ($self, $signal, $cb) = @_;
511
512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
532
533sub emit {
534 my ($self, $signal, @args) = @_;
535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
553 $self->{parent} && $self->{parent}->emit ($signal, @args)
554}
555
460sub find_widget { 556#sub find_widget {
461 my ($self, $x, $y) = @_; 557# in .xs
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471 558
472sub set_parent { 559sub set_parent {
473 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
474 561
475 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500} 564}
501 565
502sub realloc { 566sub realloc {
503 my ($self) = @_; 567 my ($self) = @_;
504 568
… …
525 589
526 $self->realloc; 590 $self->realloc;
527 $self->update; 591 $self->update;
528} 592}
529 593
594# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597
530sub draw { 598#sub draw {
531 my ($self) = @_; 599#CFPlus.xs
532
533 return unless $self->{h} && $self->{w};
534
535 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539
540 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2;
544 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS;
547 glVertex $x , $y;
548 glVertex $x + $self->{w}, $y;
549 glVertex $x + $self->{w}, $y + $self->{h};
550 glVertex $x , $y + $self->{h};
551 glEnd;
552 glDisable GL_BLEND;
553 }
554
555 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix;
557 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
559 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1;
564 glEnd;
565 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 }
568}
569 600
570sub _draw { 601sub _draw {
571 my ($self) = @_; 602 my ($self) = @_;
572 603
573 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
574} 605}
575 606
576sub DESTROY { 607sub DESTROY {
577 my ($self) = @_; 608 my ($self) = @_;
578 609
610 return if CFPlus::in_destruct;
611
612 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
579 delete $WIDGET{$self+0}; 615 delete $WIDGET{$self+0};
580 #$self->deactivate;
581} 616}
582 617
583############################################################################# 618#############################################################################
584 619
585package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
586 621
587our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
588 623
589use strict; 624use strict;
590use CFClient::OpenGL; 625use CFPlus::OpenGL;
591 626
592sub new { 627sub new {
593 my $class = shift; 628 my $class = shift;
594 629
595 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
610 645
611 if ($color && (@$color < 4 || $color->[3])) { 646 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 647 my ($w, $h) = @$self{qw(w h)};
613 648
614 glEnable GL_BLEND; 649 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 651 glColor_premultiply @$color;
617 652
618 glBegin GL_QUADS; 653 glBegin GL_QUADS;
619 glVertex 0 , 0; 654 glVertex 0 , 0;
620 glVertex 0 , $h; 655 glVertex 0 , $h;
621 glVertex $w, $h; 656 glVertex $w, $h;
… …
626 } 661 }
627} 662}
628 663
629############################################################################# 664#############################################################################
630 665
631package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
632 667
633our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
634 669
635sub new { 670sub new {
636 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
637 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
638} 673}
… …
645 680
646sub draw { } 681sub draw { }
647 682
648############################################################################# 683#############################################################################
649 684
650package CFClient::UI::Container; 685package CFPlus::UI::Container;
651 686
652our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
653 688
654sub new { 689sub new {
655 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
656 691
657 my $children = delete $arg{children} || []; 692 my $children = delete $arg{children};
658 693
659 my $self = $class->SUPER::new ( 694 my $self = $class->SUPER::new (
660 children => [], 695 children => [],
661 can_events => 0, 696 can_events => 0,
662 %arg, 697 %arg,
663 ); 698 );
699
664 $self->add ($_) for @$children; 700 $self->add (@$children)
701 if $children && @$children;
665 702
666 $self 703 $self
704}
705
706sub realloc {
707 my ($self) = @_;
708
709 $self->{force_realloc} = 1;
710 $self->{force_size_alloc} = 1;
711 $self->SUPER::realloc;
667} 712}
668 713
669sub add { 714sub add {
670 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
671 716
672 $_->set_parent ($self) 717 $_->set_parent ($self)
673 for @widgets; 718 for @widgets;
674 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
675 use sort 'stable'; 721 use sort 'stable';
676 722
677 $self->{children} = [ 723 $self->{children} = [
678 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
679 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
680 ]; 726 ];
681 727
682 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
683} 733}
684 734
685sub children { 735sub children {
686 @{ $_[0]{children} } 736 @{ $_[0]{children} }
687} 737}
688 738
689sub remove { 739sub remove {
690 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
691 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
692 delete $child->{parent}; 745 delete $child->{parent};
693 $child->hide; 746 $child->hide;
694
695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
696 749
697 $self->realloc; 750 $self->realloc;
698} 751}
699 752
700sub clear { 753sub clear {
701 my ($self) = @_; 754 my ($self) = @_;
702 755
703 my $children = delete $self->{children}; 756 my $children = $self->{children};
704 $self->{children} = []; 757 $self->{children} = [];
705 758
706 for (@$children) { 759 for (@$children) {
707 delete $_->{parent}; 760 delete $_->{parent};
708 $_->hide; 761 $_->hide;
… …
717 $x -= $self->{x}; 770 $x -= $self->{x};
718 $y -= $self->{y}; 771 $y -= $self->{y};
719 772
720 my $res; 773 my $res;
721 774
722 for (reverse @{ $self->{children} }) { 775 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 776 $res = $_->find_widget ($x, $y)
724 and return $res; 777 and return $res;
725 } 778 }
726 779
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 780 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
728} 781}
729 782
730sub _draw { 783sub _draw {
731 my ($self) = @_; 784 my ($self) = @_;
732 785
733 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
734} 787}
735 788
736############################################################################# 789#############################################################################
737 790
738package CFClient::UI::Bin; 791package CFPlus::UI::Bin;
739 792
740our @ISA = CFClient::UI::Container::; 793our @ISA = CFPlus::UI::Container::;
741 794
742sub new { 795sub new {
743 my ($class, %arg) = @_; 796 my ($class, %arg) = @_;
744 797
745 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
746 799
747 $class->SUPER::new (children => [$child], %arg) 800 $class->SUPER::new (children => [$child], %arg)
748} 801}
749 802
750sub add { 803sub add {
751 my ($self, $child) = @_; 804 my ($self, $child) = @_;
752 805
753 $self->{children} = []; 806 $self->clear;
754
755 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
756} 808}
757 809
758sub remove { 810sub remove {
759 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
760 812
761 $self->SUPER::remove ($widget); 813 $self->SUPER::remove ($widget);
762 814
763 $self->{children} = [new CFClient::UI::Empty] 815 $self->{children} = [new CFPlus::UI::Empty]
764 unless @{$self->{children}}; 816 unless @{$self->{children}};
765} 817}
766 818
767sub child { $_[0]->{children}[0] } 819sub child { $_[0]->{children}[0] }
768 820
769sub size_request { 821sub size_request {
770 $_[0]{children}[0]->size_request 822 $_[0]{children}[0]->size_request
771} 823}
772 824
773sub size_allocate { 825sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 826 my ($self, $w, $h) = @_;
775 827
776 $self->{children}[0]->configure (0, 0, $w, $h); 828 $self->{children}[0]->configure (0, 0, $w, $h);
829
830 1
777} 831}
778 832
779############################################################################# 833#############################################################################
780 834
835# back-buffered drawing area
836
781package CFClient::UI::Window; 837package CFPlus::UI::Window;
782 838
783our @ISA = CFClient::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
784 840
785use CFClient::OpenGL; 841use CFPlus::OpenGL;
786 842
787sub new { 843sub new {
788 my ($class, %arg) = @_; 844 my ($class, %arg) = @_;
789 845
790 my $self = $class->SUPER::new (%arg); 846 my $self = $class->SUPER::new (%arg);
… …
795 851
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 852 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 853 $self->SUPER::update;
798} 854}
799 855
800sub size_allocate { 856sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 857 my ($self, $w, $h) = @_;
802 858
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 859 $self->update;
860
861 $self->SUPER::invoke_size_allocate ($w, $h)
805} 862}
806 863
807sub _render { 864sub _render {
865 my ($self) = @_;
866
808 $_[0]{children}[0]->draw; 867 $self->{children}[0]->draw;
809} 868}
810 869
811sub render_child { 870sub render_child {
812 my ($self) = @_; 871 my ($self) = @_;
813 872
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 874 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
817 876
877 {
878 package CFPlus::UI::Base;
879
880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
881 (0, 0, $self->{w}, $self->{h});
882
818 $self->_render; 883 $self->_render;
884 }
819 }; 885 };
820} 886}
821 887
822sub _draw { 888sub _draw {
823 my ($self) = @_; 889 my ($self) = @_;
824
825 my ($w, $h) = ($self->w, $self->h);
826 890
827 my $tex = $self->{texture} 891 my $tex = $self->{texture}
828 or return; 892 or return;
829 893
830 glEnable GL_TEXTURE_2D; 894 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 896 glColor 0, 0, 0, 1;
833 897
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 898 $tex->draw_quad_alpha_premultiplied (0, 0);
835 899
836 glDisable GL_TEXTURE_2D; 900 glDisable GL_TEXTURE_2D;
837} 901}
838 902
839############################################################################# 903#############################################################################
840 904
841package CFClient::UI::ViewPort; 905package CFPlus::UI::ViewPort;
842 906
907use List::Util qw(min max);
908
843our @ISA = CFClient::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
844 910
845sub new { 911sub new {
846 my $class = shift; 912 my $class = shift;
847 913
848 $class->SUPER::new ( 914 $class->SUPER::new (
… …
855sub size_request { 921sub size_request {
856 my ($self) = @_; 922 my ($self) = @_;
857 923
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859 925
860 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
862 928
863 ($w, $h) 929 ($w, $h)
864} 930}
865 931
866sub size_allocate { 932sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 933 my ($self, $w, $h) = @_;
868 934
869 my $child = $self->child; 935 my $child = $self->child;
870 936
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 937 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 938 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 939
874 $self->child->configure (0, 0, $w, $h); 940 $self->child->configure (0, 0, $w, $h);
875 $self->update; 941 $self->update;
942
943 1
876} 944}
877 945
878sub set_offset { 946sub set_offset {
879 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
880 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
881 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
882 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
883 955
956 $self->emit (changed => $x, $y);
884 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
885} 977}
886 978
887# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local { 980sub coord2local {
889 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
904 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
905 997
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) { 1000 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else { 1002 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
912 } 1004 }
913} 1005}
914 1006
915sub _render { 1007sub _render {
916 my ($self) = @_; 1008 my ($self) = @_;
917 1009
1010 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1011 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1012
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 1014
920 $self->SUPER::_render; 1015 $self->SUPER::_render;
921} 1016}
922 1017
923############################################################################# 1018#############################################################################
924 1019
925package CFClient::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
926 1021
927our @ISA = CFClient::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
928 1023
929sub new { 1024sub new {
930 my $class = shift; 1025 my ($class, %arg) = @_;
1026
1027 my $child = delete $arg{child};
931 1028
932 my $self; 1029 my $self;
933 1030
934 my $slider = new CFClient::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 c_col => 0,
1033 c_row => 1,
1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub {
1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 },
1040 ;
1041
1042 my $vslider = new CFPlus::UI::Slider
1043 c_col => 1,
1044 c_row => 0,
935 vertical => 1, 1045 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub { 1047 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
939 }, 1050 },
940 ; 1051 ;
941 1052
942 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1056 can_events => 1,
944 slider => $slider, 1057 hslider => $hslider,
945 @_, 1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
1061 %arg,
946 ); 1062 );
947 1063
948 $self->{vp}->add ($self->{scrolled}); 1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 c_col => 0,
1066 c_row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1083 ;
1084
949 $self->add ($self->{vp}); 1085 $self->SUPER::add ($self->{vp});
950 $self->add ($self->{slider}); 1086
1087 $self->add ($child) if $child;
951 1088
952 $self 1089 $self
953} 1090}
954 1091
1092sub add {
1093 my ($self, $widget) = @_;
1094
1095 $self->{vp}->add ($self->{child} = $widget);
1096}
1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
955sub update { 1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 if ($self->{scroll_x}) {
1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1110
1111 my $visible = $w1 > $w2;
1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1117 }
1118
1119 if ($self->{scroll_y}) {
1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1122
1123 my $visible = $h1 > $h2;
1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
956 my ($self) = @_; 1133 my ($self, $ev) = @_;
957 1134
958 $self->SUPER::update; 1135 $self->grab_focus;
959 1136
960 # todo: overwrite size_allocate of child 1137 my $ox = $self->{vp}{view_x};
961 my $child = $self->{vp}->child; 1138 my $oy = $self->{vp}{view_y};
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1139
963} 1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
964 1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1147 };
1148}
1149
1150sub invoke_mouse_wheel {
1151 my ($self, $ev) = @_;
1152
1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1155
1156 1
1157}
1158
1159sub invoke_button_down {
1160 my ($self, $ev, $x, $y) = @_;
1161
1162 if ($ev->{button} == 2) {
1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1189}
1190
965sub size_allocate { 1191sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
967 1193
1194 $self->update_slider;
968 $self->SUPER::size_allocate ($w, $h); 1195 $self->SUPER::invoke_size_allocate ($w, $h)
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972} 1196}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1197
977############################################################################# 1198#############################################################################
978 1199
979package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
980 1201
981our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
982 1203
983use CFClient::OpenGL; 1204use CFPlus::OpenGL;
984 1205
985sub new { 1206sub new {
986 my $class = shift; 1207 my $class = shift;
987 1208
988 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
996 1217
997 if ($self->{bg}) { 1218 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
999 1220
1000 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
1003 1224
1004 glBegin GL_QUADS; 1225 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1226 glVertex 0 , 0;
1006 glVertex 0 , $h; 1227 glVertex 0 , $h;
1007 glVertex $w, $h; 1228 glVertex $w, $h;
… …
1014 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1015} 1236}
1016 1237
1017############################################################################# 1238#############################################################################
1018 1239
1019package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1020 1241
1021our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1022 1243
1023use CFClient::OpenGL; 1244use CFPlus::OpenGL;
1245
1246sub new {
1247 my ($class, %arg) = @_;
1248
1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1024 1345
1025my $bg = 1346my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1028 1349
1029my @border = 1350my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1357
1033sub new { 1358sub new {
1034 my $class = shift; 1359 my ($class, %arg) = @_;
1035 1360
1036 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1362 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1363 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1364 border => 0.6,
1040 can_events => 1, 1365 can_events => 1,
1041 min_w => 16, 1366 min_w => 64,
1042 min_h => 16, 1367 min_h => 32,
1043 @_ 1368 %arg,
1044 ); 1369 );
1045 1370
1046 $self->{title} &&= new CFClient::UI::Label 1371 $self->{title_widget} = new CFPlus::UI::Label
1047 align => 0, 1372 align => 0,
1048 valign => 1, 1373 valign => 1,
1049 text => $self->{title}, 1374 text => $self->{title},
1050 fontsize => $self->{border}; 1375 fontsize => $self->{border},
1376 if exists $self->{title};
1377
1378 if ($self->{has_close_button}) {
1379 $self->{close_button} =
1380 new CFPlus::UI::ImageButton
1381 path => 'x1_close.png',
1382 on_activate => sub { $self->emit ("delete") };
1383
1384 $self->CFPlus::UI::Container::add ($self->{close_button});
1385 }
1051 1386
1052 $self 1387 $self
1388}
1389
1390sub add {
1391 my ($self, @widgets) = @_;
1392
1393 $self->SUPER::add (@widgets);
1394 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1395 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1396}
1054 1397
1055sub border { 1398sub border {
1056 int $_[0]{border} * $::FONTSIZE 1399 int $_[0]{border} * $::FONTSIZE
1057} 1400}
1058 1401
1059sub size_request { 1402sub size_request {
1060 my ($self) = @_; 1403 my ($self) = @_;
1404
1405 $self->{title_widget}->size_request
1406 if $self->{title_widget};
1407
1408 $self->{close_button}->size_request
1409 if $self->{close_button};
1061 1410
1062 my ($w, $h) = $self->SUPER::size_request; 1411 my ($w, $h) = $self->SUPER::size_request;
1063 1412
1064 ( 1413 (
1065 $w + $self->border * 2, 1414 $w + $self->border * 2,
1066 $h + $self->border * 2, 1415 $h + $self->border * 2,
1067 ) 1416 )
1068} 1417}
1069 1418
1070sub size_allocate { 1419sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1420 my ($self, $w, $h) = @_;
1072 1421
1422 if ($self->{title_widget}) {
1423 $self->{title_widget}{w} = $w;
1424 $self->{title_widget}{h} = $h;
1425 $self->{title_widget}->invoke_size_allocate ($w, $h);
1426 }
1427
1428 my $border = $self->border;
1429
1073 $h -= List::Util::max 0, $self->border * 2; 1430 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1431 $w -= List::Util::max 0, $border * 2;
1075 1432
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1433 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1434
1435 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1436 if $self->{close_button};
1437
1438 1
1439}
1440
1441sub invoke_delete {
1442 my ($self) = @_;
1443
1444 $self->hide;
1445
1446 1
1447}
1448
1082sub button_down { 1449sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1450 my ($self, $ev, $x, $y) = @_;
1084 1451
1085 my ($w, $h) = @$self{qw(w h)}; 1452 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1453 my $border = $self->border;
1087 1454
… …
1103 my $dy = $ev->{y} - $oy; 1470 my $dy = $ev->{y} - $oy;
1104 1471
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1472 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1473 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1474
1475 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1476 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1477 };
1111 1478
1112 } elsif ($lr ^ $td) { 1479 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1480 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1481 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1484 my ($ev, $x, $y) = @_;
1118 1485
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1486 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1487
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1488 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1489 # HACK: the next line is required to enforce placement
1490 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1491 };
1492 } else {
1493 return 0;
1494 }
1495
1123 } 1496 1
1124} 1497}
1125 1498
1126sub button_up { 1499sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1500 my ($self, $ev, $x, $y) = @_;
1128 1501
1129 delete $self->{motion}; 1502 ! ! delete $self->{motion}
1130} 1503}
1131 1504
1132sub mouse_motion { 1505sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1506 my ($self, $ev, $x, $y) = @_;
1134 1507
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1508 $self->{motion}->($ev, $x, $y) if $self->{motion};
1509
1510 ! ! $self->{motion}
1511}
1512
1513sub invoke_visibility_change {
1514 my ($self, $visible) = @_;
1515
1516 delete $self->{motion} unless $visible;
1517
1518 0
1136} 1519}
1137 1520
1138sub _draw { 1521sub _draw {
1139 my ($self) = @_; 1522 my ($self) = @_;
1140 1523
1524 my $child = $self->{children}[0];
1525
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1526 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1527 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1528
1144 glEnable GL_TEXTURE_2D; 1529 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1531
1147 my $border = $self->border; 1532 my $border = $self->border;
1148 1533
1149 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1150 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1154 1553
1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1157 1556
1158 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1561 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1562 }
1164 1563
1165 glDisable GL_TEXTURE_2D; 1564 glDisable GL_TEXTURE_2D;
1166 1565
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1566 $child->draw;
1567
1568 if ($self->{title_widget}) {
1569 glTranslate 0, $border - $self->{h};
1570 $self->{title_widget}->_draw;
1571
1572 glTranslate 0, - ($border - $self->{h});
1573 }
1574
1575 $self->{close_button}->draw
1576 if $self->{close_button};
1170} 1577}
1171 1578
1172############################################################################# 1579#############################################################################
1173 1580
1174package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1175 1582
1176our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1177 1584
1178use List::Util qw(max sum); 1585use List::Util qw(max sum);
1179 1586
1180use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1181 1588
1182sub new { 1589sub new {
1183 my $class = shift; 1590 my $class = shift;
1184 1591
1185 $class->SUPER::new ( 1592 $class->SUPER::new (
1186 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1187 @_, 1595 @_,
1188 ) 1596 )
1189} 1597}
1190 1598
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1193}
1194
1195sub add { 1599sub add {
1196 my ($self, $x, $y, $child) = @_;
1197
1198 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child;
1200
1201 $self->realloc;
1202}
1203
1204# TODO: move to container class maybe? send children a signal on removal?
1205sub clear {
1206 my ($self) = @_; 1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1611 my $self = shift;
1612
1613 my @widgets;
1614
1615 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1617
1618 $child->{c_row} = $row;
1619 $child->{c_col} = $col;
1620
1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1628 my ($self) = @_;
1629
1630 my (@w, @h);
1207 1631
1208 my @children = $self->children; 1632 my @children = $self->children;
1209 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1210 1643 }
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215 1644
1216 $self->realloc; 1645 # second pass, rows
1217} 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1218
1219sub get_wh {
1220 my ($self) = @_;
1221
1222 my (@w, @h);
1223
1224 for my $y (0 .. $#{$self->{children}}) {
1225 my $row = $self->{children}[$y]
1226 or next;
1227
1228 for my $x (0 .. $#$row) {
1229 my $widget = $row->[$x]
1230 or next;
1231 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1232 1648
1233 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1234 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1235 } 1653 }
1236 } 1654 }
1237 1655
1238 (\@w, \@h) 1656 (\@w, \@h)
1239} 1657}
… …
1247 (sum @$ws), 1665 (sum @$ws),
1248 (sum @$hs), 1666 (sum @$hs),
1249 ) 1667 )
1250} 1668}
1251 1669
1252sub size_allocate { 1670sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1671 my ($self, $w, $h) = @_;
1254 1672
1255 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1256 1674
1257 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1258 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1259 1677
1260 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1261 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1262 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1263 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1264 1682
1265 # linearly scale sizes
1266 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1267 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1268 1684
1269 CFClient::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1270 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1271 1694
1272 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1273 1697
1274 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1275 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1276 or next;
1277 1700
1278 my $x = 0; 1701 $widget->configure (
1279 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1280 1704 );
1281 for my $c (0 .. $#$row) { 1705 }
1282 my $col_w = $ws->[$c];
1283 1706
1284 if (my $widget = $row->[$c]) { 1707 1
1285 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1286 }
1287 1709
1288 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1289 } 1737 }
1290
1291 $y += $row_h;
1292 } 1738 }
1293 1739
1294} 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1295 1742
1296sub find_widget { 1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1297 my ($self, $x, $y) = @_; 1761 my ($self, $W, $H) = @_;
1298 1762
1299 $x -= $self->{x}; 1763 for my $child ($self->visible_children) {
1300 $y -= $self->{y}; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1301 1766
1302 my $res; 1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1303 1769
1304 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1305 $res = $_->find_widget ($x, $y) 1771 }
1306 and return $res; 1772
1307 } 1773 1
1308
1309 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 for (grep $_, @{$self->{children}}) {
1316 $_->draw for grep $_, @$_;
1317 }
1318} 1774}
1319 1775
1320############################################################################# 1776#############################################################################
1321 1777
1322package CFClient::UI::Box; 1778package CFPlus::UI::Box;
1323 1779
1324our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1325 1781
1326sub size_request { 1782sub size_request {
1327 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1328 1786
1329 $self->{vertical} 1787 $self->{vertical}
1330 ? ( 1788 ? (
1331 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1333 ) 1791 )
1334 : ( 1792 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1337 ) 1795 )
1338} 1796}
1339 1797
1340sub size_allocate { 1798sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
1342 1800
1343 my $space = $self->{vertical} ? $h : $w; 1801 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1802 my @children = $self->visible_children;
1345 1803
1346 my @req; 1804 my @req;
1347 1805
1348 if ($self->{homogeneous}) { 1806 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1807 @req = ($space / (@children || 1)) x @children;
1350 } else { 1808 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1809 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1810 my $req = List::Util::sum @req;
1353 1811
1354 if ($req > $space) { 1812 if ($req > $space) {
1355 # ah well, not enough space 1813 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1814 $_ *= $space / $req for @req;
1357 } else { 1815 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1816 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1817
1360 $space = ($space - $req) / $expand; # remaining space to give away 1818 $space = ($space - $req) / $expand; # remaining space to give away
1361 1819
1362 $req[$_] += $space * $children->[$_]{expand} 1820 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1821 for 0 .. $#children;
1364 } 1822 }
1365 } 1823 }
1366 1824
1367 CFClient::UI::harmonize \@req; 1825 CFPlus::UI::harmonize \@req;
1368 1826
1369 my $pos = 0; 1827 my $pos = 0;
1370 for (0 .. $#$children) { 1828 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1829 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1831
1374 $pos += $alloc; 1832 $pos += $alloc;
1375 } 1833 }
1376 1834
1377 1 1835 1
1378} 1836}
1379 1837
1380############################################################################# 1838#############################################################################
1381 1839
1382package CFClient::UI::HBox; 1840package CFPlus::UI::HBox;
1383 1841
1384our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1385 1843
1386sub new { 1844sub new {
1387 my $class = shift; 1845 my $class = shift;
1388 1846
1389 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1392 ) 1850 )
1393} 1851}
1394 1852
1395############################################################################# 1853#############################################################################
1396 1854
1397package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1398 1856
1399our @ISA = CFClient::UI::Box::; 1857our @ISA = CFPlus::UI::Box::;
1400 1858
1401sub new { 1859sub new {
1402 my $class = shift; 1860 my $class = shift;
1403 1861
1404 $class->SUPER::new ( 1862 $class->SUPER::new (
… …
1407 ) 1865 )
1408} 1866}
1409 1867
1410############################################################################# 1868#############################################################################
1411 1869
1412package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1413 1871
1414our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1415 1873
1416use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1417 1875
1418sub new { 1876sub new {
1419 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1420 1878
1421 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1424 #active_bg => none 1882 #active_bg => none
1425 #font => default_font 1883 #font => default_font
1426 #text => initial text 1884 #text => initial text
1427 #markup => initial narkup 1885 #markup => initial narkup
1428 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1429 ellipsise => 3, # end 1888 ellipsise => 3, # end
1430 layout => (new CFClient::Layout), 1889 layout => (new CFPlus::Layout),
1431 fontsize => 1, 1890 fontsize => 1,
1432 align => -1, 1891 align => -1,
1433 valign => -1, 1892 valign => -1,
1434 padding_x => 2, 1893 padding_x => 2,
1435 padding_y => 2, 1894 padding_y => 2,
1436 can_events => 0, 1895 can_events => 0,
1437 %arg 1896 %arg
1438 ); 1897 );
1439 1898
1440 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1441 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1442 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1443 $self->{template} = $layout; 1902 $self->{template} = $layout;
1444 } 1903 }
1445 1904
1446 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1450 } 1909 }
1451 1910
1452 $self 1911 $self
1453} 1912}
1454 1913
1455sub escape($) {
1456 local $_ = $_[0];
1457
1458 s/&/&amp;/g;
1459 s/>/&gt;/g;
1460 s/</&lt;/g;
1461
1462 $_
1463}
1464
1465sub update { 1914sub update {
1466 my ($self) = @_; 1915 my ($self) = @_;
1467 1916
1468 delete $self->{texture}; 1917 delete $self->{texture};
1469 $self->SUPER::update; 1918 $self->SUPER::update;
1470} 1919}
1471 1920
1921sub realloc {
1922 my ($self) = @_;
1923
1924 delete $self->{ox};
1925 $self->SUPER::realloc;
1926}
1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1472sub set_text { 1934sub set_text {
1473 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1474 1936
1475 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
1477 1939
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1940 $self->{layout}->set_text ($text);
1480 1941
1942 delete $self->{size_req};
1481 $self->realloc; 1943 $self->realloc;
1482 $self->update; 1944 $self->update;
1483} 1945}
1484 1946
1485sub set_markup { 1947sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1950 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1951 $self->{text} = "M$markup";
1490 1952
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1953 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1954
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1955 $self->{layout}->set_markup ($markup);
1495 1956
1957 delete $self->{size_req};
1496 $self->realloc; 1958 $self->realloc;
1497 $self->update; 1959 $self->update;
1498} 1960}
1499 1961
1500sub size_request { 1962sub size_request {
1501 my ($self) = @_; 1963 my ($self) = @_;
1502 1964
1965 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1966 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1967 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1968 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1969 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1970 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1971
1509 my ($w, $h) = $self->{layout}->size; 1972 my ($w, $h) = $self->{layout}->size;
1510 1973
1511 if (exists $self->{template}) { 1974 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1975 $self->{template}->set_font ($self->{font}) if $self->{font};
1976 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1977 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1978
1515 my ($w2, $h2) = $self->{template}->size; 1979 my ($w2, $h2) = $self->{template}->size;
1516 1980
1517 $w = List::Util::max $w, $w2; 1981 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1982 $h = List::Util::max $h, $h2;
1983 }
1984
1985 [$w, $h]
1519 } 1986 };
1520 1987
1521 ($w, $h) 1988 @{ $self->{size_req} }
1522} 1989}
1523 1990
1991sub baseline_shift {
1992 $_[0]{layout}->descent
1993}
1994
1524sub size_allocate { 1995sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1996 my ($self, $w, $h) = @_;
1526 1997
1998 delete $self->{ox};
1999
1527 delete $self->{texture} 2000 delete $self->{texture}
1528 ;#d# 2001 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2002
2003 1
1529} 2004}
1530 2005
1531sub set_fontsize { 2006sub set_fontsize {
1532 my ($self, $fontsize) = @_; 2007 my ($self, $fontsize) = @_;
1533 2008
1534 $self->{fontsize} = $fontsize; 2009 $self->{fontsize} = $fontsize;
2010 delete $self->{size_req};
1535 delete $self->{texture}; 2011 delete $self->{texture};
1536 2012
1537 $self->realloc; 2013 $self->realloc;
1538} 2014}
1539 2015
2016sub reconfigure {
2017 my ($self) = @_;
2018
2019 delete $self->{size_req};
2020 delete $self->{texture};
2021
2022 $self->SUPER::reconfigure;
2023}
2024
1540sub _draw { 2025sub _draw {
1541 my ($self) = @_; 2026 my ($self) = @_;
1542 2027
1543 $self->SUPER::_draw; # draw background, if applicable 2028 $self->SUPER::_draw; # draw background, if applicable
1544 2029
1545 my $tex = $self->{texture} ||= do { 2030 my $size = $self->{texture} ||= do {
1546 $self->{layout}->set_foreground (@{$self->{fg}}); 2031 $self->{layout}->set_foreground (@{$self->{fg}});
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2032 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{w}); 2033 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2034 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2035 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2036 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 2037
1553 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2038 [$self->{layout}->size]
2039 };
1554 2040
2041 unless (exists $self->{ox}) {
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2042 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2043 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5); 2044 : ($self->{w} - $size->[0]) * 0.5);
1558 2045
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
1562 2049
1563 $tex 2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1564 }; 2051 };
1565 2052
1566 glEnable GL_TEXTURE_2D; 2053# unless ($self->{list}) {
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2054# $self->{list} = CFPlus::OpenGL::glGenList;
1568 2055# CFPlus::OpenGL::glNewList $self->{list};
1569 if ($tex->{format} == GL_ALPHA) { 2056# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1570 glColor @{$self->{fg}}; 2057# CFPlus::OpenGL::glEndList;
1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572 } else {
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574 } 2058# }
2059#
2060# CFPlus::OpenGL::glCallList $self->{list};
1575 2061
1576 glDisable GL_TEXTURE_2D; 2062 $self->{layout}->draw;
1577} 2063}
2064
2065#sub destroy {
2066# my ($self) = @_;
2067#
2068# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2069#
2070# $self->SUPER::destroy;
2071#}
1578 2072
1579############################################################################# 2073#############################################################################
1580 2074
1581package CFClient::UI::EntryBase; 2075package CFPlus::UI::EntryBase;
1582 2076
1583our @ISA = CFClient::UI::Label::; 2077our @ISA = CFPlus::UI::Label::;
1584 2078
1585use CFClient::OpenGL; 2079use CFPlus::OpenGL;
1586 2080
1587sub new { 2081sub new {
1588 my $class = shift; 2082 my $class = shift;
1589 2083
1590 $class->SUPER::new ( 2084 $class->SUPER::new (
1591 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
1592 bg => [0, 0, 0, 0.2], 2086 bg => [0, 0, 0, 0.2],
2087 outline => [0.6, 0.3, 0.1],
1593 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [0, 0, 1, .2],
1594 active_fg => [0, 0, 0], 2089 active_fg => [1, 1, 1],
2090 active_outline => [1, 1, 0],
1595 can_hover => 1, 2091 can_hover => 1,
1596 can_focus => 1, 2092 can_focus => 1,
1597 valign => 0, 2093 valign => 0,
1598 can_events => 1, 2094 can_events => 1,
2095 ellipsise => 0,
1599 #text => ... 2096 #text => ...
2097 #hidden => "*",
1600 @_ 2098 @_
1601 ) 2099 )
1602} 2100}
1603 2101
1604sub _set_text { 2102sub _set_text {
… …
1606 2104
1607 delete $self->{cur_h}; 2105 delete $self->{cur_h};
1608 2106
1609 return if $self->{text} eq $text; 2107 return if $self->{text} eq $text;
1610 2108
1611 delete $self->{texture};
1612
1613 $self->{last_activity} = $::NOW; 2109 $self->{last_activity} = $::NOW;
1614 $self->{text} = $text; 2110 $self->{text} = $text;
1615 2111
1616 $text =~ s/./*/g if $self->{hidden}; 2112 $text =~ s/./*/g if $self->{hidden};
1617 $self->{layout}->set_text ("$text "); 2113 $self->{layout}->set_text ("$text ");
2114 delete $self->{size_req};
1618 2115
1619 $self->_emit (changed => $self->{text}); 2116 $self->emit (changed => $self->{text});
2117
2118 $self->realloc;
2119 $self->update;
1620} 2120}
1621 2121
1622sub set_text { 2122sub set_text {
1623 my ($self, $text) = @_; 2123 my ($self, $text) = @_;
1624 2124
1625 $self->{cursor} = length $text; 2125 $self->{cursor} = length $text;
1626 $self->_set_text ($text); 2126 $self->_set_text ($text);
1627
1628 $self->realloc;
1629} 2127}
1630 2128
1631sub get_text { 2129sub get_text {
1632 $_[0]{text} 2130 $_[0]{text}
1633} 2131}
… …
1638 my ($w, $h) = $self->SUPER::size_request; 2136 my ($w, $h) = $self->SUPER::size_request;
1639 2137
1640 ($w + 1, $h) # add 1 for cursor 2138 ($w + 1, $h) # add 1 for cursor
1641} 2139}
1642 2140
1643sub key_down { 2141sub invoke_key_down {
1644 my ($self, $ev) = @_; 2142 my ($self, $ev) = @_;
1645 2143
1646 my $mod = $ev->{mod}; 2144 my $mod = $ev->{mod};
1647 my $sym = $ev->{sym}; 2145 my $sym = $ev->{sym};
1648 my $uni = $ev->{unicode}; 2146 my $uni = $ev->{unicode};
1649 2147
1650 my $text = $self->get_text; 2148 my $text = $self->get_text;
2149
2150 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1651 2151
1652 if ($uni == 8) { 2152 if ($uni == 8) {
1653 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2153 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1654 } elsif ($uni == 127) { 2154 } elsif ($uni == 127) {
1655 substr $text, $self->{cursor}, 1, ""; 2155 substr $text, $self->{cursor}, 1, "";
1656 } elsif ($sym == CFClient::SDLK_LEFT) { 2156 } elsif ($sym == CFPlus::SDLK_LEFT) {
1657 --$self->{cursor} if $self->{cursor}; 2157 --$self->{cursor} if $self->{cursor};
1658 } elsif ($sym == CFClient::SDLK_RIGHT) { 2158 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1659 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2159 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1660 } elsif ($sym == CFClient::SDLK_HOME) { 2160 } elsif ($sym == CFPlus::SDLK_HOME) {
2161 # what a hack
2162 $self->{cursor} =
2163 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2164 ? length $1
2165 : 0;
2166 } elsif ($sym == CFPlus::SDLK_END) {
2167 # uh, again
2168 $self->{cursor} =
2169 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2170 ? $self->{cursor} + length $1
2171 : length $self->{text};
2172 } elsif ($uni == 21) { # ctrl-u
2173 $text = "";
1661 $self->{cursor} = 0; 2174 $self->{cursor} = 0;
1662 } elsif ($sym == CFClient::SDLK_END) {
1663 $self->{cursor} = length $text;
1664 } elsif ($uni == 27) { 2175 } elsif ($uni == 27) {
1665 $self->_emit ('escape'); 2176 $self->emit ('escape');
1666 } elsif ($uni) { 2177 } elsif ($uni == 0x0d) {
2178 substr $text, $self->{cursor}++, 0, "\012";
2179 } elsif ($uni >= 0x20) {
1667 substr $text, $self->{cursor}++, 0, chr $uni; 2180 substr $text, $self->{cursor}++, 0, chr $uni;
2181 } else {
2182 return 0;
1668 } 2183 }
1669 2184
1670 $self->_set_text ($text); 2185 $self->_set_text ($text);
1671 2186
1672 $self->realloc; 2187 $self->realloc;
1673} 2188 $self->update;
1674 2189
2190 1
2191}
2192
1675sub focus_in { 2193sub invoke_focus_in {
1676 my ($self) = @_; 2194 my ($self) = @_;
1677 2195
1678 $self->{last_activity} = $::NOW; 2196 $self->{last_activity} = $::NOW;
1679 2197
1680 $self->SUPER::focus_in; 2198 $self->SUPER::invoke_focus_in
1681} 2199}
1682 2200
1683sub button_down { 2201sub invoke_button_down {
1684 my ($self, $ev, $x, $y) = @_; 2202 my ($self, $ev, $x, $y) = @_;
1685 2203
1686 $self->SUPER::button_down ($ev, $x, $y); 2204 $self->SUPER::invoke_button_down ($ev, $x, $y);
1687 2205
1688 my $idx = $self->{layout}->xy_to_index ($x, $y); 2206 my $idx = $self->{layout}->xy_to_index ($x, $y);
1689 2207
1690 # byte-index to char-index 2208 # byte-index to char-index
1691 my $text = $self->{text}; 2209 my $text = $self->{text};
1692 utf8::encode $text; 2210 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1693 $self->{cursor} = length substr $text, 0, $idx; 2211 $self->{cursor} = length $text;
1694 2212
1695 $self->_set_text ($self->{text}); 2213 $self->_set_text ($self->{text});
1696 $self->update; 2214 $self->update;
2215
2216 1
1697} 2217}
1698 2218
1699sub mouse_motion { 2219sub invoke_mouse_motion {
1700 my ($self, $ev, $x, $y) = @_; 2220 my ($self, $ev, $x, $y) = @_;
1701# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2221# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2222
2223 1
1702} 2224}
1703 2225
1704sub _draw { 2226sub _draw {
1705 my ($self) = @_; 2227 my ($self) = @_;
1706 2228
1707 local $self->{fg} = $self->{fg}; 2229 local $self->{fg} = $self->{fg};
1708 2230
1709 if ($FOCUS == $self) { 2231 if ($FOCUS == $self) {
1710 glColor @{$self->{active_bg}}; 2232 glColor_premultiply @{$self->{active_bg}};
1711 $self->{fg} = $self->{active_fg}; 2233 $self->{fg} = $self->{active_fg};
1712 } else { 2234 } else {
1713 glColor @{$self->{bg}}; 2235 glColor_premultiply @{$self->{bg}};
1714 } 2236 }
1715 2237
1716 glEnable GL_BLEND; 2238 glEnable GL_BLEND;
1717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718 glBegin GL_QUADS; 2240 glBegin GL_QUADS;
1719 glVertex 0 , 0; 2241 glVertex 0 , 0;
1720 glVertex 0 , $self->{h}; 2242 glVertex 0 , $self->{h};
1721 glVertex $self->{w}, $self->{h}; 2243 glVertex $self->{w}, $self->{h};
1722 glVertex $self->{w}, 0; 2244 glVertex $self->{w}, 0;
… …
1730 2252
1731 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
1732 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
1733 utf8::encode $text; 2255 utf8::encode $text;
1734 2256
1735 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1736 } 2258 }
1737 2259
1738 glColor @{$self->{fg}}; 2260 glColor_premultiply @{$self->{active_fg}};
1739 glBegin GL_LINES; 2261 glBegin GL_LINES;
1740 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1741 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1742 glEnd; 2264 glEnd;
1743 }
1744}
1745 2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glBegin GL_LINE_LOOP;
2269 glVertex 0, 0;
2270 glVertex $self->{w} - 1, 0;
2271 glVertex $self->{w} - 1, $self->{h} - 1;
2272 glVertex 0, $self->{h} - 1;
2273 glEnd;
2274 glLineWidth 1;
2275
2276 } else {
2277 glColor @{$self->{outline}};
2278 glTranslate .375, .375;
2279 glBegin GL_LINE_STRIP;
2280 glVertex 0, $self->{h} * .5;
2281 glVertex 0, $self->{h} - 3;
2282 glVertex $self->{w} - 1, $self->{h} - 3;
2283 glVertex $self->{w} - 1, $self->{h} * .5;
2284 glEnd;
2285 }
2286}
2287
2288#############################################################################
2289
1746package CFClient::UI::Entry; 2290package CFPlus::UI::Entry;
1747 2291
1748our @ISA = CFClient::UI::EntryBase::; 2292our @ISA = CFPlus::UI::EntryBase::;
1749 2293
1750use CFClient::OpenGL; 2294use CFPlus::OpenGL;
1751 2295
1752sub key_down { 2296sub invoke_key_down {
1753 my ($self, $ev) = @_; 2297 my ($self, $ev) = @_;
1754 2298
1755 my $sym = $ev->{sym}; 2299 my $sym = $ev->{sym};
1756 2300
1757 if ($sym == 13) { 2301 if ($ev->{uni} == 0x0d || $sym == 13) {
1758 unshift @{$self->{history}}, 2302 unshift @{$self->{history}},
1759 my $txt = $self->get_text; 2303 my $txt = $self->get_text;
2304
1760 $self->{history_pointer} = -1; 2305 $self->{history_pointer} = -1;
1761 $self->{history_saveback} = ''; 2306 $self->{history_saveback} = '';
1762 $self->_emit (activate => $txt); 2307 $self->emit (activate => $txt);
1763 $self->update; 2308 $self->update;
1764 2309
1765 } elsif ($sym == CFClient::SDLK_UP) { 2310 } elsif ($sym == CFPlus::SDLK_UP) {
1766 if ($self->{history_pointer} < 0) { 2311 if ($self->{history_pointer} < 0) {
1767 $self->{history_saveback} = $self->get_text; 2312 $self->{history_saveback} = $self->get_text;
1768 } 2313 }
1769 if (@{$self->{history} || []} > 0) { 2314 if (@{$self->{history} || []} > 0) {
1770 $self->{history_pointer}++; 2315 $self->{history_pointer}++;
… …
1772 $self->{history_pointer} = @{$self->{history} || []} - 1; 2317 $self->{history_pointer} = @{$self->{history} || []} - 1;
1773 } 2318 }
1774 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1775 } 2320 }
1776 2321
1777 } elsif ($sym == CFClient::SDLK_DOWN) { 2322 } elsif ($sym == CFPlus::SDLK_DOWN) {
1778 $self->{history_pointer}--; 2323 $self->{history_pointer}--;
1779 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2324 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1780 2325
1781 if ($self->{history_pointer} >= 0) { 2326 if ($self->{history_pointer} >= 0) {
1782 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2327 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1783 } else { 2328 } else {
1784 $self->set_text ($self->{history_saveback}); 2329 $self->set_text ($self->{history_saveback});
1785 } 2330 }
1786 2331
1787 } else { 2332 } else {
1788 $self->SUPER::key_down ($ev); 2333 return $self->SUPER::invoke_key_down ($ev)
2334 }
2335
1789 } 2336 1
1790
1791} 2337}
1792 2338
1793############################################################################# 2339#############################################################################
1794 2340
2341package CFPlus::UI::TextEdit;
2342
2343our @ISA = CFPlus::UI::EntryBase::;
2344
2345use CFPlus::OpenGL;
2346
2347sub move_cursor_ver {
2348 my ($self, $dy) = @_;
2349
2350 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2351
2352 $y += $dy;
2353
2354 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2355 $self->{cursor} = $index;
2356 delete $self->{cur_h};
2357 $self->update;
2358 return;
2359 }
2360}
2361
2362sub invoke_key_down {
2363 my ($self, $ev) = @_;
2364
2365 my $sym = $ev->{sym};
2366
2367 if ($sym == CFPlus::SDLK_UP) {
2368 $self->move_cursor_ver (-1);
2369 } elsif ($sym == CFPlus::SDLK_DOWN) {
2370 $self->move_cursor_ver (+1);
2371 } else {
2372 return $self->SUPER::invoke_key_down ($ev)
2373 }
2374
2375 1
2376}
2377
2378#############################################################################
2379
1795package CFClient::UI::Button; 2380package CFPlus::UI::ButtonBin;
1796 2381
1797our @ISA = CFClient::UI::Label::; 2382our @ISA = CFPlus::UI::Bin::;
1798 2383
1799use CFClient::OpenGL; 2384use CFPlus::OpenGL;
1800 2385
1801my @tex = 2386my @tex =
1802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1803 qw(b1_button_active.png); 2388 qw(b1_button_inactive.png b1_button_active.png);
1804 2389
1805sub new { 2390sub new {
1806 my $class = shift; 2391 my $class = shift;
1807 2392
1808 $class->SUPER::new ( 2393 $class->SUPER::new (
1809 padding_x => 4,
1810 padding_y => 4,
1811 fg => [1, 1, 1],
1812 active_fg => [0, 0, 1],
1813 can_hover => 1, 2394 can_hover => 1,
1814 align => 0, 2395 align => 0,
1815 valign => 0, 2396 valign => 0,
1816 can_events => 1, 2397 can_events => 1,
1817 @_ 2398 @_
1818 ) 2399 )
1819} 2400}
1820 2401
1821sub activate { }
1822
1823sub button_up { 2402sub invoke_button_up {
1824 my ($self, $ev, $x, $y) = @_; 2403 my ($self, $ev, $x, $y) = @_;
1825 2404
1826 $self->emit ("activate") 2405 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w} 2406 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h}; 2407 && $y >= 0 && $y < $self->{h};
2408
2409 1
1829} 2410}
1830 2411
1831sub _draw { 2412sub _draw {
1832 my ($self) = @_; 2413 my ($self) = @_;
1833
1834 local $self->{fg} = $self->{fg};
1835
1836 if ($GRAB == $self) {
1837 $self->{fg} = $self->{active_fg};
1838 }
1839 2414
1840 glEnable GL_TEXTURE_2D; 2415 glEnable GL_TEXTURE_2D;
1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842 glColor 0, 0, 0, 1; 2417 glColor 0, 0, 0, 1;
1843 2418
2419 my $tex = $tex[$GRAB == $self];
1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2420 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1845 2421
1846 glDisable GL_TEXTURE_2D; 2422 glDisable GL_TEXTURE_2D;
1847 2423
1848 $self->SUPER::_draw; 2424 $self->SUPER::_draw;
1849} 2425}
1850 2426
1851############################################################################# 2427#############################################################################
1852 2428
1853package CFClient::UI::CheckBox; 2429package CFPlus::UI::Button;
1854 2430
1855our @ISA = CFClient::UI::DrawBG::; 2431our @ISA = CFPlus::UI::Label::;
2432
2433use CFPlus::OpenGL;
1856 2434
1857my @tex = 2435my @tex =
1858 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2436 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2437 qw(b1_button_inactive.png b1_button_active.png);
2438
2439sub new {
2440 my $class = shift;
2441
2442 $class->SUPER::new (
2443 padding_x => 4,
2444 padding_y => 4,
2445 fg => [1.0, 1.0, 1.0],
2446 active_fg => [0.8, 0.8, 0.8],
2447 can_hover => 1,
2448 align => 0,
2449 valign => 0,
2450 can_events => 1,
2451 @_
2452 )
2453}
2454
2455sub invoke_button_up {
2456 my ($self, $ev, $x, $y) = @_;
2457
2458 $self->emit ("activate")
2459 if $x >= 0 && $x < $self->{w}
2460 && $y >= 0 && $y < $self->{h};
2461
2462 1
2463}
2464
2465sub _draw {
2466 my ($self) = @_;
2467
2468 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2469
2470 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 0, 0, 0, 1;
2473
2474 my $tex = $tex[$GRAB == $self];
2475 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2476
2477 glDisable GL_TEXTURE_2D;
2478
2479 $self->SUPER::_draw;
2480}
2481
2482#############################################################################
2483
2484package CFPlus::UI::CheckBox;
2485
2486our @ISA = CFPlus::UI::DrawBG::;
2487
2488my @tex =
2489 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1859 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2490 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1860 2491
1861use CFClient::OpenGL; 2492use CFPlus::OpenGL;
1862 2493
1863sub new { 2494sub new {
1864 my $class = shift; 2495 my $class = shift;
1865 2496
1866 $class->SUPER::new ( 2497 $class->SUPER::new (
… …
1880 my ($self) = @_; 2511 my ($self) = @_;
1881 2512
1882 (6) x 2 2513 (6) x 2
1883} 2514}
1884 2515
2516sub toggle {
2517 my ($self) = @_;
2518
2519 $self->{state} = !$self->{state};
2520 $self->emit (changed => $self->{state});
2521 $self->update;
2522}
2523
1885sub button_down { 2524sub invoke_button_down {
1886 my ($self, $ev, $x, $y) = @_; 2525 my ($self, $ev, $x, $y) = @_;
1887 2526
1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2527 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2528 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890 $self->{state} = !$self->{state}; 2529 $self->toggle;
1891 $self->_emit (changed => $self->{state}); 2530 } else {
2531 return 0
2532 }
2533
1892 } 2534 1
1893} 2535}
1894 2536
1895sub _draw { 2537sub _draw {
1896 my ($self) = @_; 2538 my ($self) = @_;
1897 2539
… …
1912 glDisable GL_TEXTURE_2D; 2554 glDisable GL_TEXTURE_2D;
1913} 2555}
1914 2556
1915############################################################################# 2557#############################################################################
1916 2558
1917package CFClient::UI::Image; 2559package CFPlus::UI::Image;
1918 2560
1919our @ISA = CFClient::UI::Base::; 2561our @ISA = CFPlus::UI::Base::;
1920 2562
1921use CFClient::OpenGL; 2563use CFPlus::OpenGL;
1922use Carp qw/confess/;
1923 2564
1924our %loaded_images; 2565our %texture_cache;
1925 2566
1926sub new { 2567sub new {
1927 my $class = shift; 2568 my $class = shift;
1928 2569
1929 my $self = $class->SUPER::new (can_events => 0, @_); 2570 my $self = $class->SUPER::new (
2571 can_events => 0,
2572 scale => 1,
2573 @_,
2574 );
1930 2575
1931 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2576 $self->{path} || $self->{tex}
2577 or Carp::croak "'path' or 'tex' attributes required";
1932 2578
1933 $loaded_images{$self->{image}} ||= 2579 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1934 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2580 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1935 2581
1936 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2582 CFPlus::weaken $texture_cache{$self->{path}};
1937 2583
1938 Scalar::Util::weaken $loaded_images{$self->{image}}; 2584 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1939
1940 $self->{aspect} = $tex->{w} / $tex->{h};
1941 2585
1942 $self 2586 $self
1943} 2587}
1944 2588
2589sub STORABLE_freeze {
2590 my ($self, $cloning) = @_;
2591
2592 $self->{path}
2593 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2594
2595 $self->{path}
2596}
2597
2598sub STORABLE_attach {
2599 my ($self, $cloning, $path) = @_;
2600
2601 $self->new (path => $path)
2602}
2603
1945sub size_request { 2604sub size_request {
1946 my ($self) = @_; 2605 my ($self) = @_;
1947 2606
1948 ($self->{tex}->{w}, $self->{tex}->{h}) 2607 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
1949} 2608}
1950 2609
1951sub _draw { 2610sub _draw {
1952 my ($self) = @_; 2611 my ($self) = @_;
1953 2612
… …
1970 glDisable GL_TEXTURE_2D; 2629 glDisable GL_TEXTURE_2D;
1971} 2630}
1972 2631
1973############################################################################# 2632#############################################################################
1974 2633
2634package CFPlus::UI::ImageButton;
2635
2636our @ISA = CFPlus::UI::Image::;
2637
2638use CFPlus::OpenGL;
2639
2640my %textures;
2641
2642sub new {
2643 my $class = shift;
2644
2645 my $self = $class->SUPER::new (
2646 padding_x => 4,
2647 padding_y => 4,
2648 fg => [1, 1, 1],
2649 active_fg => [0, 0, 1],
2650 can_hover => 1,
2651 align => 0,
2652 valign => 0,
2653 can_events => 1,
2654 @_
2655 );
2656}
2657
2658sub invoke_button_up {
2659 my ($self, $ev, $x, $y) = @_;
2660
2661 $self->emit ("activate")
2662 if $x >= 0 && $x < $self->{w}
2663 && $y >= 0 && $y < $self->{h};
2664
2665 1
2666}
2667
2668#############################################################################
2669
1975package CFClient::UI::VGauge; 2670package CFPlus::UI::VGauge;
1976 2671
1977our @ISA = CFClient::UI::Base::; 2672our @ISA = CFPlus::UI::Base::;
1978 2673
1979use List::Util qw(min max); 2674use List::Util qw(min max);
1980 2675
1981use CFClient::OpenGL; 2676use CFPlus::OpenGL;
1982 2677
1983my %tex = ( 2678my %tex = (
1984 food => [ 2679 food => [
1985 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1986 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2681 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1987 ], 2682 ],
1988 grace => [ 2683 grace => [
1989 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1990 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2685 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1991 ], 2686 ],
1992 hp => [ 2687 hp => [
1993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2688 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1994 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2689 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1995 ], 2690 ],
1996 mana => [ 2691 mana => [
1997 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1998 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2693 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1999 ], 2694 ],
2000); 2695);
2001 2696
2002# eg. VGauge->new (gauge => 'food'), default gauge: food 2697# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2062 my $ycut1 = max 0, min 1, $ycut; 2757 my $ycut1 = max 0, min 1, $ycut;
2063 my $ycut2 = max 0, min 1, $ycut - 1; 2758 my $ycut2 = max 0, min 1, $ycut - 1;
2064 2759
2065 my $h1 = $self->{h} * (1 - $ycut1); 2760 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2761 my $h2 = $self->{h} * (1 - $ycut2);
2762 my $h3 = $self->{h};
2763
2764 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2067 2765
2068 glEnable GL_BLEND; 2766 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2767 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2768 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2769 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2770 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2771
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2772 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2773 glBegin GL_QUADS;
… …
2089 2788
2090 if ($t3) { 2789 if ($t3) {
2091 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2790 glBindTexture GL_TEXTURE_2D, $t3->{name};
2092 glBegin GL_QUADS; 2791 glBegin GL_QUADS;
2093 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2792 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2094 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2793 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2095 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2794 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2096 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2795 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2097 glEnd; 2796 glEnd;
2098 } 2797 }
2099 2798
2100 glDisable GL_BLEND; 2799 glDisable GL_BLEND;
2101 glDisable GL_TEXTURE_2D; 2800 glDisable GL_TEXTURE_2D;
2102} 2801}
2103 2802
2104############################################################################# 2803#############################################################################
2105 2804
2106package CFClient::UI::Gauge; 2805package CFPlus::UI::Gauge;
2107 2806
2108our @ISA = CFClient::UI::VBox::; 2807our @ISA = CFPlus::UI::VBox::;
2109 2808
2110sub new { 2809sub new {
2111 my ($class, %arg) = @_; 2810 my ($class, %arg) = @_;
2112 2811
2113 my $self = $class->SUPER::new ( 2812 my $self = $class->SUPER::new (
… …
2115 can_hover => 1, 2814 can_hover => 1,
2116 can_events => 1, 2815 can_events => 1,
2117 %arg, 2816 %arg,
2118 ); 2817 );
2119 2818
2120 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2819 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2121 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2820 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2122 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2821 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2123 2822
2124 $self 2823 $self
2125} 2824}
2126 2825
2127sub set_fontsize { 2826sub set_fontsize {
… …
2148 $self->{value}->set_text ($val); 2847 $self->{value}->set_text ($val);
2149} 2848}
2150 2849
2151############################################################################# 2850#############################################################################
2152 2851
2153package CFClient::UI::Slider; 2852package CFPlus::UI::Slider;
2154 2853
2155use strict; 2854use strict;
2156 2855
2157use CFClient::OpenGL; 2856use CFPlus::OpenGL;
2158 2857
2159our @ISA = CFClient::UI::DrawBG::; 2858our @ISA = CFPlus::UI::DrawBG::;
2160 2859
2161my @tex = 2860my @tex =
2162 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2861 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2163 qw(s1_slider.png s1_slider_bg.png); 2862 qw(s1_slider.png s1_slider_bg.png);
2164 2863
2165sub new { 2864sub new {
2166 my $class = shift; 2865 my $class = shift;
2167 2866
… …
2188 $self->update; 2887 $self->update;
2189 2888
2190 $self 2889 $self
2191} 2890}
2192 2891
2193sub changed { }
2194
2195sub set_range { 2892sub set_range {
2196 my ($self, $range) = @_; 2893 my ($self, $range) = @_;
2197 2894
2198 ($range, $self->{range}) = ($self->{range}, $range); 2895 ($range, $self->{range}) = ($self->{range}, $range);
2199 2896
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}"; 2897 if ("@$range" ne "@{$self->{range}}") {
2898 $self->update;
2899 $self->set_value ($self->{range}[0]);
2900 }
2202} 2901}
2203 2902
2204sub set_value { 2903sub set_value {
2205 my ($self, $value) = @_; 2904 my ($self, $value) = @_;
2206 2905
… …
2217 if $unit; 2916 if $unit;
2218 2917
2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2918 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2220 2919
2221 if ($value != $old_value) { 2920 if ($value != $old_value) {
2222 $self->_emit (changed => $value); 2921 $self->emit (changed => $value);
2223 $self->update; 2922 $self->update;
2224 } 2923 }
2225} 2924}
2226 2925
2227sub size_request { 2926sub size_request {
2228 my ($self) = @_; 2927 my ($self) = @_;
2229 2928
2230 ($self->{req_w}, $self->{req_h}) 2929 ($self->{req_w}, $self->{req_h})
2231} 2930}
2232 2931
2233sub button_down { 2932sub invoke_button_down {
2234 my ($self, $ev, $x, $y) = @_; 2933 my ($self, $ev, $x, $y) = @_;
2235 2934
2236 $self->SUPER::button_down ($ev, $x, $y); 2935 $self->SUPER::invoke_button_down ($ev, $x, $y);
2237 2936
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2937 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239 2938
2240 $self->mouse_motion ($ev, $x, $y); 2939 $self->invoke_mouse_motion ($ev, $x, $y);
2241}
2242 2940
2941 1
2942}
2943
2243sub mouse_motion { 2944sub invoke_mouse_motion {
2244 my ($self, $ev, $x, $y) = @_; 2945 my ($self, $ev, $x, $y) = @_;
2245 2946
2246 if ($GRAB == $self) { 2947 if ($GRAB == $self) {
2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2948 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2248 2949
2249 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2950 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250 2951
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2952 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252 2953
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2954 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2955 } else {
2956 return 0;
2957 }
2958
2254 } 2959 1
2960}
2961
2962sub invoke_mouse_wheel {
2963 my ($self, $ev) = @_;
2964
2965 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2966
2967 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2968
2969 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2970
2971 1
2255} 2972}
2256 2973
2257sub update { 2974sub update {
2258 my ($self) = @_; 2975 my ($self) = @_;
2259 2976
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2977 delete $self->{knob_w};
2978 $self->SUPER::update;
2979}
2980
2981sub _draw {
2982 my ($self) = @_;
2983
2984 unless ($self->{knob_w}) {
2261 $self->set_value ($self->{range}[0]); 2985 $self->set_value ($self->{range}[0]);
2262 2986
2263 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2987 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100; 2988 my $range = ($hi - $page - $lo) || 1e-100;
2265 2989
… …
2271 $value = ($value - $lo) / $range; 2995 $value = ($value - $lo) / $range;
2272 $value = $value * $self->{scale} + $self->{offset}; 2996 $value = $value * $self->{scale} + $self->{offset};
2273 2997
2274 $self->{knob_x} = $value - $knob_w * 0.5; 2998 $self->{knob_x} = $value - $knob_w * 0.5;
2275 $self->{knob_w} = $knob_w; 2999 $self->{knob_w} = $knob_w;
2276 }); 3000 }
2277
2278 $self->SUPER::update;
2279}
2280
2281sub _draw {
2282 my ($self) = @_;
2283 3001
2284 $self->SUPER::_draw (); 3002 $self->SUPER::_draw ();
2285 3003
2286 glScale $self->{w}, $self->{h}; 3004 glScale $self->{w}, $self->{h};
2287 3005
… …
2307 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2308} 3026}
2309 3027
2310############################################################################# 3028#############################################################################
2311 3029
2312package CFClient::UI::ValSlider; 3030package CFPlus::UI::ValSlider;
2313 3031
2314our @ISA = CFClient::UI::HBox::; 3032our @ISA = CFPlus::UI::HBox::;
2315 3033
2316sub new { 3034sub new {
2317 my ($class, %arg) = @_; 3035 my ($class, %arg) = @_;
2318 3036
2319 my $range = delete $arg{range}; 3037 my $range = delete $arg{range};
2320 3038
2321 my $self = $class->SUPER::new ( 3039 my $self = $class->SUPER::new (
2322 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3040 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2323 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3041 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2324 to_value => sub { shift }, 3042 to_value => sub { shift },
2325 from_value => sub { shift }, 3043 from_value => sub { shift },
2326 %arg, 3044 %arg,
2327 ); 3045 );
2328 3046
… …
2348sub set_range { shift->{slider}->set_range (@_) } 3066sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) } 3067sub set_value { shift->{slider}->set_value (@_) }
2350 3068
2351############################################################################# 3069#############################################################################
2352 3070
2353package CFClient::UI::TextView; 3071package CFPlus::UI::TextScroller;
2354 3072
2355our @ISA = CFClient::UI::HBox::; 3073our @ISA = CFPlus::UI::HBox::;
2356 3074
2357use CFClient::OpenGL; 3075use CFPlus::OpenGL;
2358 3076
2359sub new { 3077sub new {
2360 my $class = shift; 3078 my $class = shift;
2361 3079
2362 my $self = $class->SUPER::new ( 3080 my $self = $class->SUPER::new (
2363 fontsize => 1, 3081 fontsize => 1,
2364 can_events => 0, 3082 can_events => 1,
3083 indent => 0,
2365 #font => default_font 3084 #font => default_font
2366 @_, 3085 @_,
2367 3086
2368 layout => (new CFClient::Layout 1), 3087 layout => (new CFPlus::Layout),
2369 par => [], 3088 par => [],
3089 max_par => 0,
2370 height => 0, 3090 height => 0,
2371 children => [ 3091 children => [
2372 (new CFClient::UI::Empty expand => 1), 3092 (new CFPlus::UI::Empty expand => 1),
2373 (new CFClient::UI::Slider vertical => 1), 3093 (new CFPlus::UI::Slider vertical => 1),
2374 ], 3094 ],
2375 ); 3095 );
2376 3096
2377 $self->{children}[1]->connect (changed => sub { $self->update }); 3097 $self->{children}[1]->connect (changed => sub { $self->update });
2378 3098
… …
2384 3104
2385 $self->{fontsize} = $fontsize; 3105 $self->{fontsize} = $fontsize;
2386 $self->reflow; 3106 $self->reflow;
2387} 3107}
2388 3108
3109sub size_request {
3110 my ($self) = @_;
3111
3112 my ($empty, $slider) = $self->visible_children;
3113
3114 local $self->{children} = [$empty, $slider];
3115 $self->SUPER::size_request
3116}
3117
2389sub size_allocate { 3118sub invoke_size_allocate {
2390 my ($self, $w, $h) = @_; 3119 my ($self, $w, $h) = @_;
2391 3120
2392 $self->SUPER::size_allocate ($w, $h); 3121 my ($empty, $slider, @other) = @{ $self->{children} };
3122 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2393 3123
2394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3124 $self->{layout}->set_font ($self->{font}) if $self->{font};
2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3125 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $self->{layout}->set_width ($self->{children}[0]{w}); 3126 $self->{layout}->set_width ($empty->{w});
3127 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 3128
2398 $self->reflow; 3129 $self->reflow;
2399}
2400 3130
2401sub text_size { 3131 local $self->{children} = [$empty, $slider];
3132 $self->SUPER::invoke_size_allocate ($w, $h)
3133}
3134
3135sub invoke_mouse_wheel {
2402 my ($self, $text, $indent) = @_; 3136 my ($self, $ev) = @_;
3137
3138 return 0 unless $ev->{dy}; # only vertical movements
3139
3140 $self->{children}[1]->emit (mouse_wheel => $ev);
3141
3142 1
3143}
3144
3145sub get_layout {
3146 my ($self, $para) = @_;
2403 3147
2404 my $layout = $self->{layout}; 3148 my $layout = $self->{layout};
2405 3149
3150 $layout->set_font ($self->{font}) if $self->{font};
3151 $layout->set_foreground (@{$para->{fg}});
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent); 3153 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3154 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2408 $layout->set_markup ($text); 3155 $layout->set_markup ($para->{markup});
3156
3157 $layout->set_shapes (
3158 map
3159 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3160 @{$para->{widget}}
2409 3161 );
3162
2410 $layout->size 3163 $layout
2411} 3164}
2412 3165
2413sub reflow { 3166sub reflow {
2414 my ($self) = @_; 3167 my ($self) = @_;
2415 3168
… …
2422 3175
2423 # todo: base offset on lines or so, not on pixels 3176 # todo: base offset on lines or so, not on pixels
2424 $self->{children}[1]->set_value ($offset); 3177 $self->{children}[1]->set_value ($offset);
2425} 3178}
2426 3179
3180sub current_paragraph {
3181 my ($self) = @_;
3182
3183 $self->{top_paragraph} - 1
3184}
3185
3186sub scroll_to {
3187 my ($self, $para) = @_;
3188
3189 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3190
3191 $self->{scroll_to} = $para;
3192 $self->update;
3193}
3194
2427sub clear { 3195sub clear {
2428 my ($self) = @_; 3196 my ($self) = @_;
3197
3198 my (undef, undef, @other) = @{ $self->{children} };
3199 $self->remove ($_) for @other;
2429 3200
2430 $self->{par} = []; 3201 $self->{par} = [];
2431 $self->{height} = 0; 3202 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3203 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433} 3204}
2434 3205
2435sub add_paragraph { 3206sub add_paragraph {
2436 my ($self, $color, $text, $indent) = @_; 3207 my $self = shift;
2437 3208
2438 for my $line (split /\n/, $text) { 3209 for my $para (@_) {
2439 my ($w, $h) = $self->text_size ($line); 3210 $para = {
3211 fg => [1, 1, 1, 1],
3212 indent => 0,
3213 markup => "",
3214 widget => [],
3215 ref $para ? %$para : (markup => $para),
3216 w => 1e10,
3217 wrapped => 1,
3218 };
3219
3220 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3221 push @{$self->{par}}, $para;
3222 }
3223
3224 if (my $max = $self->{max_par}) {
3225 shift @{$self->{par}} while @{$self->{par}} > $max;
3226 }
3227
3228 $self->{need_reflow}++;
3229 $self->update;
3230}
3231
3232sub scroll_to_bottom {
3233 my ($self) = @_;
3234
3235 $self->{scroll_to} = $#{$self->{par}};
3236 $self->update;
3237}
3238
3239sub force_uptodate {
3240 my ($self) = @_;
3241
3242 if (delete $self->{need_reflow}) {
3243 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3244
3245 my $height = 0;
3246
3247 for my $para (@{$self->{par}}) {
3248 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3249 my $layout = $self->get_layout ($para);
3250 my ($w, $h) = $layout->size;
3251
3252 $para->{w} = $w + $para->{indent};
3253 $para->{h} = $h;
3254 $para->{wrapped} = $layout->has_wrapped;
3255 }
3256
3257 $para->{y} = $height;
3258 $height += $para->{h};
3259 }
3260
2440 $self->{height} += $h; 3261 $self->{height} = $height;
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3262 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2442 }
2443 3263
2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3264 delete $self->{texture};
3265 }
3266
3267 if (my $paridx = delete $self->{scroll_to}) {
3268 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3269 }
2445} 3270}
2446 3271
2447sub update { 3272sub update {
2448 my ($self) = @_; 3273 my ($self) = @_;
2449 3274
… …
2451 3276
2452 return unless $self->{h} > 0; 3277 return unless $self->{h} > 0;
2453 3278
2454 delete $self->{texture}; 3279 delete $self->{texture};
2455 3280
2456 $ROOT->on_post_alloc ($self, sub { 3281 $ROOT->on_post_alloc ($self => sub {
3282 $self->force_uptodate;
3283
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3284 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458 3285
2459 if (delete $self->{need_reflow}) {
2460 my $height = 0;
2461
2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2466 for (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2468 $layout->set_width ($W - $_->[3]);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3];
2472 $_->[1] = $h;
2473 }
2474
2475 $height += $_->[1];
2476 }
2477
2478 $self->{height} = $height;
2479
2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2481
2482 delete $self->{texture};
2483 }
2484
2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3286 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2486 glClearColor 0.5, 0.5, 0.5, 0; 3287 glClearColor 0, 0, 0, 0;
2487 glClear GL_COLOR_BUFFER_BIT; 3288 glClear GL_COLOR_BUFFER_BIT;
2488 3289
3290 package CFPlus::UI::Base;
3291 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3292 (0, 0, $self->{w}, $self->{h});
3293
3294 my $top = int $self->{children}[1]{range}[0];
3295
3296 my $paridx = 0;
3297 my $top_paragraph;
2489 my $top = int $self->{children}[1]{range}[0]; 3298 my $top = int $self->{children}[1]{range}[0];
2490 3299
2491 my $y0 = $top; 3300 my $y0 = $top;
2492 my $y1 = $top + $H; 3301 my $y1 = $top + $H;
2493 3302
2494 my $y = 0;
2495
2496 my $layout = $self->{layout};
2497
2498 $layout->set_font ($self->{font}) if $self->{font};
2499
2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2503
2504 for my $par (@{$self->{par}}) { 3303 for my $para (@{$self->{par}}) {
2505 my $h = $par->[1]; 3304 my $h = $para->{h};
3305 my $y = $para->{y};
2506 3306
2507 if ($y0 < $y + $h && $y < $y1) { 3307 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] }); 3308 my $layout = $self->get_layout ($para);
2509 $layout->set_width ($W - $par->[3]);
2510 $layout->set_markup ($par->[4]);
2511 3309
2512 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3310 $layout->render ($para->{indent}, $y - $y0);
3311 $layout->draw;
2513 3312
2514 glRasterPos $par->[3], $y - $y0; 3313 if (my @w = @{ $para->{widget} }) {
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3314 my @s = $layout->get_shapes;
3315
3316 for (@w) {
3317 my ($dx, $dy) = splice @s, 0, 2, ();
3318
3319 $_->{x} = $dx + $para->{indent};
3320 $_->{y} = $dy + $y - $y0;
3321
3322 $_->draw;
3323 }
3324 }
2516 } 3325 }
2517 3326
2518 $y += $h; 3327 $paridx++;
3328 $top_paragraph ||= $paridx if $y >= $top;
2519 } 3329 }
2520 3330
2521 glDisable GL_BLEND; 3331 $self->{top_paragraph} = $top_paragraph;
2522 }; 3332 };
2523 }); 3333 });
2524} 3334}
2525 3335
3336sub reconfigure {
3337 my ($self) = @_;
3338
3339 $self->SUPER::reconfigure;
3340
3341 $_->{w} = 1e10 for @{ $self->{par} };
3342 $self->reflow;
3343}
3344
2526sub _draw { 3345sub _draw {
2527 my ($self) = @_; 3346 my ($self) = @_;
2528 3347
2529 glEnable GL_TEXTURE_2D; 3348 glEnable GL_TEXTURE_2D;
2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531 glColor 1, 1, 1, 1; 3350 glColor 0, 0, 0, 1;
2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3351 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533 glDisable GL_TEXTURE_2D; 3352 glDisable GL_TEXTURE_2D;
2534 3353
2535 $self->{children}[1]->draw; 3354 $self->{children}[1]->draw;
2536
2537} 3355}
2538 3356
2539############################################################################# 3357#############################################################################
2540 3358
2541package CFClient::UI::Animator; 3359package CFPlus::UI::Animator;
2542 3360
2543use CFClient::OpenGL; 3361use CFPlus::OpenGL;
2544 3362
2545our @ISA = CFClient::UI::Bin::; 3363our @ISA = CFPlus::UI::Bin::;
2546 3364
2547sub moveto { 3365sub moveto {
2548 my ($self, $x, $y) = @_; 3366 my ($self, $x, $y) = @_;
2549 3367
2550 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3368 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2578 glPopMatrix; 3396 glPopMatrix;
2579} 3397}
2580 3398
2581############################################################################# 3399#############################################################################
2582 3400
2583package CFClient::UI::Flopper; 3401package CFPlus::UI::Flopper;
2584 3402
2585our @ISA = CFClient::UI::Button::; 3403our @ISA = CFPlus::UI::Button::;
2586 3404
2587sub new { 3405sub new {
2588 my $class = shift; 3406 my $class = shift;
2589 3407
2590 my $self = $class->SUPER::new ( 3408 my $self = $class->SUPER::new (
… …
2602 $self->{other}->toggle_visibility; 3420 $self->{other}->toggle_visibility;
2603} 3421}
2604 3422
2605############################################################################# 3423#############################################################################
2606 3424
2607package CFClient::UI::Tooltip; 3425package CFPlus::UI::Tooltip;
2608 3426
2609our @ISA = CFClient::UI::Bin::; 3427our @ISA = CFPlus::UI::Bin::;
2610 3428
2611use CFClient::OpenGL; 3429use CFPlus::OpenGL;
2612 3430
2613sub new { 3431sub new {
2614 my $class = shift; 3432 my $class = shift;
2615 3433
2616 $class->SUPER::new ( 3434 $class->SUPER::new (
… …
2619 ) 3437 )
2620} 3438}
2621 3439
2622sub set_tooltip_from { 3440sub set_tooltip_from {
2623 my ($self, $widget) = @_; 3441 my ($self, $widget) = @_;
3442
3443 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3444 if $widget->{tooltip} =~ /^#(.*)$/;
2624 3445
2625 my $tooltip = $widget->{tooltip}; 3446 my $tooltip = $widget->{tooltip};
2626 3447
2627 if ($ENV{CFPLUS_DEBUG} & 2) { 3448 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n" 3449 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3450 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n" 3451 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}"; 3452 . "visible $widget->{visible}";
2632 } 3453 }
2633 3454
3455 $tooltip =~ s/^\n+//;
3456 $tooltip =~ s/\n+$//;
3457
2634 $self->add (new CFClient::UI::Label 3458 $self->add (new CFPlus::UI::Label
2635 markup => $tooltip, 3459 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8, 3461 fontsize => 0.8,
2638 fg => [0, 0, 0, 1], 3462 style => 1, # FLAG_INVERSE
2639 ellipsise => 0, 3463 ellipsise => 0,
2640 font => ($widget->{tooltip_font} || $::FONT_PROP), 3464 font => ($widget->{tooltip_font} || $::FONT_PROP),
2641 ); 3465 );
2642} 3466}
2643 3467
… …
2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3471 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2648 3472
2649 ($w + 4, $h + 4) 3473 ($w + 4, $h + 4)
2650} 3474}
2651 3475
2652sub size_allocate { 3476sub invoke_size_allocate {
2653 my ($self, $w, $h) = @_; 3477 my ($self, $w, $h) = @_;
2654 3478
2655 $self->SUPER::size_allocate ($w - 4, $h - 4); 3479 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2656} 3480}
2657 3481
2658sub visibility_change { 3482sub invoke_visibility_change {
2659 my ($self, $visible) = @_; 3483 my ($self, $visible) = @_;
2660 3484
2661 return unless $visible; 3485 return unless $visible;
2662 3486
2663 $self->{root}->on_post_alloc ("move_$self" => sub { 3487 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner} 3488 my $widget = $self->{owner}
2665 or return; 3489 or return;
2666 3490
3491 if ($widget->{visible}) {
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3492 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668 3493
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3494 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH; 3495 if $x + $self->{w} > $self->{root}{w};
2671 3496
2672 $self->move_abs ($x, $y); 3497 $self->move_abs ($x, $y);
3498 } else {
3499 $self->hide;
3500 }
2673 }); 3501 });
2674} 3502}
2675 3503
2676sub _draw { 3504sub _draw {
2677 my ($self) = @_; 3505 my ($self) = @_;
… …
2679 glTranslate 0.375, 0.375; 3507 glTranslate 0.375, 0.375;
2680 3508
2681 my ($w, $h) = @$self{qw(w h)}; 3509 my ($w, $h) = @$self{qw(w h)};
2682 3510
2683 glColor 1, 0.8, 0.4; 3511 glColor 1, 0.8, 0.4;
2684 glBegin GL_QUADS; 3512 glRect 0, 0, $w, $h;
2685 glVertex 0 , 0;
2686 glVertex 0 , $h;
2687 glVertex $w, $h;
2688 glVertex $w, 0;
2689 glEnd;
2690 3513
2691 glColor 0, 0, 0; 3514 glColor 0, 0, 0;
2692 glBegin GL_LINE_LOOP; 3515 glBegin GL_LINE_LOOP;
2693 glVertex 0 , 0; 3516 glVertex 0 , 0;
2694 glVertex 0 , $h; 3517 glVertex 0 , $h;
… …
2701 $self->SUPER::_draw; 3524 $self->SUPER::_draw;
2702} 3525}
2703 3526
2704############################################################################# 3527#############################################################################
2705 3528
2706package CFClient::UI::Face; 3529package CFPlus::UI::Face;
2707 3530
2708our @ISA = CFClient::UI::Base::; 3531our @ISA = CFPlus::UI::DrawBG::;
2709 3532
2710use CFClient::OpenGL; 3533use CFPlus::OpenGL;
2711 3534
2712sub new { 3535sub new {
2713 my $class = shift; 3536 my $class = shift;
2714 3537
2715 my $self = $class->SUPER::new ( 3538 my $self = $class->SUPER::new (
3539 size_w => 32,
3540 size_h => 8,
2716 aspect => 1, 3541 aspect => 1,
2717 can_events => 0, 3542 can_events => 0,
2718 @_, 3543 @_,
2719 ); 3544 );
2720 3545
2721 if ($self->{anim} && $self->{animspeed}) { 3546 if ($self->{anim} && $self->{animspeed}) {
2722 Scalar::Util::weaken (my $widget = $self); 3547 CFPlus::weaken (my $widget = $self);
2723 3548
3549 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3550 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2724 $self->{timer} = Event->timer ( 3551 $self->{timer} = Event->timer (
2725 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2726 hard => 1, 3552 parked => 1,
2727 interval => $self->{animspeed},
2728 cb => sub { 3553 cb => sub {
3554 return unless $::CONN;
3555
3556 my $w = $widget
3557 or return;
3558
2729 ++$widget->{frame}; 3559 ++$w->{frame};
3560 $w->update_face;
3561
3562 # somehow, $widget can go away
2730 $widget->update; 3563 $w->update;
3564 $w->update_timer;
2731 }, 3565 },
2732 ); 3566 );
3567
3568 $self->update_face;
3569 $self->update_timer;
2733 } 3570 }
2734 3571
2735 $self 3572 $self
2736} 3573}
2737 3574
3575sub update_timer {
3576 my ($self) = @_;
3577
3578 return unless $self->{timer};
3579
3580 if ($self->{visible}) {
3581 $self->{timer}->at (
3582 $self->{anim_start}
3583 + $self->{animspeed}
3584 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3585 );
3586 $self->{timer}->start;
3587 } else {
3588 $self->{timer}->stop;
3589 }
3590}
3591
3592sub update_face {
3593 my ($self) = @_;
3594
3595 return unless $::CONN;
3596
3597 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3598 if ($anim && @$anim) {
3599 delete $self->{wait_face};
3600 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3601 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
3602 unless ($tex->{name} || $tex->{loading}) {
3603 $tex->upload (sub { $self->reconfigure });
3604 }
3605 }
3606 }
3607 }
3608}
3609
2738sub size_request { 3610sub size_request {
2739 (32, 8) 3611 my ($self) = @_;
3612
3613 if ($::CONN) {
3614 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3615 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3616 if ($tex->{name}) {
3617 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3618 } elsif (!$tex->{loading}) {
3619 $tex->upload (sub { $self->reconfigure });
3620 }
3621 } else {
3622 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3623 $self->reconfigure;
3624 });
3625 }
3626 }
3627 }
3628
3629 ($self->{size_w} || 8, $self->{size_h} || 8)
2740} 3630}
2741 3631
2742sub update { 3632sub update {
2743 my ($self) = @_; 3633 my ($self) = @_;
2744 3634
2745 return unless $self->{visible}; 3635 return unless $self->{visible};
2746 3636
2747 $self->SUPER::update; 3637 $self->SUPER::update;
2748} 3638}
2749 3639
3640sub invoke_visibility_change {
3641 my ($self) = @_;
3642
3643 $self->update_timer;
3644
3645 0
3646}
3647
2750sub _draw { 3648sub _draw {
2751 my ($self) = @_; 3649 my ($self) = @_;
2752 3650
2753 return unless $::CONN; 3651 $self->SUPER::_draw;
2754 3652
2755 my $face; 3653 if (my $tex = $self->{tex}) {
2756
2757 if ($self->{frame}) {
2758 my $anim = $::CONN->{anim}[$self->{anim}];
2759
2760 $face = $anim->[ $self->{frame} % @$anim ]
2761 if $anim && @$anim;
2762 }
2763
2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765
2766 if ($tex) {
2767 glEnable GL_TEXTURE_2D; 3654 glEnable GL_TEXTURE_2D;
2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3655 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769 glColor 1, 1, 1, 1; 3656 glColor 0, 0, 0, 1;
2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3657 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771 glDisable GL_TEXTURE_2D; 3658 glDisable GL_TEXTURE_2D;
2772 } 3659 }
2773} 3660}
2774 3661
2775sub DESTROY { 3662sub destroy {
2776 my ($self) = @_; 3663 my ($self) = @_;
2777 3664
2778 $self->{timer}->cancel 3665 (delete $self->{timer})->cancel
2779 if $self->{timer}; 3666 if $self->{timer};
2780 3667
2781 $self->SUPER::DESTROY; 3668 $self->SUPER::destroy;
2782} 3669}
2783 3670
2784############################################################################# 3671#############################################################################
2785 3672
2786package CFClient::UI::Inventory; 3673package CFPlus::UI::Buttonbar;
2787 3674
2788our @ISA = CFClient::UI::ScrolledWindow::; 3675our @ISA = CFPlus::UI::HBox::;
2789 3676
2790sub new { 3677# TODO: should actually wrap buttons and other goodies.
2791 my $class = shift;
2792
2793 my $self = $class->SUPER::new (
2794 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2795 @_,
2796 );
2797
2798 $self
2799}
2800
2801sub set_items {
2802 my ($self, $items) = @_;
2803
2804 $self->{scrolled}->clear;
2805 return unless $items;
2806
2807 my @items = sort {
2808 ($a->{type} <=> $b->{type})
2809 or ($a->{name} cmp $b->{name})
2810 } @$items;
2811
2812 $self->{real_items} = \@items;
2813
2814 my $row = 0;
2815 for my $item (@items) {
2816 CFClient::Item::update_widgets $item;
2817
2818 $self->{scrolled}->add (0, $row, $item->{face_widget});
2819 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2820 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2821
2822 $row++;
2823 }
2824}
2825 3678
2826############################################################################# 3679#############################################################################
2827 3680
2828package CFClient::UI::Menu; 3681package CFPlus::UI::Menu;
2829 3682
2830our @ISA = CFClient::UI::FancyFrame::; 3683our @ISA = CFPlus::UI::Toplevel::;
2831 3684
2832use CFClient::OpenGL; 3685use CFPlus::OpenGL;
2833 3686
2834sub new { 3687sub new {
2835 my $class = shift; 3688 my $class = shift;
2836 3689
2837 my $self = $class->SUPER::new ( 3690 my $self = $class->SUPER::new (
2838 items => [], 3691 items => [],
2839 z => 100, 3692 z => 100,
2840 @_, 3693 @_,
2841 ); 3694 );
2842 3695
2843 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3696 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2844 3697
2845 for my $item (@{ $self->{items} }) { 3698 for my $item (@{ $self->{items} }) {
2846 my ($widget, $cb) = @$item; 3699 my ($widget, $cb, $tooltip) = @$item;
2847 3700
2848 # handle various types of items, only text for now 3701 # handle various types of items, only text for now
2849 if (!ref $widget) { 3702 if (!ref $widget) {
3703 if ($widget =~ /\t/) {
3704 my ($left, $right) = split /\t/, $widget, 2;
3705
2850 $widget = new CFClient::UI::Label 3706 $widget = new CFPlus::UI::HBox
2851 can_hover => 1, 3707 can_hover => 1,
2852 can_events => 1, 3708 can_events => 1,
3709 tooltip => $tooltip,
3710 children => [
3711 (new CFPlus::UI::Label markup => $left, expand => 1),
3712 (new CFPlus::UI::Label markup => $right, align => +1),
3713 ],
3714 ;
3715
3716 } else {
3717 $widget = new CFPlus::UI::Label
3718 can_hover => 1,
3719 can_events => 1,
2853 text => $widget; 3720 markup => $widget,
3721 tooltip => $tooltip;
3722 }
2854 } 3723 }
2855 3724
2856 $self->{item}{$widget} = $item; 3725 $self->{item}{$widget} = $item;
2857 3726
2858 $self->{vbox}->add ($widget); 3727 $self->{vbox}->add ($widget);
… …
2863 3732
2864# popup given the event (must be a mouse button down event currently) 3733# popup given the event (must be a mouse button down event currently)
2865sub popup { 3734sub popup {
2866 my ($self, $ev) = @_; 3735 my ($self, $ev) = @_;
2867 3736
2868 $self->_emit ("popdown"); 3737 $self->emit ("popdown");
2869 3738
2870 # maybe save $GRAB? must be careful about events... 3739 # maybe save $GRAB? must be careful about events...
2871 $GRAB = $self; 3740 $GRAB = $self;
2872 $self->{button} = $ev->{button}; 3741 $self->{button} = $ev->{button};
2873 3742
2874 $self->show; 3743 $self->show;
2875 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3744 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2876} 3745}
2877 3746
2878sub mouse_motion { 3747sub invoke_mouse_motion {
2879 my ($self, $ev, $x, $y) = @_; 3748 my ($self, $ev, $x, $y) = @_;
2880 3749
2881 # TODO: should use vbox->find_widget or so 3750 # TODO: should use vbox->find_widget or so
2882 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3751 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2883 $self->{hover} = $self->{item}{$HOVER}; 3752 $self->{hover} = $self->{item}{$HOVER};
2884}
2885 3753
3754 0
3755}
3756
2886sub button_up { 3757sub invoke_button_up {
2887 my ($self, $ev, $x, $y) = @_; 3758 my ($self, $ev, $x, $y) = @_;
2888 3759
2889 if ($ev->{button} == $self->{button}) { 3760 if ($ev->{button} == $self->{button}) {
2890 undef $GRAB; 3761 undef $GRAB;
2891 $self->hide; 3762 $self->hide;
2892 3763
2893 $self->_emit ("popdown"); 3764 $self->emit ("popdown");
2894 $self->{hover}[1]->() if $self->{hover}; 3765 $self->{hover}[1]->() if $self->{hover};
3766 } else {
3767 return 0
3768 }
3769
2895 } 3770 1
2896} 3771}
2897 3772
2898############################################################################# 3773#############################################################################
2899 3774
2900package CFClient::UI::Statusbox; 3775package CFPlus::UI::Multiplexer;
2901 3776
2902our @ISA = CFClient::UI::VBox::; 3777our @ISA = CFPlus::UI::Container::;
2903 3778
2904sub new { 3779sub new {
2905 my $class = shift; 3780 my $class = shift;
2906 3781
2907 $class->SUPER::new ( 3782 my $self = $class->SUPER::new (
3783 @_,
3784 );
3785
3786 $self->{current} = $self->{children}[0]
3787 if @{ $self->{children} };
3788
3789 $self
3790}
3791
3792sub add {
3793 my ($self, @widgets) = @_;
3794
3795 $self->SUPER::add (@widgets);
3796
3797 $self->{current} = $self->{children}[0]
3798 if @{ $self->{children} };
3799}
3800
3801sub get_current_page {
3802 my ($self) = @_;
3803
3804 $self->{current}
3805}
3806
3807sub set_current_page {
3808 my ($self, $page_or_widget) = @_;
3809
3810 my $widget = ref $page_or_widget
3811 ? $page_or_widget
3812 : $self->{children}[$page_or_widget];
3813
3814 $self->{current} = $widget;
3815 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3816
3817 $self->emit (page_changed => $self->{current});
3818
3819 $self->realloc;
3820}
3821
3822sub visible_children {
3823 $_[0]{current}
3824}
3825
3826sub size_request {
3827 my ($self) = @_;
3828
3829 $self->{current}->size_request
3830}
3831
3832sub invoke_size_allocate {
3833 my ($self, $w, $h) = @_;
3834
3835 $self->{current}->configure (0, 0, $w, $h);
3836
3837 1
3838}
3839
3840sub _draw {
3841 my ($self) = @_;
3842
3843 $self->{current}->draw;
3844}
3845
3846#############################################################################
3847
3848package CFPlus::UI::Notebook;
3849
3850our @ISA = CFPlus::UI::VBox::;
3851
3852sub new {
3853 my $class = shift;
3854
3855 my $self = $class->SUPER::new (
3856 buttonbar => (new CFPlus::UI::Buttonbar),
3857 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3858 # filter => # will be put between multiplexer and $self
3859 @_,
3860 );
3861
3862 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3863 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3864
3865 {
3866 Scalar::Util::weaken (my $wself = $self);
3867
3868 $self->{multiplexer}->connect (c_add => sub {
3869 my ($mplex, $widgets) = @_;
3870
3871 for my $child (@$widgets) {
3872 Scalar::Util::weaken $child;
3873 $child->{c_tab_} ||= do {
3874 my $tab =
3875 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3876 ? $child->{c_tab}
3877 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3878
3879 $tab->connect (activate => sub {
3880 $wself->set_current_page ($child);
3881 });
3882
3883 $tab
3884 };
3885
3886 $self->{buttonbar}->add ($child->{c_tab_});
3887 }
3888 });
3889
3890 $self->{multiplexer}->connect (c_remove => sub {
3891 my ($mplex, $widgets) = @_;
3892
3893 for my $child (@$widgets) {
3894 $wself->{buttonbar}->remove ($child->{c_tab_});
3895 }
3896 });
3897 }
3898
3899 $self
3900}
3901
3902sub add {
3903 my ($self, @widgets) = @_;
3904
3905 $self->{multiplexer}->add (@widgets)
3906}
3907
3908sub remove {
3909 my ($self, @widgets) = @_;
3910
3911 $self->{multiplexer}->remove (@widgets)
3912}
3913
3914sub pages {
3915 my ($self) = @_;
3916 $self->{multiplexer}->children
3917}
3918
3919sub add_tab {
3920 my ($self, $title, $widget, $tooltip) = @_;
3921
3922 $title = [$title, $tooltip] unless ref $title;
3923 $widget->{c_tab} = $title;
3924
3925 $self->add ($widget);
3926}
3927
3928sub get_current_page {
3929 my ($self) = @_;
3930
3931 $self->{multiplexer}->get_current_page
3932}
3933
3934sub set_current_page {
3935 my ($self, $page) = @_;
3936
3937 $self->{multiplexer}->set_current_page ($page);
3938 $self->emit (page_changed => $self->{multiplexer}{current});
3939}
3940
3941#############################################################################
3942
3943package CFPlus::UI::Selector;
3944
3945use utf8;
3946
3947our @ISA = CFPlus::UI::Button::;
3948
3949sub new {
3950 my $class = shift;
3951
3952 my $self = $class->SUPER::new (
3953 options => [], # [value, title, longdesc], ...
3954 value => undef,
3955 @_,
3956 );
3957
3958 $self->_set_value ($self->{value});
3959
3960 $self
3961}
3962
3963sub invoke_button_down {
3964 my ($self, $ev) = @_;
3965
3966 my @menu_items;
3967
3968 for (@{ $self->{options} }) {
3969 my ($value, $title, $tooltip) = @$_;
3970
3971 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3972 }
3973
3974 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3975}
3976
3977sub _set_value {
3978 my ($self, $value) = @_;
3979
3980 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3981 or return;
3982
3983 $self->{value} = $item->[0];
3984 $self->set_markup ("$item->[1] ⇓");
3985 $self->set_tooltip ($item->[2]);
3986}
3987
3988sub set_value {
3989 my ($self, $value) = @_;
3990
3991 return unless $self->{value} ne $value;
3992
3993 $self->_set_value ($value);
3994 $self->emit (changed => $value);
3995}
3996
3997#############################################################################
3998
3999package CFPlus::UI::Statusbox;
4000
4001our @ISA = CFPlus::UI::VBox::;
4002
4003sub new {
4004 my $class = shift;
4005
4006 my $self = $class->SUPER::new (
2908 fontsize => 0.8, 4007 fontsize => 0.8,
2909 @_, 4008 @_,
2910 ) 4009 );
4010
4011 CFPlus::weaken (my $this = $self);
4012
4013 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
4014
4015 $self
2911} 4016}
2912 4017
2913sub reorder { 4018sub reorder {
2914 my ($self) = @_; 4019 my ($self) = @_;
2915 my $NOW = time; 4020 my $NOW = Time::HiRes::time;
4021
4022 # freeze display when hovering over any label
4023 return if $CFPlus::UI::TOOLTIP->{owner}
4024 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4025 values %{ $self->{item} };
2916 4026
2917 while (my ($k, $v) = each %{ $self->{item} }) { 4027 while (my ($k, $v) = each %{ $self->{item} }) {
2918 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4028 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2919 } 4029 }
2920 4030
… …
2923 my @items = sort { 4033 my @items = sort {
2924 $a->{pri} <=> $b->{pri} 4034 $a->{pri} <=> $b->{pri}
2925 or $b->{id} <=> $a->{id} 4035 or $b->{id} <=> $a->{id}
2926 } values %{ $self->{item} }; 4036 } values %{ $self->{item} };
2927 4037
4038 $self->{timer}->interval (1);
4039
2928 my $count = 10 + 1; 4040 my $count = 10 + 1;
2929 for my $item (@items) { 4041 for my $item (@items) {
2930 last unless --$count; 4042 last unless --$count;
2931 4043
2932 push @widgets, $item->{label} ||= do { 4044 my $label = $item->{label} ||= do {
2933 # TODO: doesn't handle markup well (read as: at all) 4045 # TODO: doesn't handle markup well (read as: at all)
2934 my $short = $item->{count} > 1 4046 my $short = $item->{count} > 1
2935 ? "<b>$item->{count} ×</b> $item->{text}" 4047 ? "<b>$item->{count} ×</b> $item->{text}"
2936 : $item->{text}; 4048 : $item->{text};
2937 4049
2938 for ($short) { 4050 for ($short) {
2939 s/^\s+//; 4051 s/^\s+//;
2940 s/\s+/ /g; 4052 s/\s+/ /g;
2941 } 4053 }
2942 4054
2943 new CFClient::UI::Label 4055 new CFPlus::UI::Label
2944 markup => $short, 4056 markup => $short,
2945 tooltip => $item->{tooltip}, 4057 tooltip => $item->{tooltip},
2946 tooltip_font => $::FONT_PROP, 4058 tooltip_font => $::FONT_PROP,
2947 tooltip_width => 0.67, 4059 tooltip_width => 0.67,
2948 fontsize => $item->{fontsize} || $self->{fontsize}, 4060 fontsize => $item->{fontsize} || $self->{fontsize},
2949 max_w => $::WIDTH * 0.44, 4061 max_w => $::WIDTH * 0.44,
2950 fg => $item->{fg}, 4062 fg => [@{ $item->{fg} }],
2951 can_events => 1, 4063 can_events => 1,
2952 can_hover => 1 4064 can_hover => 1
2953 }; 4065 };
4066
4067 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4068 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4069 $label->update;
4070 $label->set_max_size (undef, $label->{req_h} * $diff)
4071 if $diff < 1;
4072 $self->{timer}->interval (1/30);
4073 } else {
4074 $label->{fg}[3] = $item->{fg}[3] || 1;
4075 }
4076
4077 push @widgets, $label;
2954 } 4078 }
2955 4079
2956 $self->clear; 4080 $self->clear;
2957 $self->SUPER::add (reverse @widgets); 4081 $self->SUPER::add (reverse @widgets);
2958} 4082}
… …
2963 $text =~ s/^\s+//; 4087 $text =~ s/^\s+//;
2964 $text =~ s/\s+$//; 4088 $text =~ s/\s+$//;
2965 4089
2966 return unless $text; 4090 return unless $text;
2967 4091
2968 my $timeout = time + ((delete $arg{timeout}) || 60); 4092 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2969 4093
2970 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4094 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2971 4095
2972 if (my $item = $self->{item}{$group}) { 4096 if (my $item = $self->{item}{$group}) {
2973 if ($item->{text} eq $text) { 4097 if ($item->{text} eq $text) {
2974 $item->{count}++; 4098 $item->{count}++;
2975 } else { 4099 } else {
2976 $item->{count} = 1; 4100 $item->{count} = 1;
2977 $item->{text} = $item->{tooltip} = $text; 4101 $item->{text} = $item->{tooltip} = $text;
2978 } 4102 }
2979 $item->{id} = ++$self->{id}; 4103 $item->{id} += 0.2;#d#
2980 $item->{timeout} = $timeout; 4104 $item->{timeout} = $timeout;
2981 delete $item->{label}; 4105 delete $item->{label};
2982 } else { 4106 } else {
2983 $self->{item}{$group} = { 4107 $self->{item}{$group} = {
2984 id => ++$self->{id}, 4108 id => ++$self->{id},
… …
2990 count => 1, 4114 count => 1,
2991 %arg, 4115 %arg,
2992 }; 4116 };
2993 } 4117 }
2994 4118
4119 $ROOT->on_refresh (reorder => sub {
2995 $self->reorder; 4120 $self->reorder;
4121 });
2996} 4122}
2997 4123
2998sub reconfigure { 4124sub reconfigure {
2999 my ($self) = @_; 4125 my ($self) = @_;
3000 4126
… …
3003 4129
3004 $self->reorder; 4130 $self->reorder;
3005 $self->SUPER::reconfigure; 4131 $self->SUPER::reconfigure;
3006} 4132}
3007 4133
4134sub destroy {
4135 my ($self) = @_;
4136
4137 $self->{timer}->cancel;
4138
4139 $self->SUPER::destroy;
4140}
4141
3008############################################################################# 4142#############################################################################
3009 4143
3010package CFClient::UI::Root; 4144package CFPlus::UI::Root;
3011 4145
3012our @ISA = CFClient::UI::Container::; 4146our @ISA = CFPlus::UI::Container::;
3013 4147
4148use List::Util qw(min max);
4149
3014use CFClient::OpenGL; 4150use CFPlus::OpenGL;
3015 4151
3016sub new { 4152sub new {
3017 my $class = shift; 4153 my $class = shift;
3018 4154
3019 my $self = $class->SUPER::new ( 4155 my $self = $class->SUPER::new (
3020 visible => 1, 4156 visible => 1,
3021 @_, 4157 @_,
3022 ); 4158 );
3023 4159
3024 Scalar::Util::weaken ($self->{root} = $self); 4160 CFPlus::weaken ($self->{root} = $self);
3025 4161
3026 $self 4162 $self
3027} 4163}
3028 4164
3029sub size_request { 4165sub size_request {
… …
3044 $coord = $max - $size if $coord > $max - $size; 4180 $coord = $max - $size if $coord > $max - $size;
3045 4181
3046 int $coord + 0.5 4182 int $coord + 0.5
3047} 4183}
3048 4184
3049sub size_allocate { 4185sub invoke_size_allocate {
3050 my ($self, $w, $h) = @_; 4186 my ($self, $w, $h) = @_;
3051 4187
3052 for my $child ($self->children) { 4188 for my $child ($self->children) {
3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4189 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054 4190
… …
3058 $X = _to_pixel $X, $W, $self->{w}; 4194 $X = _to_pixel $X, $W, $self->{w};
3059 $Y = _to_pixel $Y, $H, $self->{h}; 4195 $Y = _to_pixel $Y, $H, $self->{h};
3060 4196
3061 $child->configure ($X, $Y, $W, $H); 4197 $child->configure ($X, $Y, $W, $H);
3062 } 4198 }
4199
4200 1
3063} 4201}
3064 4202
3065sub coord2local { 4203sub coord2local {
3066 my ($self, $x, $y) = @_; 4204 my ($self, $x, $y) = @_;
3067 4205
… …
3075} 4213}
3076 4214
3077sub update { 4215sub update {
3078 my ($self) = @_; 4216 my ($self) = @_;
3079 4217
3080 $::WANT_REFRESH++; 4218 $::WANT_REFRESH->start;
3081} 4219}
3082 4220
3083sub add { 4221sub add {
3084 my ($self, @children) = @_; 4222 my ($self, @children) = @_;
3085 4223
… …
3122 while ($self->{refresh_hook}) { 4260 while ($self->{refresh_hook}) {
3123 $_->() 4261 $_->()
3124 for values %{delete $self->{refresh_hook}}; 4262 for values %{delete $self->{refresh_hook}};
3125 } 4263 }
3126 4264
3127 if ($self->{realloc}) { 4265 while ($self->{realloc}) {
4266 my %queue;
3128 my @queue; 4267 my @queue;
4268 my $widget;
3129 4269
4270 outer:
3130 while () { 4271 while () {
3131 if ($self->{realloc}) { 4272 if (my $realloc = delete $self->{realloc}) {
3132 #TODO use array-of-depth approach 4273 for $widget (values %$realloc) {
4274 $widget->{visible} or next; # do not resize invisible widgets
3133 4275
3134 use sort 'stable'; 4276 $queue{$widget+0}++ and next; # duplicates are common
3135 4277
3136 @queue = sort { $a->{visible} <=> $b->{visible} } 4278 push @{ $queue[$widget->{visible}] }, $widget;
3137 @queue, values %{delete $self->{realloc}}; 4279 }
3138 } 4280 }
3139 4281
4282 while () {
4283 @queue or last outer;
4284
3140 my $widget = pop @queue || last; 4285 $widget = pop @{ $queue[-1] || [] }
4286 and last;
4287
4288 pop @queue;
4289 }
3141 4290
3142 $widget->{visible} or last; # do not resize invisible widgets 4291 delete $queue{$widget+0};
3143 4292
3144 my ($w, $h) = $widget->size_request; 4293 my ($w, $h) = $widget->size_request;
3145 4294
3146 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4295 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4296 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4297
4298 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4299 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3148 4300
3149 $w = $widget->{force_w} if exists $widget->{force_w}; 4301 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h}; 4302 $h = $widget->{force_h} if exists $widget->{force_h};
3151 4303
3152 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4304 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3155 $widget->{req_h} = $h; 4307 $widget->{req_h} = $h;
3156 4308
3157 $self->{size_alloc}{$widget+0} = $widget; 4309 $self->{size_alloc}{$widget+0} = $widget;
3158 4310
3159 if (my $parent = $widget->{parent}) { 4311 if (my $parent = $widget->{parent}) {
3160 $self->{realloc}{$parent+0} = $parent; 4312 $self->{realloc}{$parent+0} = $parent
3161 #unshift @queue, $parent; 4313 unless $queue{$parent+0};
4314
3162 $parent->{force_size_alloc} = 1; 4315 $parent->{force_size_alloc} = 1;
3163 $self->{size_alloc}{$parent+0} = $parent; 4316 $self->{size_alloc}{$parent+0} = $parent;
3164 } 4317 }
3165 } 4318 }
3166 4319
3167 delete $self->{realloc}{$widget+0}; 4320 delete $self->{realloc}{$widget+0};
3168 } 4321 }
3169 }
3170 4322
3171 while (my $size_alloc = delete $self->{size_alloc}) { 4323 while (my $size_alloc = delete $self->{size_alloc}) {
3172 my @queue = sort { $b->{visible} <=> $a->{visible} } 4324 my @queue = sort { $a->{visible} <=> $b->{visible} }
3173 values %$size_alloc; 4325 values %$size_alloc;
3174 4326
3175 while () { 4327 while () {
3176 my $widget = pop @queue || last; 4328 my $widget = pop @queue || last;
3177 4329
3178 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4330 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3179 4331
3180 $w = 0 if $w < 0; 4332 $w = max $widget->{min_w}, $w;
3181 $h = 0 if $h < 0; 4333 $h = max $widget->{min_h}, $h;
3182 4334
4335# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4336# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4337
4338 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4339 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4340
3183 $w = int $w + 0.5; 4341 $w = int $w + 0.5;
3184 $h = int $h + 0.5; 4342 $h = int $h + 0.5;
3185 4343
3186 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4344 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4345 $widget->{old_w} = $widget->{w};
4346 $widget->{old_h} = $widget->{h};
4347
3187 $widget->{w} = $w; 4348 $widget->{w} = $w;
3188 $widget->{h} = $h; 4349 $widget->{h} = $h;
3189 4350
3190 $widget->emit (size_allocate => $w, $h); 4351 $widget->emit (size_allocate => $w, $h);
4352 }
3191 } 4353 }
3192 } 4354 }
3193 } 4355 }
3194 4356
3195 while ($self->{post_alloc_hook}) { 4357 while ($self->{post_alloc_hook}) {
3196 $_->() 4358 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 4359 for values %{delete $self->{post_alloc_hook}};
3198 } 4360 }
3199
3200 4361
3201 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4362 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4363 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3203 glClear GL_COLOR_BUFFER_BIT; 4364 glClear GL_COLOR_BUFFER_BIT;
3204 4365
… …
3206 glLoadIdentity; 4367 glLoadIdentity;
3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4368 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3208 glMatrixMode GL_MODELVIEW; 4369 glMatrixMode GL_MODELVIEW;
3209 glLoadIdentity; 4370 glLoadIdentity;
3210 4371
4372 {
4373 package CFPlus::UI::Base;
4374
4375 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4376 (0, 0, $self->{w}, $self->{h});
4377
3211 $self->_draw; 4378 $self->_draw;
4379 }
3212} 4380}
3213 4381
3214############################################################################# 4382#############################################################################
3215 4383
3216package CFClient::UI::SpellList;
3217
3218our @ISA = CFClient::UI::FancyFrame::;
3219
3220sub new {
3221 my $class = shift;
3222
3223 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3224
3225 $self->add (new CFClient::UI::ScrolledWindow
3226 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3227
3228 $self;
3229}
3230
3231# XXX: Do sorting? Argl...
3232sub add_spell {
3233 my ($self, $spell) = @_;
3234 $self->{spells}->{$spell->{name}} = $spell;
3235
3236 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3237 face => $spell->{face},
3238 can_hover => 1,
3239 can_events => 1,
3240 tooltip => $spell->{message});
3241
3242 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3243 text => $spell->{name},
3244 can_hover => 1,
3245 can_events => 1,
3246 tooltip => $spell->{message},
3247 expand => 1);
3248
3249 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3251 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3252 expand => 1);
3253
3254 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3255 text => "bind to key",
3256 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3257}
3258
3259sub rebuild_spell_list {
3260 my ($self) = @_;
3261 $self->{tbl_idx} = 0;
3262 $self->add_spell ($_) for values %{$self->{spells}};
3263}
3264
3265sub remove_spell {
3266 my ($self, $spell) = @_;
3267 delete $self->{spells}->{$spell->{name}};
3268 $self->rebuild_spell_list;
3269}
3270
3271#############################################################################
3272
3273package CFClient::UI::BindEditor;
3274
3275our @ISA = CFClient::UI::FancyFrame::;
3276
3277sub new {
3278 my $class = shift;
3279
3280 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3281
3282 $self->add (my $vb = new CFClient::UI::VBox);
3283
3284
3285 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3286 text => "start recording",
3287 tooltip => "Start/Stops recording of actions."
3288 ."All subsequent actions after the recording started will be captured."
3289 ."The actions are displayed after the record was stopped."
3290 ."To bind the action you have to click on the 'Bind' button",
3291 on_activate => sub {
3292 unless ($self->{recording}) {
3293 $self->start;
3294 } else {
3295 $self->stop;
3296 }
3297 });
3298
3299 $vb->add (new CFClient::UI::Label text => "Actions:");
3300 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3301
3302 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3305 $hb->add (new CFClient::UI::Button
3306 text => "bind",
3307 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3308 on_activate => sub {
3309 $self->ask_for_bind;
3310 });
3311
3312 $vb->add (my $hb = new CFClient::UI::HBox);
3313 $hb->add (new CFClient::UI::Button
3314 text => "ok",
3315 expand => 1,
3316 tooltip => "This closes the binding editor and saves the binding",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->commit;
3320 });
3321
3322 $hb->add (new CFClient::UI::Button
3323 text => "cancel",
3324 expand => 1,
3325 tooltip => "This closes the binding editor without saving",
3326 on_activate => sub {
3327 $self->hide;
3328 $self->{binding_cancel}->()
3329 if $self->{binding_cancel};
3330 });
3331
3332 $self->update_binding_widgets;
3333
3334 $self
3335}
3336
3337sub commit {
3338 my ($self) = @_;
3339 my ($mod, $sym, $cmds) = $self->get_binding;
3340 if ($sym != 0 && @$cmds > 0) {
3341 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3342 ."'. Don't forget 'Save Config'!");
3343 $self->{binding_change}->($mod, $sym, $cmds)
3344 if $self->{binding_change};
3345 } else {
3346 $::STATUSBOX->add ("No action bound, no key or action specified!");
3347 $self->{binding_cancel}->()
3348 if $self->{binding_cancel};
3349 }
3350}
3351
3352sub start {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("stop recording");
3356 $self->{recording} = 1;
3357 $self->clear_command_list;
3358 $::CONN->start_record if $::CONN;
3359}
3360
3361sub stop {
3362 my ($self) = @_;
3363
3364 $self->{rec_btn}->set_text ("start recording");
3365 $self->{recording} = 0;
3366
3367 my $rec;
3368 $rec = $::CONN->stop_record if $::CONN;
3369 return unless ref $rec eq 'ARRAY';
3370 $self->set_command_list ($rec);
3371}
3372
3373# if $commit is true, the binding will be set after the user entered a key combo
3374sub ask_for_bind {
3375 my ($self, $commit) = @_;
3376
3377 CFClient::Binder::open_binding_dialog (sub {
3378 my ($mod, $sym) = @_;
3379 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3380 $self->update_binding_widgets;
3381 $self->commit if $commit;
3382 });
3383}
3384
3385# $mod and $sym are the modifiers and key symbol
3386# $cmds is a array ref of strings (the commands)
3387# $cb is the callback that is executed on OK
3388# $ccb is the callback that is executed on CANCEL and
3389# when the binding was unsuccessful on OK
3390sub set_binding {
3391 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3392
3393 $self->clear_command_list;
3394 $self->{recording} = 0;
3395 $self->{rec_btn}->set_text ("start recording");
3396
3397 $self->{binding} = [$mod, $sym];
3398 $self->{commands} = $cmds;
3399
3400 $self->{binding_change} = $cb;
3401 $self->{binding_cancel} = $ccb;
3402
3403 $self->update_binding_widgets;
3404}
3405
3406# this is a shortcut method that asks for a binding
3407# and then just binds it.
3408sub do_quick_binding {
3409 my ($self, $cmds) = @_;
3410 $self->set_binding (undef, undef, $cmds, sub {
3411 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3412 });
3413 $self->ask_for_bind (1);
3414}
3415
3416sub update_binding_widgets {
3417 my ($self) = @_;
3418 my ($mod, $sym, $cmds) = $self->get_binding;
3419 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3420 $self->set_command_list ($cmds);
3421}
3422
3423sub get_binding {
3424 my ($self) = @_;
3425 return (
3426 $self->{binding}->[0],
3427 $self->{binding}->[1],
3428 [ grep { defined $_ } @{$self->{commands}} ]
3429 );
3430}
3431
3432sub clear_command_list {
3433 my ($self) = @_;
3434 $self->{cmdbox}->clear ();
3435}
3436
3437sub set_command_list {
3438 my ($self, $cmds) = @_;
3439
3440 $self->{cmdbox}->clear ();
3441 $self->{commands} = $cmds;
3442
3443 my $idx = 0;
3444
3445 for (@$cmds) {
3446 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3447
3448 my $i = $idx;
3449 $hb->add (new CFClient::UI::Label text => $_);
3450 $hb->add (new CFClient::UI::Button
3451 text => "delete",
3452 tooltip => "Deletes the action from the record",
3453 on_activate => sub {
3454 $self->{cmdbox}->remove ($hb);
3455 $cmds->[$i] = undef;
3456 });
3457
3458
3459 $idx++
3460 }
3461}
3462
3463#############################################################################
3464
3465package CFClient::UI; 4384package CFPlus::UI;
3466 4385
3467$ROOT = new CFClient::UI::Root; 4386$ROOT = new CFPlus::UI::Root;
3468$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4387$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3469 4388
34701 43891
3471 4390

Diff Legend

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