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.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.411 by root, Sun Jul 22 19:34:59 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 { __widget_ref__ => $_[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 map $_+0, @widgets
683} 731}
684 732
685sub children { 733sub children {
686 @{ $_[0]{children} } 734 @{ $_[0]{children} }
687} 735}
… …
698} 746}
699 747
700sub clear { 748sub clear {
701 my ($self) = @_; 749 my ($self) = @_;
702 750
703 my $children = delete $self->{children}; 751 my $children = $self->{children};
704 $self->{children} = []; 752 $self->{children} = [];
705 753
706 for (@$children) { 754 for (@$children) {
707 delete $_->{parent}; 755 delete $_->{parent};
708 $_->hide; 756 $_->hide;
… …
717 $x -= $self->{x}; 765 $x -= $self->{x};
718 $y -= $self->{y}; 766 $y -= $self->{y};
719 767
720 my $res; 768 my $res;
721 769
722 for (reverse @{ $self->{children} }) { 770 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 771 $res = $_->find_widget ($x, $y)
724 and return $res; 772 and return $res;
725 } 773 }
726 774
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 775 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
733 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
734} 782}
735 783
736############################################################################# 784#############################################################################
737 785
738package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
739 787
740our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
741 789
742sub new { 790sub new {
743 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
744 792
745 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
746 794
747 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
748} 796}
749 797
750sub add { 798sub add {
751 my ($self, $child) = @_; 799 my ($self, $child) = @_;
752 800
753 $self->{children} = []; 801 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 802 $self->SUPER::add ($child);
756} 803}
757 804
758sub remove { 805sub remove {
759 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
760 807
761 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
762 809
763 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
764 unless @{$self->{children}}; 811 unless @{$self->{children}};
765} 812}
766 813
767sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
768 815
769sub size_request { 816sub size_request {
770 $_[0]{children}[0]->size_request 817 $_[0]{children}[0]->size_request
771} 818}
772 819
773sub size_allocate { 820sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
775 822
776 $self->{children}[0]->configure (0, 0, $w, $h); 823 $self->{children}[0]->configure (0, 0, $w, $h);
824
825 1
777} 826}
778 827
779############################################################################# 828#############################################################################
780 829
830# back-buffered drawing area
831
781package CFClient::UI::Window; 832package CFPlus::UI::Window;
782 833
783our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
784 835
785use CFClient::OpenGL; 836use CFPlus::OpenGL;
786 837
787sub new { 838sub new {
788 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
789 840
790 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
795 846
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 847 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 848 $self->SUPER::update;
798} 849}
799 850
800sub size_allocate { 851sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 852 my ($self, $w, $h) = @_;
802 853
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 854 $self->update;
855
856 $self->SUPER::invoke_size_allocate ($w, $h)
805} 857}
806 858
807sub _render { 859sub _render {
860 my ($self) = @_;
861
808 $_[0]{children}[0]->draw; 862 $self->{children}[0]->draw;
809} 863}
810 864
811sub render_child { 865sub render_child {
812 my ($self) = @_; 866 my ($self) = @_;
813 867
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
817 871
872 {
873 package CFPlus::UI::Base;
874
875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
876 (0, 0, $self->{w}, $self->{h});
877
818 $self->_render; 878 $self->_render;
879 }
819 }; 880 };
820} 881}
821 882
822sub _draw { 883sub _draw {
823 my ($self) = @_; 884 my ($self) = @_;
824
825 my ($w, $h) = ($self->w, $self->h);
826 885
827 my $tex = $self->{texture} 886 my $tex = $self->{texture}
828 or return; 887 or return;
829 888
830 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 891 glColor 0, 0, 0, 1;
833 892
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
835 894
836 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
837} 896}
838 897
839############################################################################# 898#############################################################################
840 899
841package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
842 901
902use List::Util qw(min max);
903
843our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
844 905
845sub new { 906sub new {
846 my $class = shift; 907 my $class = shift;
847 908
848 $class->SUPER::new ( 909 $class->SUPER::new (
… …
855sub size_request { 916sub size_request {
856 my ($self) = @_; 917 my ($self) = @_;
857 918
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859 920
860 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
862 923
863 ($w, $h) 924 ($w, $h)
864} 925}
865 926
866sub size_allocate { 927sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 928 my ($self, $w, $h) = @_;
868 929
869 my $child = $self->child; 930 my $child = $self->child;
870 931
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 932 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 933 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 934
874 $self->child->configure (0, 0, $w, $h); 935 $self->child->configure (0, 0, $w, $h);
875 $self->update; 936 $self->update;
937
938 1
876} 939}
877 940
878sub set_offset { 941sub set_offset {
879 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
880 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
881 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
882 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
883 950
951 $self->emit (changed => $x, $y);
884 $self->update; 952 $self->update;
953 }
885} 954}
886 955
887# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local { 957sub coord2local {
889 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
904 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
905 974
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) { 977 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else { 979 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
912 } 981 }
913} 982}
914 983
915sub _render { 984sub _render {
916 my ($self) = @_; 985 my ($self) = @_;
917 986
987 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
989
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 991
920 $self->SUPER::_render; 992 $self->SUPER::_render;
921} 993}
922 994
923############################################################################# 995#############################################################################
924 996
925package CFClient::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
926 998
927our @ISA = CFClient::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
928 1000
929sub new { 1001sub new {
930 my $class = shift; 1002 my ($class, %arg) = @_;
1003
1004 my $child = delete $arg{child};
931 1005
932 my $self; 1006 my $self;
933 1007
934 my $slider = new CFClient::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
935 vertical => 1, 1022 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub { 1024 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
939 }, 1027 },
940 ; 1028 ;
941 1029
942 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1033 can_events => 1,
944 slider => $slider, 1034 hslider => $hslider,
945 @_, 1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
1038 %arg,
946 ); 1039 );
947 1040
948 $self->{vp}->add ($self->{scrolled}); 1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
949 $self->add ($self->{vp}); 1062 $self->SUPER::add ($self->{vp});
950 $self->add ($self->{slider}); 1063
1064 $self->add ($child) if $child;
951 1065
952 $self 1066 $self
953} 1067}
954 1068
1069sub add {
1070 my ($self, $widget) = @_;
1071
1072 $self->{vp}->add ($self->{child} = $widget);
1073}
1074
955sub update { 1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
956 my ($self) = @_; 1106 my ($self, $ev) = @_;
957 1107
958 $self->SUPER::update; 1108 $self->grab_focus;
959 1109
960 # todo: overwrite size_allocate of child 1110 my $ox = $self->{vp}{view_x};
961 my $child = $self->{vp}->child; 1111 my $oy = $self->{vp}{view_y};
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1112
963} 1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
964 1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1123sub invoke_mouse_wheel {
1124 my ($self, $ev) = @_;
1125
1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1128
1129 1
1130}
1131
1132sub invoke_button_down {
1133 my ($self, $ev, $x, $y) = @_;
1134
1135 if ($ev->{button} == 2) {
1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1139
1140 0
1141}
1142
1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1145
1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1162}
1163
965sub size_allocate { 1164sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
967 1166
1167 $self->update_slider;
968 $self->SUPER::size_allocate ($w, $h); 1168 $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} 1169}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1170
977############################################################################# 1171#############################################################################
978 1172
979package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
980 1174
981our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
982 1176
983use CFClient::OpenGL; 1177use CFPlus::OpenGL;
984 1178
985sub new { 1179sub new {
986 my $class = shift; 1180 my $class = shift;
987 1181
988 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
996 1190
997 if ($self->{bg}) { 1191 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1192 my ($w, $h) = @$self{qw(w h)};
999 1193
1000 glEnable GL_BLEND; 1194 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1196 glColor_premultiply @{ $self->{bg} };
1003 1197
1004 glBegin GL_QUADS; 1198 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1199 glVertex 0 , 0;
1006 glVertex 0 , $h; 1200 glVertex 0 , $h;
1007 glVertex $w, $h; 1201 glVertex $w, $h;
… …
1014 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1015} 1209}
1016 1210
1017############################################################################# 1211#############################################################################
1018 1212
1019package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
1020 1214
1021our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1022 1216
1023use CFClient::OpenGL; 1217use CFPlus::OpenGL;
1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
1229
1230 my $self = $class->SUPER::new (
1231 # label => "",
1232 fg => [0.6, 0.3, 0.1],
1233 border => 0.8,
1234 style => 'single',
1235 %arg,
1236 );
1237
1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1246}
1247
1248sub border {
1249 int $_[0]{border} * $::FONTSIZE
1250}
1251
1252sub size_request {
1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
1257
1258 my ($w, $h) = $self->SUPER::size_request;
1259
1260 (
1261 $w + $self->border * 2,
1262 $h + $self->border * 2,
1263 )
1264}
1265
1266sub invoke_size_allocate {
1267 my ($self, $w, $h) = @_;
1268
1269 my $border = $self->border;
1270
1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
1273
1274 if (my $label = $self->{label}) {
1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
1279
1280 $self->child->configure ($border, $border, $w, $h);
1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1024 1318
1025my $bg = 1319my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1028 1322
1029my @border = 1323my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1324 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); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1330
1033sub new { 1331sub new {
1034 my $class = shift; 1332 my ($class, %arg) = @_;
1035 1333
1036 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1336 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1337 border => 0.6,
1040 can_events => 1, 1338 can_events => 1,
1041 min_w => 16, 1339 min_w => 64,
1042 min_h => 16, 1340 min_h => 32,
1043 @_ 1341 %arg,
1044 ); 1342 );
1045 1343
1046 $self->{title} &&= new CFClient::UI::Label 1344 $self->{title_widget} = new CFPlus::UI::Label
1047 align => 0, 1345 align => 0,
1048 valign => 1, 1346 valign => 1,
1049 text => $self->{title}, 1347 text => $self->{title},
1050 fontsize => $self->{border}; 1348 fontsize => $self->{border},
1349 if exists $self->{title};
1350
1351 if ($self->{has_close_button}) {
1352 $self->{close_button} =
1353 new CFPlus::UI::ImageButton
1354 path => 'x1_close.png',
1355 on_activate => sub { $self->emit ("delete") };
1356
1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1358 }
1051 1359
1052 $self 1360 $self
1361}
1362
1363sub add {
1364 my ($self, @widgets) = @_;
1365
1366 $self->SUPER::add (@widgets);
1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1369}
1054 1370
1055sub border { 1371sub border {
1056 int $_[0]{border} * $::FONTSIZE 1372 int $_[0]{border} * $::FONTSIZE
1057} 1373}
1058 1374
1059sub size_request { 1375sub size_request {
1060 my ($self) = @_; 1376 my ($self) = @_;
1377
1378 $self->{title_widget}->size_request
1379 if $self->{title_widget};
1380
1381 $self->{close_button}->size_request
1382 if $self->{close_button};
1061 1383
1062 my ($w, $h) = $self->SUPER::size_request; 1384 my ($w, $h) = $self->SUPER::size_request;
1063 1385
1064 ( 1386 (
1065 $w + $self->border * 2, 1387 $w + $self->border * 2,
1066 $h + $self->border * 2, 1388 $h + $self->border * 2,
1067 ) 1389 )
1068} 1390}
1069 1391
1070sub size_allocate { 1392sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1072 1394
1395 if ($self->{title_widget}) {
1396 $self->{title_widget}{w} = $w;
1397 $self->{title_widget}{h} = $h;
1398 $self->{title_widget}->invoke_size_allocate ($w, $h);
1399 }
1400
1401 my $border = $self->border;
1402
1073 $h -= List::Util::max 0, $self->border * 2; 1403 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1404 $w -= List::Util::max 0, $border * 2;
1075 1405
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); 1406 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1407
1408 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1409 if $self->{close_button};
1410
1411 1
1412}
1413
1414sub invoke_delete {
1415 my ($self) = @_;
1416
1417 $self->hide;
1418
1419 1
1420}
1421
1082sub button_down { 1422sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1423 my ($self, $ev, $x, $y) = @_;
1084 1424
1085 my ($w, $h) = @$self{qw(w h)}; 1425 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1426 my $border = $self->border;
1087 1427
… …
1103 my $dy = $ev->{y} - $oy; 1443 my $dy = $ev->{y} - $oy;
1104 1444
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1445 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1446 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1447
1448 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1449 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1450 };
1111 1451
1112 } elsif ($lr ^ $td) { 1452 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1453 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1454 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1457 my ($ev, $x, $y) = @_;
1118 1458
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1459 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1460
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1461 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1462 # HACK: the next line is required to enforce placement
1463 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1464 };
1465 } else {
1466 return 0;
1467 }
1468
1123 } 1469 1
1124} 1470}
1125 1471
1126sub button_up { 1472sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1473 my ($self, $ev, $x, $y) = @_;
1128 1474
1129 delete $self->{motion}; 1475 ! ! delete $self->{motion}
1130} 1476}
1131 1477
1132sub mouse_motion { 1478sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1479 my ($self, $ev, $x, $y) = @_;
1134 1480
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1482
1483 ! ! $self->{motion}
1484}
1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
1136} 1492}
1137 1493
1138sub _draw { 1494sub _draw {
1139 my ($self) = @_; 1495 my ($self) = @_;
1140 1496
1497 my $child = $self->{children}[0];
1498
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1499 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1500 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1501
1144 glEnable GL_TEXTURE_2D; 1502 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1504
1147 my $border = $self->border; 1505 my $border = $self->border;
1148 1506
1149 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1150 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1154 1526
1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1157 1529
1158 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1534 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1535 }
1164 1536
1165 glDisable GL_TEXTURE_2D; 1537 glDisable GL_TEXTURE_2D;
1166 1538
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1539 $child->draw;
1540
1541 if ($self->{title_widget}) {
1542 glTranslate 0, $border - $self->{h};
1543 $self->{title_widget}->_draw;
1544
1545 glTranslate 0, - ($border - $self->{h});
1546 }
1547
1548 $self->{close_button}->draw
1549 if $self->{close_button};
1170} 1550}
1171 1551
1172############################################################################# 1552#############################################################################
1173 1553
1174package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1175 1555
1176our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1177 1557
1178use List::Util qw(max sum); 1558use List::Util qw(max sum);
1179 1559
1180use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1181 1561
1182sub new { 1562sub new {
1183 my $class = shift; 1563 my $class = shift;
1184 1564
1185 $class->SUPER::new ( 1565 $class->SUPER::new (
1186 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1187 @_, 1568 @_,
1188 ) 1569 )
1189} 1570}
1190 1571
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1193}
1194
1195sub add { 1572sub 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) = @_; 1573 my ($self, @widgets) = @_;
1574
1575 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1579
1580 $self->SUPER::add (@widgets);
1581}
1582
1583sub add_at {
1584 my $self = shift;
1585
1586 my @widgets;
1587
1588 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1590
1591 $child->{row} = $row;
1592 $child->{col} = $col;
1593
1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1601 my ($self) = @_;
1602
1603 my (@w, @h);
1207 1604
1208 my @children = $self->children; 1605 my @children = $self->children;
1209 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1210 1616 }
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215 1617
1216 $self->realloc; 1618 # second pass, rows
1217} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{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)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1232 1621
1233 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1234 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1235 } 1626 }
1236 } 1627 }
1237 1628
1238 (\@w, \@h) 1629 (\@w, \@h)
1239} 1630}
… …
1247 (sum @$ws), 1638 (sum @$ws),
1248 (sum @$hs), 1639 (sum @$hs),
1249 ) 1640 )
1250} 1641}
1251 1642
1252sub size_allocate { 1643sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1644 my ($self, $w, $h) = @_;
1254 1645
1255 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1256 1647
1257 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1258 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1259 1650
1260 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1261 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1262 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1263 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1264 1655
1265 # linearly scale sizes
1266 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1267 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1268 1657
1269 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1270 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1271 1667
1272 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1273 1670
1274 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1275 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1276 or next;
1277 1673
1278 my $x = 0; 1674 $widget->configure (
1279 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1280 1677 );
1281 for my $c (0 .. $#$row) { 1678 }
1282 my $col_w = $ws->[$c];
1283 1679
1284 if (my $widget = $row->[$c]) { 1680 1
1285 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1286 }
1287 1682
1288 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub _scale($$$) {
1692 my ($rel, $val, $max) = @_;
1693
1694 $rel ? $val * $max : $val
1695}
1696
1697sub size_request {
1698 my ($self) = @_;
1699
1700 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1701
1702 # determine overall size by querying abs widgets
1703 for my $child ($self->visible_children) {
1704 unless ($child->{c_rel}) {
1705 my $x = $child->{c_x};
1706 my $y = $child->{c_y};
1707
1708 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1709 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1289 } 1710 }
1290
1291 $y += $row_h;
1292 } 1711 }
1293 1712
1294} 1713 my $W = $x2 - $x1;
1714 my $H = $y2 - $y1;
1295 1715
1296sub find_widget { 1716 # now layout remaining widgets
1717 for my $child ($self->visible_children) {
1718 if ($child->{c_rel}) {
1719 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1720 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1721
1722 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1723 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1724 }
1725 }
1726
1727 my $W = $x2 - $x1;
1728 my $H = $y2 - $y1;
1729
1730 ($W, $H)
1731}
1732
1733sub invoke_size_allocate {
1297 my ($self, $x, $y) = @_; 1734 my ($self, $W, $H) = @_;
1298 1735
1299 $x -= $self->{x}; 1736 for my $child ($self->visible_children) {
1300 $y -= $self->{y}; 1737 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1301 1739
1302 my $res; 1740 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h};
1303 1742
1304 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1743 $child->configure ($x, $y, $child->{req_w}, $child->{req_h});
1305 $res = $_->find_widget ($x, $y) 1744 }
1306 and return $res; 1745
1307 } 1746 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} 1747}
1319 1748
1320############################################################################# 1749#############################################################################
1321 1750
1322package CFClient::UI::Box; 1751package CFPlus::UI::Box;
1323 1752
1324our @ISA = CFClient::UI::Container::; 1753our @ISA = CFPlus::UI::Container::;
1325 1754
1326sub size_request { 1755sub size_request {
1327 my ($self) = @_; 1756 my ($self) = @_;
1328 1757
1329 $self->{vertical} 1758 $self->{vertical}
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1764 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1765 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1766 )
1338} 1767}
1339 1768
1340sub size_allocate { 1769sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1770 my ($self, $w, $h) = @_;
1342 1771
1343 my $space = $self->{vertical} ? $h : $w; 1772 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1773 my @children = $self->visible_children;
1345 1774
1346 my @req; 1775 my @req;
1347 1776
1348 if ($self->{homogeneous}) { 1777 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1778 @req = ($space / (@children || 1)) x @children;
1350 } else { 1779 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1780 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1781 my $req = List::Util::sum @req;
1353 1782
1354 if ($req > $space) { 1783 if ($req > $space) {
1355 # ah well, not enough space 1784 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1785 $_ *= $space / $req for @req;
1357 } else { 1786 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1787 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1788
1360 $space = ($space - $req) / $expand; # remaining space to give away 1789 $space = ($space - $req) / $expand; # remaining space to give away
1361 1790
1362 $req[$_] += $space * $children->[$_]{expand} 1791 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1792 for 0 .. $#children;
1364 } 1793 }
1365 } 1794 }
1366 1795
1367 CFClient::UI::harmonize \@req; 1796 CFPlus::UI::harmonize \@req;
1368 1797
1369 my $pos = 0; 1798 my $pos = 0;
1370 for (0 .. $#$children) { 1799 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1800 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1801 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1802
1374 $pos += $alloc; 1803 $pos += $alloc;
1375 } 1804 }
1376 1805
1377 1 1806 1
1378} 1807}
1379 1808
1380############################################################################# 1809#############################################################################
1381 1810
1382package CFClient::UI::HBox; 1811package CFPlus::UI::HBox;
1383 1812
1384our @ISA = CFClient::UI::Box::; 1813our @ISA = CFPlus::UI::Box::;
1385 1814
1386sub new { 1815sub new {
1387 my $class = shift; 1816 my $class = shift;
1388 1817
1389 $class->SUPER::new ( 1818 $class->SUPER::new (
… …
1392 ) 1821 )
1393} 1822}
1394 1823
1395############################################################################# 1824#############################################################################
1396 1825
1397package CFClient::UI::VBox; 1826package CFPlus::UI::VBox;
1398 1827
1399our @ISA = CFClient::UI::Box::; 1828our @ISA = CFPlus::UI::Box::;
1400 1829
1401sub new { 1830sub new {
1402 my $class = shift; 1831 my $class = shift;
1403 1832
1404 $class->SUPER::new ( 1833 $class->SUPER::new (
… …
1407 ) 1836 )
1408} 1837}
1409 1838
1410############################################################################# 1839#############################################################################
1411 1840
1412package CFClient::UI::Label; 1841package CFPlus::UI::Label;
1413 1842
1414our @ISA = CFClient::UI::DrawBG::; 1843our @ISA = CFPlus::UI::DrawBG::;
1415 1844
1416use CFClient::OpenGL; 1845use CFPlus::OpenGL;
1417 1846
1418sub new { 1847sub new {
1419 my ($class, %arg) = @_; 1848 my ($class, %arg) = @_;
1420 1849
1421 my $self = $class->SUPER::new ( 1850 my $self = $class->SUPER::new (
… …
1424 #active_bg => none 1853 #active_bg => none
1425 #font => default_font 1854 #font => default_font
1426 #text => initial text 1855 #text => initial text
1427 #markup => initial narkup 1856 #markup => initial narkup
1428 #max_w => maximum pixel width 1857 #max_w => maximum pixel width
1858 #style => 0, # render flags
1429 ellipsise => 3, # end 1859 ellipsise => 3, # end
1430 layout => (new CFClient::Layout), 1860 layout => (new CFPlus::Layout),
1431 fontsize => 1, 1861 fontsize => 1,
1432 align => -1, 1862 align => -1,
1433 valign => -1, 1863 valign => -1,
1434 padding_x => 2, 1864 padding_x => 2,
1435 padding_y => 2, 1865 padding_y => 2,
1436 can_events => 0, 1866 can_events => 0,
1437 %arg 1867 %arg
1438 ); 1868 );
1439 1869
1440 if (exists $self->{template}) { 1870 if (exists $self->{template}) {
1441 my $layout = new CFClient::Layout; 1871 my $layout = new CFPlus::Layout;
1442 $layout->set_text (delete $self->{template}); 1872 $layout->set_text (delete $self->{template});
1443 $self->{template} = $layout; 1873 $self->{template} = $layout;
1444 } 1874 }
1445 1875
1446 if (exists $self->{markup}) { 1876 if (exists $self->{markup}) {
… …
1450 } 1880 }
1451 1881
1452 $self 1882 $self
1453} 1883}
1454 1884
1455sub escape($) {
1456 local $_ = $_[0];
1457
1458 s/&/&amp;/g;
1459 s/>/&gt;/g;
1460 s/</&lt;/g;
1461
1462 $_
1463}
1464
1465sub update { 1885sub update {
1466 my ($self) = @_; 1886 my ($self) = @_;
1467 1887
1468 delete $self->{texture}; 1888 delete $self->{texture};
1469 $self->SUPER::update; 1889 $self->SUPER::update;
1470} 1890}
1471 1891
1892sub realloc {
1893 my ($self) = @_;
1894
1895 delete $self->{ox};
1896 $self->SUPER::realloc;
1897}
1898
1472sub set_text { 1899sub set_text {
1473 my ($self, $text) = @_; 1900 my ($self, $text) = @_;
1474 1901
1475 return if $self->{text} eq "T$text"; 1902 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1903 $self->{text} = "T$text";
1477 1904
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1905 $self->{layout}->set_text ($text);
1480 1906
1907 delete $self->{size_req};
1481 $self->realloc; 1908 $self->realloc;
1482 $self->update; 1909 $self->update;
1483} 1910}
1484 1911
1485sub set_markup { 1912sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1915 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1916 $self->{text} = "M$markup";
1490 1917
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1918 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1919
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1920 $self->{layout}->set_markup ($markup);
1495 1921
1922 delete $self->{size_req};
1496 $self->realloc; 1923 $self->realloc;
1497 $self->update; 1924 $self->update;
1498} 1925}
1499 1926
1500sub size_request { 1927sub size_request {
1501 my ($self) = @_; 1928 my ($self) = @_;
1502 1929
1930 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1931 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1932 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1933 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1934 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1935 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1936
1509 my ($w, $h) = $self->{layout}->size; 1937 my ($w, $h) = $self->{layout}->size;
1510 1938
1511 if (exists $self->{template}) { 1939 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1940 $self->{template}->set_font ($self->{font}) if $self->{font};
1941 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1942 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1943
1515 my ($w2, $h2) = $self->{template}->size; 1944 my ($w2, $h2) = $self->{template}->size;
1516 1945
1517 $w = List::Util::max $w, $w2; 1946 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1947 $h = List::Util::max $h, $h2;
1948 }
1949
1950 [$w, $h]
1519 } 1951 };
1520 1952
1521 ($w, $h) 1953 @{ $self->{size_req} }
1522} 1954}
1523 1955
1956sub baseline_shift {
1957 $_[0]{layout}->descent
1958}
1959
1524sub size_allocate { 1960sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1961 my ($self, $w, $h) = @_;
1526 1962
1963 delete $self->{ox};
1964
1527 delete $self->{texture} 1965 delete $self->{texture}
1528 ;#d# 1966 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1967
1968 1
1529} 1969}
1530 1970
1531sub set_fontsize { 1971sub set_fontsize {
1532 my ($self, $fontsize) = @_; 1972 my ($self, $fontsize) = @_;
1533 1973
1534 $self->{fontsize} = $fontsize; 1974 $self->{fontsize} = $fontsize;
1975 delete $self->{size_req};
1535 delete $self->{texture}; 1976 delete $self->{texture};
1536 1977
1537 $self->realloc; 1978 $self->realloc;
1538} 1979}
1539 1980
1981sub reconfigure {
1982 my ($self) = @_;
1983
1984 delete $self->{size_req};
1985 delete $self->{texture};
1986
1987 $self->SUPER::reconfigure;
1988}
1989
1540sub _draw { 1990sub _draw {
1541 my ($self) = @_; 1991 my ($self) = @_;
1542 1992
1543 $self->SUPER::_draw; # draw background, if applicable 1993 $self->SUPER::_draw; # draw background, if applicable
1544 1994
1545 my $tex = $self->{texture} ||= do { 1995 my $size = $self->{texture} ||= do {
1546 $self->{layout}->set_foreground (@{$self->{fg}}); 1996 $self->{layout}->set_foreground (@{$self->{fg}});
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1997 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{w}); 1998 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1999 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 2002
1553 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2003 [$self->{layout}->size]
2004 };
1554 2005
2006 unless (exists $self->{ox}) {
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2007 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2008 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5); 2009 : ($self->{w} - $size->[0]) * 0.5);
1558 2010
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5); 2013 : ($self->{h} - $size->[1]) * 0.5);
1562
1563 $tex
1564 }; 2014 };
1565 2015
1566 glEnable GL_TEXTURE_2D; 2016# unless ($self->{list}) {
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2017# $self->{list} = CFPlus::OpenGL::glGenList;
1568 2018# CFPlus::OpenGL::glNewList $self->{list};
1569 if ($tex->{format} == GL_ALPHA) { 2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1570 glColor @{$self->{fg}}; 2020# 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 } 2021# }
2022#
2023# CFPlus::OpenGL::glCallList $self->{list};
1575 2024
1576 glDisable GL_TEXTURE_2D; 2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1577} 2026}
2027
2028#sub destroy {
2029# my ($self) = @_;
2030#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032#
2033# $self->SUPER::destroy;
2034#}
1578 2035
1579############################################################################# 2036#############################################################################
1580 2037
1581package CFClient::UI::EntryBase; 2038package CFPlus::UI::EntryBase;
1582 2039
1583our @ISA = CFClient::UI::Label::; 2040our @ISA = CFPlus::UI::Label::;
1584 2041
1585use CFClient::OpenGL; 2042use CFPlus::OpenGL;
1586 2043
1587sub new { 2044sub new {
1588 my $class = shift; 2045 my $class = shift;
1589 2046
1590 $class->SUPER::new ( 2047 $class->SUPER::new (
… …
1594 active_fg => [0, 0, 0], 2051 active_fg => [0, 0, 0],
1595 can_hover => 1, 2052 can_hover => 1,
1596 can_focus => 1, 2053 can_focus => 1,
1597 valign => 0, 2054 valign => 0,
1598 can_events => 1, 2055 can_events => 1,
2056 ellipsise => 0,
1599 #text => ... 2057 #text => ...
2058 #hidden => "*",
1600 @_ 2059 @_
1601 ) 2060 )
1602} 2061}
1603 2062
1604sub _set_text { 2063sub _set_text {
… …
1606 2065
1607 delete $self->{cur_h}; 2066 delete $self->{cur_h};
1608 2067
1609 return if $self->{text} eq $text; 2068 return if $self->{text} eq $text;
1610 2069
1611 delete $self->{texture};
1612
1613 $self->{last_activity} = $::NOW; 2070 $self->{last_activity} = $::NOW;
1614 $self->{text} = $text; 2071 $self->{text} = $text;
1615 2072
1616 $text =~ s/./*/g if $self->{hidden}; 2073 $text =~ s/./*/g if $self->{hidden};
1617 $self->{layout}->set_text ("$text "); 2074 $self->{layout}->set_text ("$text ");
2075 delete $self->{size_req};
1618 2076
1619 $self->_emit (changed => $self->{text}); 2077 $self->emit (changed => $self->{text});
2078
2079 $self->realloc;
2080 $self->update;
1620} 2081}
1621 2082
1622sub set_text { 2083sub set_text {
1623 my ($self, $text) = @_; 2084 my ($self, $text) = @_;
1624 2085
1625 $self->{cursor} = length $text; 2086 $self->{cursor} = length $text;
1626 $self->_set_text ($text); 2087 $self->_set_text ($text);
1627
1628 $self->realloc;
1629} 2088}
1630 2089
1631sub get_text { 2090sub get_text {
1632 $_[0]{text} 2091 $_[0]{text}
1633} 2092}
… …
1638 my ($w, $h) = $self->SUPER::size_request; 2097 my ($w, $h) = $self->SUPER::size_request;
1639 2098
1640 ($w + 1, $h) # add 1 for cursor 2099 ($w + 1, $h) # add 1 for cursor
1641} 2100}
1642 2101
1643sub key_down { 2102sub invoke_key_down {
1644 my ($self, $ev) = @_; 2103 my ($self, $ev) = @_;
1645 2104
1646 my $mod = $ev->{mod}; 2105 my $mod = $ev->{mod};
1647 my $sym = $ev->{sym}; 2106 my $sym = $ev->{sym};
1648 my $uni = $ev->{unicode}; 2107 my $uni = $ev->{unicode};
1649 2108
1650 my $text = $self->get_text; 2109 my $text = $self->get_text;
2110
2111 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1651 2112
1652 if ($uni == 8) { 2113 if ($uni == 8) {
1653 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2114 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1654 } elsif ($uni == 127) { 2115 } elsif ($uni == 127) {
1655 substr $text, $self->{cursor}, 1, ""; 2116 substr $text, $self->{cursor}, 1, "";
1656 } elsif ($sym == CFClient::SDLK_LEFT) { 2117 } elsif ($sym == CFPlus::SDLK_LEFT) {
1657 --$self->{cursor} if $self->{cursor}; 2118 --$self->{cursor} if $self->{cursor};
1658 } elsif ($sym == CFClient::SDLK_RIGHT) { 2119 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1659 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2120 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1660 } elsif ($sym == CFClient::SDLK_HOME) { 2121 } elsif ($sym == CFPlus::SDLK_HOME) {
2122 # what a hack
2123 $self->{cursor} =
2124 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2125 ? length $1
2126 : 0;
2127 } elsif ($sym == CFPlus::SDLK_END) {
2128 # uh, again
2129 $self->{cursor} =
2130 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2131 ? $self->{cursor} + length $1
2132 : length $self->{text};
2133 } elsif ($uni == 21) { # ctrl-u
2134 $text = "";
1661 $self->{cursor} = 0; 2135 $self->{cursor} = 0;
1662 } elsif ($sym == CFClient::SDLK_END) {
1663 $self->{cursor} = length $text;
1664 } elsif ($uni == 27) { 2136 } elsif ($uni == 27) {
1665 $self->_emit ('escape'); 2137 $self->emit ('escape');
1666 } elsif ($uni) { 2138 } elsif ($uni == 0x0d) {
2139 substr $text, $self->{cursor}++, 0, "\012";
2140 } elsif ($uni >= 0x20) {
1667 substr $text, $self->{cursor}++, 0, chr $uni; 2141 substr $text, $self->{cursor}++, 0, chr $uni;
2142 } else {
2143 return 0;
1668 } 2144 }
1669 2145
1670 $self->_set_text ($text); 2146 $self->_set_text ($text);
1671 2147
1672 $self->realloc; 2148 $self->realloc;
1673} 2149 $self->update;
1674 2150
2151 1
2152}
2153
1675sub focus_in { 2154sub invoke_focus_in {
1676 my ($self) = @_; 2155 my ($self) = @_;
1677 2156
1678 $self->{last_activity} = $::NOW; 2157 $self->{last_activity} = $::NOW;
1679 2158
1680 $self->SUPER::focus_in; 2159 $self->SUPER::invoke_focus_in
1681} 2160}
1682 2161
1683sub button_down { 2162sub invoke_button_down {
1684 my ($self, $ev, $x, $y) = @_; 2163 my ($self, $ev, $x, $y) = @_;
1685 2164
1686 $self->SUPER::button_down ($ev, $x, $y); 2165 $self->SUPER::invoke_button_down ($ev, $x, $y);
1687 2166
1688 my $idx = $self->{layout}->xy_to_index ($x, $y); 2167 my $idx = $self->{layout}->xy_to_index ($x, $y);
1689 2168
1690 # byte-index to char-index 2169 # byte-index to char-index
1691 my $text = $self->{text}; 2170 my $text = $self->{text};
1692 utf8::encode $text; 2171 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1693 $self->{cursor} = length substr $text, 0, $idx; 2172 $self->{cursor} = length $text;
1694 2173
1695 $self->_set_text ($self->{text}); 2174 $self->_set_text ($self->{text});
1696 $self->update; 2175 $self->update;
2176
2177 1
1697} 2178}
1698 2179
1699sub mouse_motion { 2180sub invoke_mouse_motion {
1700 my ($self, $ev, $x, $y) = @_; 2181 my ($self, $ev, $x, $y) = @_;
1701# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2182# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2183
2184 1
1702} 2185}
1703 2186
1704sub _draw { 2187sub _draw {
1705 my ($self) = @_; 2188 my ($self) = @_;
1706 2189
1707 local $self->{fg} = $self->{fg}; 2190 local $self->{fg} = $self->{fg};
1708 2191
1709 if ($FOCUS == $self) { 2192 if ($FOCUS == $self) {
1710 glColor @{$self->{active_bg}}; 2193 glColor_premultiply @{$self->{active_bg}};
1711 $self->{fg} = $self->{active_fg}; 2194 $self->{fg} = $self->{active_fg};
1712 } else { 2195 } else {
1713 glColor @{$self->{bg}}; 2196 glColor_premultiply @{$self->{bg}};
1714 } 2197 }
1715 2198
1716 glEnable GL_BLEND; 2199 glEnable GL_BLEND;
1717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2200 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718 glBegin GL_QUADS; 2201 glBegin GL_QUADS;
1719 glVertex 0 , 0; 2202 glVertex 0 , 0;
1720 glVertex 0 , $self->{h}; 2203 glVertex 0 , $self->{h};
1721 glVertex $self->{w}, $self->{h}; 2204 glVertex $self->{w}, $self->{h};
1722 glVertex $self->{w}, 0; 2205 glVertex $self->{w}, 0;
… …
1733 utf8::encode $text; 2216 utf8::encode $text;
1734 2217
1735 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2218 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1736 } 2219 }
1737 2220
1738 glColor @{$self->{fg}};
1739 glBegin GL_LINES; 2221 glBegin GL_LINES;
1740 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2222 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}; 2223 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1742 glEnd; 2224 glEnd;
1743 } 2225 }
1744} 2226}
1745 2227
2228#############################################################################
2229
1746package CFClient::UI::Entry; 2230package CFPlus::UI::Entry;
1747 2231
1748our @ISA = CFClient::UI::EntryBase::; 2232our @ISA = CFPlus::UI::EntryBase::;
1749 2233
1750use CFClient::OpenGL; 2234use CFPlus::OpenGL;
1751 2235
1752sub key_down { 2236sub invoke_key_down {
1753 my ($self, $ev) = @_; 2237 my ($self, $ev) = @_;
1754 2238
1755 my $sym = $ev->{sym}; 2239 my $sym = $ev->{sym};
1756 2240
1757 if ($sym == 13) { 2241 if ($ev->{uni} == 0x0d || $sym == 13) {
1758 unshift @{$self->{history}}, 2242 unshift @{$self->{history}},
1759 my $txt = $self->get_text; 2243 my $txt = $self->get_text;
2244
1760 $self->{history_pointer} = -1; 2245 $self->{history_pointer} = -1;
1761 $self->{history_saveback} = ''; 2246 $self->{history_saveback} = '';
1762 $self->_emit (activate => $txt); 2247 $self->emit (activate => $txt);
1763 $self->update; 2248 $self->update;
1764 2249
1765 } elsif ($sym == CFClient::SDLK_UP) { 2250 } elsif ($sym == CFPlus::SDLK_UP) {
1766 if ($self->{history_pointer} < 0) { 2251 if ($self->{history_pointer} < 0) {
1767 $self->{history_saveback} = $self->get_text; 2252 $self->{history_saveback} = $self->get_text;
1768 } 2253 }
1769 if (@{$self->{history} || []} > 0) { 2254 if (@{$self->{history} || []} > 0) {
1770 $self->{history_pointer}++; 2255 $self->{history_pointer}++;
… …
1772 $self->{history_pointer} = @{$self->{history} || []} - 1; 2257 $self->{history_pointer} = @{$self->{history} || []} - 1;
1773 } 2258 }
1774 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2259 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1775 } 2260 }
1776 2261
1777 } elsif ($sym == CFClient::SDLK_DOWN) { 2262 } elsif ($sym == CFPlus::SDLK_DOWN) {
1778 $self->{history_pointer}--; 2263 $self->{history_pointer}--;
1779 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2264 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1780 2265
1781 if ($self->{history_pointer} >= 0) { 2266 if ($self->{history_pointer} >= 0) {
1782 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2267 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1783 } else { 2268 } else {
1784 $self->set_text ($self->{history_saveback}); 2269 $self->set_text ($self->{history_saveback});
1785 } 2270 }
1786 2271
1787 } else { 2272 } else {
1788 $self->SUPER::key_down ($ev); 2273 return $self->SUPER::invoke_key_down ($ev)
2274 }
2275
1789 } 2276 1
1790
1791} 2277}
1792 2278
1793############################################################################# 2279#############################################################################
1794 2280
2281package CFPlus::UI::TextEdit;
2282
2283our @ISA = CFPlus::UI::EntryBase::;
2284
2285use CFPlus::OpenGL;
2286
2287sub move_cursor_ver {
2288 my ($self, $dy) = @_;
2289
2290 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2291
2292 $y += $dy;
2293
2294 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2295 $self->{cursor} = $index;
2296 delete $self->{cur_h};
2297 $self->update;
2298 return;
2299 }
2300}
2301
2302sub invoke_key_down {
2303 my ($self, $ev) = @_;
2304
2305 my $sym = $ev->{sym};
2306
2307 if ($sym == CFPlus::SDLK_UP) {
2308 $self->move_cursor_ver (-1);
2309 } elsif ($sym == CFPlus::SDLK_DOWN) {
2310 $self->move_cursor_ver (+1);
2311 } else {
2312 return $self->SUPER::invoke_key_down ($ev)
2313 }
2314
2315 1
2316}
2317
2318#############################################################################
2319
1795package CFClient::UI::Button; 2320package CFPlus::UI::Button;
1796 2321
1797our @ISA = CFClient::UI::Label::; 2322our @ISA = CFPlus::UI::Label::;
1798 2323
1799use CFClient::OpenGL; 2324use CFPlus::OpenGL;
1800 2325
1801my @tex = 2326my @tex =
1802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1803 qw(b1_button_active.png); 2328 qw(b1_button_inactive.png b1_button_active.png);
1804 2329
1805sub new { 2330sub new {
1806 my $class = shift; 2331 my $class = shift;
1807 2332
1808 $class->SUPER::new ( 2333 $class->SUPER::new (
1809 padding_x => 4, 2334 padding_x => 4,
1810 padding_y => 4, 2335 padding_y => 4,
1811 fg => [1, 1, 1], 2336 fg => [1.0, 1.0, 1.0],
1812 active_fg => [0, 0, 1], 2337 active_fg => [0.8, 0.8, 0.8],
1813 can_hover => 1, 2338 can_hover => 1,
1814 align => 0, 2339 align => 0,
1815 valign => 0, 2340 valign => 0,
1816 can_events => 1, 2341 can_events => 1,
1817 @_ 2342 @_
1818 ) 2343 )
1819} 2344}
1820 2345
1821sub activate { }
1822
1823sub button_up { 2346sub invoke_button_up {
1824 my ($self, $ev, $x, $y) = @_; 2347 my ($self, $ev, $x, $y) = @_;
1825 2348
1826 $self->emit ("activate") 2349 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w} 2350 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h}; 2351 && $y >= 0 && $y < $self->{h};
2352
2353 1
1829} 2354}
1830 2355
1831sub _draw { 2356sub _draw {
1832 my ($self) = @_; 2357 my ($self) = @_;
1833 2358
1834 local $self->{fg} = $self->{fg}; 2359 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836 if ($GRAB == $self) {
1837 $self->{fg} = $self->{active_fg};
1838 }
1839 2360
1840 glEnable GL_TEXTURE_2D; 2361 glEnable GL_TEXTURE_2D;
1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842 glColor 0, 0, 0, 1; 2363 glColor 0, 0, 0, 1;
1843 2364
2365 my $tex = $tex[$GRAB == $self];
1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2366 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1845 2367
1846 glDisable GL_TEXTURE_2D; 2368 glDisable GL_TEXTURE_2D;
1847 2369
1848 $self->SUPER::_draw; 2370 $self->SUPER::_draw;
1849} 2371}
1850 2372
1851############################################################################# 2373#############################################################################
1852 2374
1853package CFClient::UI::CheckBox; 2375package CFPlus::UI::CheckBox;
1854 2376
1855our @ISA = CFClient::UI::DrawBG::; 2377our @ISA = CFPlus::UI::DrawBG::;
1856 2378
1857my @tex = 2379my @tex =
1858 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1859 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2381 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1860 2382
1861use CFClient::OpenGL; 2383use CFPlus::OpenGL;
1862 2384
1863sub new { 2385sub new {
1864 my $class = shift; 2386 my $class = shift;
1865 2387
1866 $class->SUPER::new ( 2388 $class->SUPER::new (
… …
1880 my ($self) = @_; 2402 my ($self) = @_;
1881 2403
1882 (6) x 2 2404 (6) x 2
1883} 2405}
1884 2406
2407sub toggle {
2408 my ($self) = @_;
2409
2410 $self->{state} = !$self->{state};
2411 $self->emit (changed => $self->{state});
2412 $self->update;
2413}
2414
1885sub button_down { 2415sub invoke_button_down {
1886 my ($self, $ev, $x, $y) = @_; 2416 my ($self, $ev, $x, $y) = @_;
1887 2417
1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2418 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2419 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890 $self->{state} = !$self->{state}; 2420 $self->toggle;
1891 $self->_emit (changed => $self->{state}); 2421 } else {
2422 return 0
2423 }
2424
1892 } 2425 1
1893} 2426}
1894 2427
1895sub _draw { 2428sub _draw {
1896 my ($self) = @_; 2429 my ($self) = @_;
1897 2430
… …
1912 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
1913} 2446}
1914 2447
1915############################################################################# 2448#############################################################################
1916 2449
1917package CFClient::UI::Image; 2450package CFPlus::UI::Image;
1918 2451
1919our @ISA = CFClient::UI::Base::; 2452our @ISA = CFPlus::UI::Base::;
1920 2453
1921use CFClient::OpenGL; 2454use CFPlus::OpenGL;
1922use Carp qw/confess/;
1923 2455
1924our %loaded_images; 2456our %texture_cache;
1925 2457
1926sub new { 2458sub new {
1927 my $class = shift; 2459 my $class = shift;
1928 2460
1929 my $self = $class->SUPER::new (can_events => 0, @_); 2461 my $self = $class->SUPER::new (
2462 can_events => 0,
2463 @_,
2464 );
1930 2465
1931 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2466 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required";
1932 2468
1933 $loaded_images{$self->{image}} ||= 2469 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1934 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2470 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1935 2471
1936 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2472 CFPlus::weaken $texture_cache{$self->{path}};
1937 2473
1938 Scalar::Util::weaken $loaded_images{$self->{image}}; 2474 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1939
1940 $self->{aspect} = $tex->{w} / $tex->{h};
1941 2475
1942 $self 2476 $self
1943} 2477}
1944 2478
2479sub STORABLE_freeze {
2480 my ($self, $cloning) = @_;
2481
2482 $self->{path}
2483 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2484
2485 $self->{path}
2486}
2487
2488sub STORABLE_attach {
2489 my ($self, $cloning, $path) = @_;
2490
2491 $self->new (path => $path)
2492}
2493
1945sub size_request { 2494sub size_request {
1946 my ($self) = @_; 2495 my ($self) = @_;
1947 2496
1948 ($self->{tex}->{w}, $self->{tex}->{h}) 2497 ($self->{tex}{w}, $self->{tex}{h})
1949} 2498}
1950 2499
1951sub _draw { 2500sub _draw {
1952 my ($self) = @_; 2501 my ($self) = @_;
1953 2502
… …
1963 } 2512 }
1964 2513
1965 glEnable GL_TEXTURE_2D; 2514 glEnable GL_TEXTURE_2D;
1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1967 2516
1968 $tex->draw_quad_alpha (0, 0, $w, $h); 2517 $tex->draw_quad (0, 0, $w, $h);
1969 2518
1970 glDisable GL_TEXTURE_2D; 2519 glDisable GL_TEXTURE_2D;
1971} 2520}
1972 2521
1973############################################################################# 2522#############################################################################
1974 2523
2524package CFPlus::UI::ImageButton;
2525
2526our @ISA = CFPlus::UI::Image::;
2527
2528use CFPlus::OpenGL;
2529
2530my %textures;
2531
2532sub new {
2533 my $class = shift;
2534
2535 my $self = $class->SUPER::new (
2536 padding_x => 4,
2537 padding_y => 4,
2538 fg => [1, 1, 1],
2539 active_fg => [0, 0, 1],
2540 can_hover => 1,
2541 align => 0,
2542 valign => 0,
2543 can_events => 1,
2544 @_
2545 );
2546}
2547
2548sub invoke_button_up {
2549 my ($self, $ev, $x, $y) = @_;
2550
2551 $self->emit ("activate")
2552 if $x >= 0 && $x < $self->{w}
2553 && $y >= 0 && $y < $self->{h};
2554
2555 1
2556}
2557
2558#############################################################################
2559
1975package CFClient::UI::VGauge; 2560package CFPlus::UI::VGauge;
1976 2561
1977our @ISA = CFClient::UI::Base::; 2562our @ISA = CFPlus::UI::Base::;
1978 2563
1979use List::Util qw(min max); 2564use List::Util qw(min max);
1980 2565
1981use CFClient::OpenGL; 2566use CFPlus::OpenGL;
1982 2567
1983my %tex = ( 2568my %tex = (
1984 food => [ 2569 food => [
1985 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2570 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1986 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2571 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1987 ], 2572 ],
1988 grace => [ 2573 grace => [
1989 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2574 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/ 2575 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1991 ], 2576 ],
1992 hp => [ 2577 hp => [
1993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2578 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1994 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2579 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1995 ], 2580 ],
1996 mana => [ 2581 mana => [
1997 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2582 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/ 2583 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1999 ], 2584 ],
2000); 2585);
2001 2586
2002# eg. VGauge->new (gauge => 'food'), default gauge: food 2587# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2062 my $ycut1 = max 0, min 1, $ycut; 2647 my $ycut1 = max 0, min 1, $ycut;
2063 my $ycut2 = max 0, min 1, $ycut - 1; 2648 my $ycut2 = max 0, min 1, $ycut - 1;
2064 2649
2065 my $h1 = $self->{h} * (1 - $ycut1); 2650 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2651 my $h2 = $self->{h} * (1 - $ycut2);
2652 my $h3 = $self->{h};
2653
2654 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2067 2655
2068 glEnable GL_BLEND; 2656 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2657 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2658 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2659 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2661
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2662 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2663 glBegin GL_QUADS;
… …
2089 2678
2090 if ($t3) { 2679 if ($t3) {
2091 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2680 glBindTexture GL_TEXTURE_2D, $t3->{name};
2092 glBegin GL_QUADS; 2681 glBegin GL_QUADS;
2093 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2682 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2094 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2683 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2095 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2684 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2096 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2685 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2097 glEnd; 2686 glEnd;
2098 } 2687 }
2099 2688
2100 glDisable GL_BLEND; 2689 glDisable GL_BLEND;
2101 glDisable GL_TEXTURE_2D; 2690 glDisable GL_TEXTURE_2D;
2102} 2691}
2103 2692
2104############################################################################# 2693#############################################################################
2105 2694
2106package CFClient::UI::Gauge; 2695package CFPlus::UI::Gauge;
2107 2696
2108our @ISA = CFClient::UI::VBox::; 2697our @ISA = CFPlus::UI::VBox::;
2109 2698
2110sub new { 2699sub new {
2111 my ($class, %arg) = @_; 2700 my ($class, %arg) = @_;
2112 2701
2113 my $self = $class->SUPER::new ( 2702 my $self = $class->SUPER::new (
… …
2115 can_hover => 1, 2704 can_hover => 1,
2116 can_events => 1, 2705 can_events => 1,
2117 %arg, 2706 %arg,
2118 ); 2707 );
2119 2708
2120 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2709 $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); 2710 $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"); 2711 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2123 2712
2124 $self 2713 $self
2125} 2714}
2126 2715
2127sub set_fontsize { 2716sub set_fontsize {
… …
2148 $self->{value}->set_text ($val); 2737 $self->{value}->set_text ($val);
2149} 2738}
2150 2739
2151############################################################################# 2740#############################################################################
2152 2741
2153package CFClient::UI::Slider; 2742package CFPlus::UI::Slider;
2154 2743
2155use strict; 2744use strict;
2156 2745
2157use CFClient::OpenGL; 2746use CFPlus::OpenGL;
2158 2747
2159our @ISA = CFClient::UI::DrawBG::; 2748our @ISA = CFPlus::UI::DrawBG::;
2160 2749
2161my @tex = 2750my @tex =
2162 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2751 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2163 qw(s1_slider.png s1_slider_bg.png); 2752 qw(s1_slider.png s1_slider_bg.png);
2164 2753
2165sub new { 2754sub new {
2166 my $class = shift; 2755 my $class = shift;
2167 2756
… …
2188 $self->update; 2777 $self->update;
2189 2778
2190 $self 2779 $self
2191} 2780}
2192 2781
2193sub changed { }
2194
2195sub set_range { 2782sub set_range {
2196 my ($self, $range) = @_; 2783 my ($self, $range) = @_;
2197 2784
2198 ($range, $self->{range}) = ($self->{range}, $range); 2785 ($range, $self->{range}) = ($self->{range}, $range);
2199 2786
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}"; 2787 if ("@$range" ne "@{$self->{range}}") {
2788 $self->update;
2789 $self->set_value ($self->{range}[0]);
2790 }
2202} 2791}
2203 2792
2204sub set_value { 2793sub set_value {
2205 my ($self, $value) = @_; 2794 my ($self, $value) = @_;
2206 2795
… …
2217 if $unit; 2806 if $unit;
2218 2807
2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2808 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2220 2809
2221 if ($value != $old_value) { 2810 if ($value != $old_value) {
2222 $self->_emit (changed => $value); 2811 $self->emit (changed => $value);
2223 $self->update; 2812 $self->update;
2224 } 2813 }
2225} 2814}
2226 2815
2227sub size_request { 2816sub size_request {
2228 my ($self) = @_; 2817 my ($self) = @_;
2229 2818
2230 ($self->{req_w}, $self->{req_h}) 2819 ($self->{req_w}, $self->{req_h})
2231} 2820}
2232 2821
2233sub button_down { 2822sub invoke_button_down {
2234 my ($self, $ev, $x, $y) = @_; 2823 my ($self, $ev, $x, $y) = @_;
2235 2824
2236 $self->SUPER::button_down ($ev, $x, $y); 2825 $self->SUPER::invoke_button_down ($ev, $x, $y);
2237 2826
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2827 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239 2828
2240 $self->mouse_motion ($ev, $x, $y); 2829 $self->invoke_mouse_motion ($ev, $x, $y);
2241}
2242 2830
2831 1
2832}
2833
2243sub mouse_motion { 2834sub invoke_mouse_motion {
2244 my ($self, $ev, $x, $y) = @_; 2835 my ($self, $ev, $x, $y) = @_;
2245 2836
2246 if ($GRAB == $self) { 2837 if ($GRAB == $self) {
2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2838 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2248 2839
2249 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2840 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250 2841
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2842 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252 2843
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2844 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2845 } else {
2846 return 0;
2847 }
2848
2254 } 2849 1
2850}
2851
2852sub invoke_mouse_wheel {
2853 my ($self, $ev) = @_;
2854
2855 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2856
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2858
2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2860
2861 1
2255} 2862}
2256 2863
2257sub update { 2864sub update {
2258 my ($self) = @_; 2865 my ($self) = @_;
2259 2866
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2867 delete $self->{knob_w};
2868 $self->SUPER::update;
2869}
2870
2871sub _draw {
2872 my ($self) = @_;
2873
2874 unless ($self->{knob_w}) {
2261 $self->set_value ($self->{range}[0]); 2875 $self->set_value ($self->{range}[0]);
2262 2876
2263 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2877 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100; 2878 my $range = ($hi - $page - $lo) || 1e-100;
2265 2879
… …
2271 $value = ($value - $lo) / $range; 2885 $value = ($value - $lo) / $range;
2272 $value = $value * $self->{scale} + $self->{offset}; 2886 $value = $value * $self->{scale} + $self->{offset};
2273 2887
2274 $self->{knob_x} = $value - $knob_w * 0.5; 2888 $self->{knob_x} = $value - $knob_w * 0.5;
2275 $self->{knob_w} = $knob_w; 2889 $self->{knob_w} = $knob_w;
2276 }); 2890 }
2277
2278 $self->SUPER::update;
2279}
2280
2281sub _draw {
2282 my ($self) = @_;
2283 2891
2284 $self->SUPER::_draw (); 2892 $self->SUPER::_draw ();
2285 2893
2286 glScale $self->{w}, $self->{h}; 2894 glScale $self->{w}, $self->{h};
2287 2895
… …
2307 glDisable GL_TEXTURE_2D; 2915 glDisable GL_TEXTURE_2D;
2308} 2916}
2309 2917
2310############################################################################# 2918#############################################################################
2311 2919
2312package CFClient::UI::ValSlider; 2920package CFPlus::UI::ValSlider;
2313 2921
2314our @ISA = CFClient::UI::HBox::; 2922our @ISA = CFPlus::UI::HBox::;
2315 2923
2316sub new { 2924sub new {
2317 my ($class, %arg) = @_; 2925 my ($class, %arg) = @_;
2318 2926
2319 my $range = delete $arg{range}; 2927 my $range = delete $arg{range};
2320 2928
2321 my $self = $class->SUPER::new ( 2929 my $self = $class->SUPER::new (
2322 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2930 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2323 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2931 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2324 to_value => sub { shift }, 2932 to_value => sub { shift },
2325 from_value => sub { shift }, 2933 from_value => sub { shift },
2326 %arg, 2934 %arg,
2327 ); 2935 );
2328 2936
… …
2348sub set_range { shift->{slider}->set_range (@_) } 2956sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) } 2957sub set_value { shift->{slider}->set_value (@_) }
2350 2958
2351############################################################################# 2959#############################################################################
2352 2960
2353package CFClient::UI::TextView; 2961package CFPlus::UI::TextScroller;
2354 2962
2355our @ISA = CFClient::UI::HBox::; 2963our @ISA = CFPlus::UI::HBox::;
2356 2964
2357use CFClient::OpenGL; 2965use CFPlus::OpenGL;
2358 2966
2359sub new { 2967sub new {
2360 my $class = shift; 2968 my $class = shift;
2361 2969
2362 my $self = $class->SUPER::new ( 2970 my $self = $class->SUPER::new (
2363 fontsize => 1, 2971 fontsize => 1,
2364 can_events => 0, 2972 can_events => 1,
2973 indent => 0,
2365 #font => default_font 2974 #font => default_font
2366 @_, 2975 @_,
2367 2976
2368 layout => (new CFClient::Layout 1), 2977 layout => (new CFPlus::Layout),
2369 par => [], 2978 par => [],
2979 max_par => 0,
2370 height => 0, 2980 height => 0,
2371 children => [ 2981 children => [
2372 (new CFClient::UI::Empty expand => 1), 2982 (new CFPlus::UI::Empty expand => 1),
2373 (new CFClient::UI::Slider vertical => 1), 2983 (new CFPlus::UI::Slider vertical => 1),
2374 ], 2984 ],
2375 ); 2985 );
2376 2986
2377 $self->{children}[1]->connect (changed => sub { $self->update }); 2987 $self->{children}[1]->connect (changed => sub { $self->update });
2378 2988
… …
2384 2994
2385 $self->{fontsize} = $fontsize; 2995 $self->{fontsize} = $fontsize;
2386 $self->reflow; 2996 $self->reflow;
2387} 2997}
2388 2998
2999sub size_request {
3000 my ($self) = @_;
3001
3002 my ($empty, $slider) = @{ $self->{children} };
3003
3004 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request
3006}
3007
2389sub size_allocate { 3008sub invoke_size_allocate {
2390 my ($self, $w, $h) = @_; 3009 my ($self, $w, $h) = @_;
2391 3010
2392 $self->SUPER::size_allocate ($w, $h); 3011 my ($empty, $slider, @other) = @{ $self->{children} };
3012 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2393 3013
2394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3014 $self->{layout}->set_font ($self->{font}) if $self->{font};
2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3015 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $self->{layout}->set_width ($self->{children}[0]{w}); 3016 $self->{layout}->set_width ($empty->{w});
3017 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 3018
2398 $self->reflow; 3019 $self->reflow;
2399}
2400 3020
2401sub text_size { 3021 local $self->{children} = [$empty, $slider];
3022 $self->SUPER::invoke_size_allocate ($w, $h)
3023}
3024
3025sub invoke_mouse_wheel {
2402 my ($self, $text, $indent) = @_; 3026 my ($self, $ev) = @_;
3027
3028 return 0 unless $ev->{dy}; # only vertical movements
3029
3030 $self->{children}[1]->emit (mouse_wheel => $ev);
3031
3032 1
3033}
3034
3035sub get_layout {
3036 my ($self, $para) = @_;
2403 3037
2404 my $layout = $self->{layout}; 3038 my $layout = $self->{layout};
2405 3039
3040 $layout->set_font ($self->{font}) if $self->{font};
3041 $layout->set_foreground (@{$para->{fg}});
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3042 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent); 3043 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3044 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2408 $layout->set_markup ($text); 3045 $layout->set_markup ($para->{markup});
3046
3047 $layout->set_shapes (
3048 map
3049 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3050 @{$para->{widget}}
2409 3051 );
3052
2410 $layout->size 3053 $layout
2411} 3054}
2412 3055
2413sub reflow { 3056sub reflow {
2414 my ($self) = @_; 3057 my ($self) = @_;
2415 3058
… …
2422 3065
2423 # todo: base offset on lines or so, not on pixels 3066 # todo: base offset on lines or so, not on pixels
2424 $self->{children}[1]->set_value ($offset); 3067 $self->{children}[1]->set_value ($offset);
2425} 3068}
2426 3069
3070sub current_paragraph {
3071 my ($self) = @_;
3072
3073 $self->{top_paragraph} - 1
3074}
3075
3076sub scroll_to {
3077 my ($self, $para) = @_;
3078
3079 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3080
3081 $self->{scroll_to} = $para;
3082 $self->update;
3083}
3084
2427sub clear { 3085sub clear {
2428 my ($self) = @_; 3086 my ($self) = @_;
3087
3088 my (undef, undef, @other) = @{ $self->{children} };
3089 $self->remove ($_) for @other;
2429 3090
2430 $self->{par} = []; 3091 $self->{par} = [];
2431 $self->{height} = 0; 3092 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3093 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433} 3094}
2434 3095
2435sub add_paragraph { 3096sub add_paragraph {
2436 my ($self, $color, $text, $indent) = @_; 3097 my $self = shift;
2437 3098
2438 for my $line (split /\n/, $text) { 3099 for my $para (@_) {
2439 my ($w, $h) = $self->text_size ($line); 3100 $para = {
3101 fg => [1, 1, 1, 1],
3102 indent => 0,
3103 markup => "",
3104 widget => [],
3105 ref $para ? %$para : (markup => $para),
3106 w => 1e10,
3107 wrapped => 1,
3108 };
3109
3110 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3111 push @{$self->{par}}, $para;
3112 }
3113
3114 if (my $max = $self->{max_par}) {
3115 shift @{$self->{par}} while @{$self->{par}} > $max;
3116 }
3117
3118 $self->{need_reflow}++;
3119 $self->update;
3120}
3121
3122sub scroll_to_bottom {
3123 my ($self) = @_;
3124
3125 $self->{scroll_to} = $#{$self->{par}};
3126 $self->update;
3127}
3128
3129sub force_uptodate {
3130 my ($self) = @_;
3131
3132 if (delete $self->{need_reflow}) {
3133 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3134
3135 my $height = 0;
3136
3137 for my $para (@{$self->{par}}) {
3138 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3139 my $layout = $self->get_layout ($para);
3140 my ($w, $h) = $layout->size;
3141
3142 $para->{w} = $w + $para->{indent};
3143 $para->{h} = $h;
3144 $para->{wrapped} = $layout->has_wrapped;
3145 }
3146
3147 $para->{y} = $height;
3148 $height += $para->{h};
3149 }
3150
2440 $self->{height} += $h; 3151 $self->{height} = $height;
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3152 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2442 }
2443 3153
2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3154 delete $self->{texture};
3155 }
3156
3157 if (my $paridx = delete $self->{scroll_to}) {
3158 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3159 }
2445} 3160}
2446 3161
2447sub update { 3162sub update {
2448 my ($self) = @_; 3163 my ($self) = @_;
2449 3164
… …
2451 3166
2452 return unless $self->{h} > 0; 3167 return unless $self->{h} > 0;
2453 3168
2454 delete $self->{texture}; 3169 delete $self->{texture};
2455 3170
2456 $ROOT->on_post_alloc ($self, sub { 3171 $ROOT->on_post_alloc ($self => sub {
3172 $self->force_uptodate;
3173
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3174 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458 3175
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 { 3176 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2486 glClearColor 0.5, 0.5, 0.5, 0; 3177 glClearColor 0, 0, 0, 0;
2487 glClear GL_COLOR_BUFFER_BIT; 3178 glClear GL_COLOR_BUFFER_BIT;
2488 3179
3180 package CFPlus::UI::Base;
3181 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3182 (0, 0, $self->{w}, $self->{h});
3183
3184 my $top = int $self->{children}[1]{range}[0];
3185
3186 my $paridx = 0;
3187 my $top_paragraph;
2489 my $top = int $self->{children}[1]{range}[0]; 3188 my $top = int $self->{children}[1]{range}[0];
2490 3189
2491 my $y0 = $top; 3190 my $y0 = $top;
2492 my $y1 = $top + $H; 3191 my $y1 = $top + $H;
2493 3192
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}}) { 3193 for my $para (@{$self->{par}}) {
2505 my $h = $par->[1]; 3194 my $h = $para->{h};
3195 my $y = $para->{y};
2506 3196
2507 if ($y0 < $y + $h && $y < $y1) { 3197 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] }); 3198 my $layout = $self->get_layout ($para);
2509 $layout->set_width ($W - $par->[3]);
2510 $layout->set_markup ($par->[4]);
2511 3199
2512 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3200 $layout->render ($para->{indent}, $y - $y0);
2513 3201
2514 glRasterPos $par->[3], $y - $y0; 3202 if (my @w = @{ $para->{widget} }) {
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3203 my @s = $layout->get_shapes;
3204
3205 for (@w) {
3206 my ($dx, $dy) = splice @s, 0, 2, ();
3207
3208 $_->{x} = $dx + $para->{indent};
3209 $_->{y} = $dy + $y - $y0;
3210
3211 $_->draw;
3212 }
3213 }
2516 } 3214 }
2517 3215
2518 $y += $h; 3216 $paridx++;
3217 $top_paragraph ||= $paridx if $y >= $top;
2519 } 3218 }
2520 3219
2521 glDisable GL_BLEND; 3220 $self->{top_paragraph} = $top_paragraph;
2522 }; 3221 };
2523 }); 3222 });
2524} 3223}
2525 3224
3225sub reconfigure {
3226 my ($self) = @_;
3227
3228 $self->SUPER::reconfigure;
3229
3230 $_->{w} = 1e10 for @{ $self->{par} };
3231 $self->reflow;
3232}
3233
2526sub _draw { 3234sub _draw {
2527 my ($self) = @_; 3235 my ($self) = @_;
2528 3236
2529 glEnable GL_TEXTURE_2D; 3237 glEnable GL_TEXTURE_2D;
2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3238 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531 glColor 1, 1, 1, 1; 3239 glColor 0, 0, 0, 1;
2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3240 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533 glDisable GL_TEXTURE_2D; 3241 glDisable GL_TEXTURE_2D;
2534 3242
2535 $self->{children}[1]->draw; 3243 $self->{children}[1]->draw;
2536
2537} 3244}
2538 3245
2539############################################################################# 3246#############################################################################
2540 3247
2541package CFClient::UI::Animator; 3248package CFPlus::UI::Animator;
2542 3249
2543use CFClient::OpenGL; 3250use CFPlus::OpenGL;
2544 3251
2545our @ISA = CFClient::UI::Bin::; 3252our @ISA = CFPlus::UI::Bin::;
2546 3253
2547sub moveto { 3254sub moveto {
2548 my ($self, $x, $y) = @_; 3255 my ($self, $x, $y) = @_;
2549 3256
2550 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3257 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2578 glPopMatrix; 3285 glPopMatrix;
2579} 3286}
2580 3287
2581############################################################################# 3288#############################################################################
2582 3289
2583package CFClient::UI::Flopper; 3290package CFPlus::UI::Flopper;
2584 3291
2585our @ISA = CFClient::UI::Button::; 3292our @ISA = CFPlus::UI::Button::;
2586 3293
2587sub new { 3294sub new {
2588 my $class = shift; 3295 my $class = shift;
2589 3296
2590 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
… …
2602 $self->{other}->toggle_visibility; 3309 $self->{other}->toggle_visibility;
2603} 3310}
2604 3311
2605############################################################################# 3312#############################################################################
2606 3313
2607package CFClient::UI::Tooltip; 3314package CFPlus::UI::Tooltip;
2608 3315
2609our @ISA = CFClient::UI::Bin::; 3316our @ISA = CFPlus::UI::Bin::;
2610 3317
2611use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2612 3319
2613sub new { 3320sub new {
2614 my $class = shift; 3321 my $class = shift;
2615 3322
2616 $class->SUPER::new ( 3323 $class->SUPER::new (
… …
2619 ) 3326 )
2620} 3327}
2621 3328
2622sub set_tooltip_from { 3329sub set_tooltip_from {
2623 my ($self, $widget) = @_; 3330 my ($self, $widget) = @_;
3331
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
2624 3334
2625 my $tooltip = $widget->{tooltip}; 3335 my $tooltip = $widget->{tooltip};
2626 3336
2627 if ($ENV{CFPLUS_DEBUG} & 2) { 3337 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n" 3338 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3339 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n" 3340 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}"; 3341 . "visible $widget->{visible}";
2632 } 3342 }
2633 3343
3344 $tooltip =~ s/^\n+//;
3345 $tooltip =~ s/\n+$//;
3346
2634 $self->add (new CFClient::UI::Label 3347 $self->add (new CFPlus::UI::Label
2635 markup => $tooltip, 3348 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8, 3350 fontsize => 0.8,
2638 fg => [0, 0, 0, 1], 3351 style => 1, # FLAG_INVERSE
2639 ellipsise => 0, 3352 ellipsise => 0,
2640 font => ($widget->{tooltip_font} || $::FONT_PROP), 3353 font => ($widget->{tooltip_font} || $::FONT_PROP),
2641 ); 3354 );
2642} 3355}
2643 3356
… …
2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3360 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2648 3361
2649 ($w + 4, $h + 4) 3362 ($w + 4, $h + 4)
2650} 3363}
2651 3364
2652sub size_allocate { 3365sub invoke_size_allocate {
2653 my ($self, $w, $h) = @_; 3366 my ($self, $w, $h) = @_;
2654 3367
2655 $self->SUPER::size_allocate ($w - 4, $h - 4); 3368 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2656} 3369}
2657 3370
2658sub visibility_change { 3371sub invoke_visibility_change {
2659 my ($self, $visible) = @_; 3372 my ($self, $visible) = @_;
2660 3373
2661 return unless $visible; 3374 return unless $visible;
2662 3375
2663 $self->{root}->on_post_alloc ("move_$self" => sub { 3376 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner} 3377 my $widget = $self->{owner}
2665 or return; 3378 or return;
2666 3379
3380 if ($widget->{visible}) {
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3381 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668 3382
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3383 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH; 3384 if $x + $self->{w} > $self->{root}{w};
2671 3385
2672 $self->move_abs ($x, $y); 3386 $self->move_abs ($x, $y);
3387 } else {
3388 $self->hide;
3389 }
2673 }); 3390 });
2674} 3391}
2675 3392
2676sub _draw { 3393sub _draw {
2677 my ($self) = @_; 3394 my ($self) = @_;
… …
2701 $self->SUPER::_draw; 3418 $self->SUPER::_draw;
2702} 3419}
2703 3420
2704############################################################################# 3421#############################################################################
2705 3422
2706package CFClient::UI::Face; 3423package CFPlus::UI::Face;
2707 3424
2708our @ISA = CFClient::UI::Base::; 3425our @ISA = CFPlus::UI::DrawBG::;
2709 3426
2710use CFClient::OpenGL; 3427use CFPlus::OpenGL;
2711 3428
2712sub new { 3429sub new {
2713 my $class = shift; 3430 my $class = shift;
2714 3431
2715 my $self = $class->SUPER::new ( 3432 my $self = $class->SUPER::new (
3433 size_w => 32,
3434 size_h => 8,
2716 aspect => 1, 3435 aspect => 1,
2717 can_events => 0, 3436 can_events => 0,
2718 @_, 3437 @_,
2719 ); 3438 );
2720 3439
2721 if ($self->{anim} && $self->{animspeed}) { 3440 if ($self->{anim} && $self->{animspeed}) {
2722 Scalar::Util::weaken (my $widget = $self); 3441 CFPlus::weaken (my $widget = $self);
2723 3442
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2724 $self->{timer} = Event->timer ( 3445 $self->{timer} = Event->timer (
2725 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2726 hard => 1, 3446 parked => 1,
2727 interval => $self->{animspeed},
2728 cb => sub { 3447 cb => sub {
3448 return unless $::CONN && $widget;
3449
2729 ++$widget->{frame}; 3450 ++$widget->{frame};
3451 $widget->update_face;
2730 $widget->update; 3452 $widget->update;
3453
3454 $widget->update_timer;
2731 }, 3455 },
2732 ); 3456 );
3457
3458 $self->update_face;
3459 $self->update_timer;
2733 } 3460 }
2734 3461
2735 $self 3462 $self
2736} 3463}
2737 3464
3465sub update_timer {
3466 my ($self) = @_;
3467
3468 return unless $self->{timer};
3469
3470 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start;
3477 } else {
3478 $self->{timer}->stop;
3479 }
3480}
3481
3482sub update_face {
3483 my ($self) = @_;
3484
3485 return unless $::CONN;
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3492 }
3493 }
3494}
3495
2738sub size_request { 3496sub size_request {
2739 (32, 8) 3497 my ($self) = @_;
3498
3499 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex;
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3506 $self->realloc;
3507 });
3508 }
3509 }
3510 }
3511
3512 ($self->{size_w} || 8, $self->{size_h} || 8)
2740} 3513}
2741 3514
2742sub update { 3515sub update {
2743 my ($self) = @_; 3516 my ($self) = @_;
2744 3517
2745 return unless $self->{visible}; 3518 return unless $self->{visible};
2746 3519
2747 $self->SUPER::update; 3520 $self->SUPER::update;
2748} 3521}
2749 3522
3523sub invoke_visibility_change {
3524 my ($self) = @_;
3525
3526 $self->update_timer;
3527
3528 0
3529}
3530
2750sub _draw { 3531sub _draw {
2751 my ($self) = @_; 3532 my ($self) = @_;
2752 3533
2753 return unless $::CONN; 3534 $self->SUPER::_draw;
2754 3535
2755 my $face; 3536 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; 3537 glEnable GL_TEXTURE_2D;
2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769 glColor 1, 1, 1, 1; 3539 glColor 0, 0, 0, 1;
2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771 glDisable GL_TEXTURE_2D; 3541 glDisable GL_TEXTURE_2D;
2772 } 3542 }
2773} 3543}
2774 3544
2775sub DESTROY { 3545sub destroy {
2776 my ($self) = @_; 3546 my ($self) = @_;
2777 3547
2778 $self->{timer}->cancel 3548 (delete $self->{timer})->cancel
2779 if $self->{timer}; 3549 if $self->{timer};
2780 3550
2781 $self->SUPER::DESTROY; 3551 $self->SUPER::destroy;
2782} 3552}
2783 3553
2784############################################################################# 3554#############################################################################
2785 3555
3556package CFPlus::UI::Buttonbar;
3557
3558our @ISA = CFPlus::UI::HBox::;
3559
3560# TODO: should actually wrap buttons and other goodies.
3561
3562#############################################################################
3563
2786package CFClient::UI::Menu; 3564package CFPlus::UI::Menu;
2787 3565
2788our @ISA = CFClient::UI::FancyFrame::; 3566our @ISA = CFPlus::UI::Toplevel::;
2789 3567
2790use CFClient::OpenGL; 3568use CFPlus::OpenGL;
2791 3569
2792sub new { 3570sub new {
2793 my $class = shift; 3571 my $class = shift;
2794 3572
2795 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
2796 items => [], 3574 items => [],
2797 z => 100, 3575 z => 100,
2798 @_, 3576 @_,
2799 ); 3577 );
2800 3578
2801 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3579 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2802 3580
2803 for my $item (@{ $self->{items} }) { 3581 for my $item (@{ $self->{items} }) {
2804 my ($widget, $cb) = @$item; 3582 my ($widget, $cb, $tooltip) = @$item;
2805 3583
2806 # handle various types of items, only text for now 3584 # handle various types of items, only text for now
2807 if (!ref $widget) { 3585 if (!ref $widget) {
3586 if ($widget =~ /\t/) {
3587 my ($left, $right) = split /\t/, $widget, 2;
3588
2808 $widget = new CFClient::UI::Label 3589 $widget = new CFPlus::UI::HBox
2809 can_hover => 1, 3590 can_hover => 1,
2810 can_events => 1, 3591 can_events => 1,
3592 tooltip => $tooltip,
3593 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1),
3596 ],
3597 ;
3598
3599 } else {
3600 $widget = new CFPlus::UI::Label
3601 can_hover => 1,
3602 can_events => 1,
2811 text => $widget; 3603 markup => $widget,
3604 tooltip => $tooltip;
3605 }
2812 } 3606 }
2813 3607
2814 $self->{item}{$widget} = $item; 3608 $self->{item}{$widget} = $item;
2815 3609
2816 $self->{vbox}->add ($widget); 3610 $self->{vbox}->add ($widget);
… …
2821 3615
2822# popup given the event (must be a mouse button down event currently) 3616# popup given the event (must be a mouse button down event currently)
2823sub popup { 3617sub popup {
2824 my ($self, $ev) = @_; 3618 my ($self, $ev) = @_;
2825 3619
2826 $self->_emit ("popdown"); 3620 $self->emit ("popdown");
2827 3621
2828 # maybe save $GRAB? must be careful about events... 3622 # maybe save $GRAB? must be careful about events...
2829 $GRAB = $self; 3623 $GRAB = $self;
2830 $self->{button} = $ev->{button}; 3624 $self->{button} = $ev->{button};
2831 3625
2832 $self->show; 3626 $self->show;
2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3627 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2834} 3628}
2835 3629
2836sub mouse_motion { 3630sub invoke_mouse_motion {
2837 my ($self, $ev, $x, $y) = @_; 3631 my ($self, $ev, $x, $y) = @_;
2838 3632
2839 # TODO: should use vbox->find_widget or so 3633 # TODO: should use vbox->find_widget or so
2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3634 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841 $self->{hover} = $self->{item}{$HOVER}; 3635 $self->{hover} = $self->{item}{$HOVER};
2842}
2843 3636
3637 0
3638}
3639
2844sub button_up { 3640sub invoke_button_up {
2845 my ($self, $ev, $x, $y) = @_; 3641 my ($self, $ev, $x, $y) = @_;
2846 3642
2847 if ($ev->{button} == $self->{button}) { 3643 if ($ev->{button} == $self->{button}) {
2848 undef $GRAB; 3644 undef $GRAB;
2849 $self->hide; 3645 $self->hide;
2850 3646
2851 $self->_emit ("popdown"); 3647 $self->emit ("popdown");
2852 $self->{hover}[1]->() if $self->{hover}; 3648 $self->{hover}[1]->() if $self->{hover};
3649 } else {
3650 return 0
3651 }
3652
2853 } 3653 1
2854} 3654}
2855 3655
2856############################################################################# 3656#############################################################################
2857 3657
2858package CFClient::UI::Statusbox; 3658package CFPlus::UI::Multiplexer;
2859 3659
2860our @ISA = CFClient::UI::VBox::; 3660our @ISA = CFPlus::UI::Container::;
2861 3661
2862sub new { 3662sub new {
2863 my $class = shift; 3663 my $class = shift;
2864 3664
2865 $class->SUPER::new ( 3665 my $self = $class->SUPER::new (
3666 @_,
3667 );
3668
3669 $self->{current} = $self->{children}[0]
3670 if @{ $self->{children} };
3671
3672 $self
3673}
3674
3675sub add {
3676 my ($self, @widgets) = @_;
3677
3678 $self->SUPER::add (@widgets);
3679
3680 $self->{current} = $self->{children}[0]
3681 if @{ $self->{children} };
3682}
3683
3684sub get_current_page {
3685 my ($self) = @_;
3686
3687 $self->{current}
3688}
3689
3690sub set_current_page {
3691 my ($self, $page_or_widget) = @_;
3692
3693 my $widget = ref $page_or_widget
3694 ? $page_or_widget
3695 : $self->{children}[$page_or_widget];
3696
3697 $self->{current} = $widget;
3698 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3699
3700 $self->emit (page_changed => $self->{current});
3701
3702 $self->realloc;
3703}
3704
3705sub visible_children {
3706 $_[0]{current}
3707}
3708
3709sub size_request {
3710 my ($self) = @_;
3711
3712 $self->{current}->size_request
3713}
3714
3715sub invoke_size_allocate {
3716 my ($self, $w, $h) = @_;
3717
3718 $self->{current}->configure (0, 0, $w, $h);
3719
3720 1
3721}
3722
3723sub _draw {
3724 my ($self) = @_;
3725
3726 $self->{current}->draw;
3727}
3728
3729#############################################################################
3730
3731package CFPlus::UI::Notebook;
3732
3733our @ISA = CFPlus::UI::VBox::;
3734
3735sub new {
3736 my $class = shift;
3737
3738 my $self = $class->SUPER::new (
3739 buttonbar => (new CFPlus::UI::Buttonbar),
3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3741 # filter => # will be put between multiplexer and $self
3742 @_,
3743 );
3744
3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3746 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3747
3748 $self
3749}
3750
3751sub add {
3752 my ($self, $title, $widget, $tooltip) = @_;
3753
3754 CFPlus::weaken $self;
3755
3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3758 markup => $title,
3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3764 $self->{buttonbar}->add ($title);
3765
3766 $self->{multiplexer}->add ($widget);
3767}
3768
3769sub get_current_page {
3770 my ($self) = @_;
3771
3772 $self->{multiplexer}->get_current_page
3773}
3774
3775sub set_current_page {
3776 my ($self, $page) = @_;
3777
3778 $self->{multiplexer}->set_current_page ($page);
3779 $self->emit (page_changed => $self->{multiplexer}{current});
3780}
3781
3782#############################################################################
3783
3784package CFPlus::UI::Selector;
3785
3786use utf8;
3787
3788our @ISA = CFPlus::UI::Button::;
3789
3790sub new {
3791 my $class = shift;
3792
3793 my $self = $class->SUPER::new (
3794 options => [], # [value, title, longdesc], ...
3795 value => undef,
3796 @_,
3797 );
3798
3799 $self->_set_value ($self->{value});
3800
3801 $self
3802}
3803
3804sub invoke_button_down {
3805 my ($self, $ev) = @_;
3806
3807 my @menu_items;
3808
3809 for (@{ $self->{options} }) {
3810 my ($value, $title, $tooltip) = @$_;
3811
3812 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3813 }
3814
3815 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3816}
3817
3818sub _set_value {
3819 my ($self, $value) = @_;
3820
3821 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3822 or return;
3823
3824 $self->{value} = $item->[0];
3825 $self->set_markup ("$item->[1] ⇓");
3826 $self->set_tooltip ($item->[2]);
3827}
3828
3829sub set_value {
3830 my ($self, $value) = @_;
3831
3832 return unless $self->{value} ne $value;
3833
3834 $self->_set_value ($value);
3835 $self->emit (changed => $value);
3836}
3837
3838#############################################################################
3839
3840package CFPlus::UI::Statusbox;
3841
3842our @ISA = CFPlus::UI::VBox::;
3843
3844sub new {
3845 my $class = shift;
3846
3847 my $self = $class->SUPER::new (
2866 fontsize => 0.8, 3848 fontsize => 0.8,
2867 @_, 3849 @_,
2868 ) 3850 );
3851
3852 CFPlus::weaken (my $this = $self);
3853
3854 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3855
3856 $self
2869} 3857}
2870 3858
2871sub reorder { 3859sub reorder {
2872 my ($self) = @_; 3860 my ($self) = @_;
2873 my $NOW = time; 3861 my $NOW = Time::HiRes::time;
3862
3863 # freeze display when hovering over any label
3864 return if $CFPlus::UI::TOOLTIP->{owner}
3865 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3866 values %{ $self->{item} };
2874 3867
2875 while (my ($k, $v) = each %{ $self->{item} }) { 3868 while (my ($k, $v) = each %{ $self->{item} }) {
2876 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3869 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877 } 3870 }
2878 3871
… …
2881 my @items = sort { 3874 my @items = sort {
2882 $a->{pri} <=> $b->{pri} 3875 $a->{pri} <=> $b->{pri}
2883 or $b->{id} <=> $a->{id} 3876 or $b->{id} <=> $a->{id}
2884 } values %{ $self->{item} }; 3877 } values %{ $self->{item} };
2885 3878
3879 $self->{timer}->interval (1);
3880
2886 my $count = 10 + 1; 3881 my $count = 10 + 1;
2887 for my $item (@items) { 3882 for my $item (@items) {
2888 last unless --$count; 3883 last unless --$count;
2889 3884
2890 push @widgets, $item->{label} ||= do { 3885 my $label = $item->{label} ||= do {
2891 # TODO: doesn't handle markup well (read as: at all) 3886 # TODO: doesn't handle markup well (read as: at all)
2892 my $short = $item->{count} > 1 3887 my $short = $item->{count} > 1
2893 ? "<b>$item->{count} ×</b> $item->{text}" 3888 ? "<b>$item->{count} ×</b> $item->{text}"
2894 : $item->{text}; 3889 : $item->{text};
2895 3890
2896 for ($short) { 3891 for ($short) {
2897 s/^\s+//; 3892 s/^\s+//;
2898 s/\s+/ /g; 3893 s/\s+/ /g;
2899 } 3894 }
2900 3895
2901 new CFClient::UI::Label 3896 new CFPlus::UI::Label
2902 markup => $short, 3897 markup => $short,
2903 tooltip => $item->{tooltip}, 3898 tooltip => $item->{tooltip},
2904 tooltip_font => $::FONT_PROP, 3899 tooltip_font => $::FONT_PROP,
2905 tooltip_width => 0.67, 3900 tooltip_width => 0.67,
2906 fontsize => $item->{fontsize} || $self->{fontsize}, 3901 fontsize => $item->{fontsize} || $self->{fontsize},
2907 max_w => $::WIDTH * 0.44, 3902 max_w => $::WIDTH * 0.44,
2908 fg => $item->{fg}, 3903 fg => [@{ $item->{fg} }],
2909 can_events => 1, 3904 can_events => 1,
2910 can_hover => 1 3905 can_hover => 1
2911 }; 3906 };
3907
3908 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3909 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3910 $label->update;
3911 $label->set_max_size (undef, $label->{req_h} * $diff)
3912 if $diff < 1;
3913 $self->{timer}->interval (1/30);
3914 } else {
3915 $label->{fg}[3] = $item->{fg}[3] || 1;
3916 }
3917
3918 push @widgets, $label;
2912 } 3919 }
2913 3920
2914 $self->clear; 3921 $self->clear;
2915 $self->SUPER::add (reverse @widgets); 3922 $self->SUPER::add (reverse @widgets);
2916} 3923}
… …
2921 $text =~ s/^\s+//; 3928 $text =~ s/^\s+//;
2922 $text =~ s/\s+$//; 3929 $text =~ s/\s+$//;
2923 3930
2924 return unless $text; 3931 return unless $text;
2925 3932
2926 my $timeout = time + ((delete $arg{timeout}) || 60); 3933 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2927 3934
2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3935 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929 3936
2930 if (my $item = $self->{item}{$group}) { 3937 if (my $item = $self->{item}{$group}) {
2931 if ($item->{text} eq $text) { 3938 if ($item->{text} eq $text) {
2932 $item->{count}++; 3939 $item->{count}++;
2933 } else { 3940 } else {
2934 $item->{count} = 1; 3941 $item->{count} = 1;
2935 $item->{text} = $item->{tooltip} = $text; 3942 $item->{text} = $item->{tooltip} = $text;
2936 } 3943 }
2937 $item->{id} = ++$self->{id}; 3944 $item->{id} += 0.2;#d#
2938 $item->{timeout} = $timeout; 3945 $item->{timeout} = $timeout;
2939 delete $item->{label}; 3946 delete $item->{label};
2940 } else { 3947 } else {
2941 $self->{item}{$group} = { 3948 $self->{item}{$group} = {
2942 id => ++$self->{id}, 3949 id => ++$self->{id},
… …
2948 count => 1, 3955 count => 1,
2949 %arg, 3956 %arg,
2950 }; 3957 };
2951 } 3958 }
2952 3959
3960 $ROOT->on_refresh (reorder => sub {
2953 $self->reorder; 3961 $self->reorder;
3962 });
2954} 3963}
2955 3964
2956sub reconfigure { 3965sub reconfigure {
2957 my ($self) = @_; 3966 my ($self) = @_;
2958 3967
… …
2961 3970
2962 $self->reorder; 3971 $self->reorder;
2963 $self->SUPER::reconfigure; 3972 $self->SUPER::reconfigure;
2964} 3973}
2965 3974
3975sub destroy {
3976 my ($self) = @_;
3977
3978 $self->{timer}->cancel;
3979
3980 $self->SUPER::destroy;
3981}
3982
2966############################################################################# 3983#############################################################################
2967 3984
2968package CFClient::UI::Inventory;
2969
2970our @ISA = CFClient::UI::ScrolledWindow::;
2971
2972sub new {
2973 my $class = shift;
2974
2975 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_,
2978 );
2979
2980 $self
2981}
2982
2983sub set_items {
2984 my ($self, $items) = @_;
2985
2986 $self->{scrolled}->clear;
2987 return unless $items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006}
3007
3008#############################################################################
3009
3010package CFClient::UI::BindEditor;
3011
3012our @ISA = CFClient::UI::FancyFrame::;
3013
3014sub new {
3015 my $class = shift;
3016
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3018
3019 $self->add (my $vb = new CFClient::UI::VBox);
3020
3021
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3023 text => "start recording",
3024 tooltip => "Start/Stops recording of actions."
3025 ."All subsequent actions after the recording started will be captured."
3026 ."The actions are displayed after the record was stopped."
3027 ."To bind the action you have to click on the 'Bind' button",
3028 on_activate => sub {
3029 unless ($self->{recording}) {
3030 $self->start;
3031 } else {
3032 $self->stop;
3033 }
3034 });
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 });
3120}
3121
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3129
3130 $self->clear_command_list;
3131 $self->{recording} = 0;
3132 $self->{rec_btn}->set_text ("start recording");
3133
3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
3152
3153sub update_binding_widgets {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell {
3219 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell;
3221
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249}
3250
3251sub remove_spell {
3252 my ($self, $spell) = @_;
3253 delete $self->{spells}->{$spell->{name}};
3254 $self->rebuild_spell_list;
3255}
3256
3257#############################################################################
3258
3259package CFClient::UI::Root; 3985package CFPlus::UI::Root;
3260 3986
3261our @ISA = CFClient::UI::Container::; 3987our @ISA = CFPlus::UI::Container::;
3262 3988
3989use List::Util qw(min max);
3990
3263use CFClient::OpenGL; 3991use CFPlus::OpenGL;
3264 3992
3265sub new { 3993sub new {
3266 my $class = shift; 3994 my $class = shift;
3267 3995
3268 my $self = $class->SUPER::new ( 3996 my $self = $class->SUPER::new (
3269 visible => 1, 3997 visible => 1,
3270 @_, 3998 @_,
3271 ); 3999 );
3272 4000
3273 Scalar::Util::weaken ($self->{root} = $self); 4001 CFPlus::weaken ($self->{root} = $self);
3274 4002
3275 $self 4003 $self
3276} 4004}
3277 4005
3278sub size_request { 4006sub size_request {
… …
3293 $coord = $max - $size if $coord > $max - $size; 4021 $coord = $max - $size if $coord > $max - $size;
3294 4022
3295 int $coord + 0.5 4023 int $coord + 0.5
3296} 4024}
3297 4025
3298sub size_allocate { 4026sub invoke_size_allocate {
3299 my ($self, $w, $h) = @_; 4027 my ($self, $w, $h) = @_;
3300 4028
3301 for my $child ($self->children) { 4029 for my $child ($self->children) {
3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4030 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3303 4031
… …
3307 $X = _to_pixel $X, $W, $self->{w}; 4035 $X = _to_pixel $X, $W, $self->{w};
3308 $Y = _to_pixel $Y, $H, $self->{h}; 4036 $Y = _to_pixel $Y, $H, $self->{h};
3309 4037
3310 $child->configure ($X, $Y, $W, $H); 4038 $child->configure ($X, $Y, $W, $H);
3311 } 4039 }
4040
4041 1
3312} 4042}
3313 4043
3314sub coord2local { 4044sub coord2local {
3315 my ($self, $x, $y) = @_; 4045 my ($self, $x, $y) = @_;
3316 4046
… …
3371 while ($self->{refresh_hook}) { 4101 while ($self->{refresh_hook}) {
3372 $_->() 4102 $_->()
3373 for values %{delete $self->{refresh_hook}}; 4103 for values %{delete $self->{refresh_hook}};
3374 } 4104 }
3375 4105
3376 if ($self->{realloc}) { 4106 while ($self->{realloc}) {
4107 my %queue;
3377 my @queue; 4108 my @queue;
4109 my $widget;
3378 4110
4111 outer:
3379 while () { 4112 while () {
3380 if ($self->{realloc}) { 4113 if (my $realloc = delete $self->{realloc}) {
3381 #TODO use array-of-depth approach 4114 for $widget (values %$realloc) {
4115 $widget->{visible} or next; # do not resize invisible widgets
3382 4116
3383 use sort 'stable'; 4117 $queue{$widget+0}++ and next; # duplicates are common
3384 4118
3385 @queue = sort { $a->{visible} <=> $b->{visible} } 4119 push @{ $queue[$widget->{visible}] }, $widget;
3386 @queue, values %{delete $self->{realloc}}; 4120 }
3387 } 4121 }
3388 4122
4123 while () {
4124 @queue or last outer;
4125
3389 my $widget = pop @queue || last; 4126 $widget = pop @{ $queue[-1] || [] }
4127 and last;
4128
4129 pop @queue;
4130 }
3390 4131
3391 $widget->{visible} or last; # do not resize invisible widgets 4132 delete $queue{$widget+0};
3392 4133
3393 my ($w, $h) = $widget->size_request; 4134 my ($w, $h) = $widget->size_request;
3394 4135
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4136 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4137 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4138
4139 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4140 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3397 4141
3398 $w = $widget->{force_w} if exists $widget->{force_w}; 4142 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h}; 4143 $h = $widget->{force_h} if exists $widget->{force_h};
3400 4144
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4145 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3404 $widget->{req_h} = $h; 4148 $widget->{req_h} = $h;
3405 4149
3406 $self->{size_alloc}{$widget+0} = $widget; 4150 $self->{size_alloc}{$widget+0} = $widget;
3407 4151
3408 if (my $parent = $widget->{parent}) { 4152 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent; 4153 $self->{realloc}{$parent+0} = $parent
3410 #unshift @queue, $parent; 4154 unless $queue{$parent+0};
4155
3411 $parent->{force_size_alloc} = 1; 4156 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent; 4157 $self->{size_alloc}{$parent+0} = $parent;
3413 } 4158 }
3414 } 4159 }
3415 4160
3416 delete $self->{realloc}{$widget+0}; 4161 delete $self->{realloc}{$widget+0};
3417 } 4162 }
3418 }
3419 4163
3420 while (my $size_alloc = delete $self->{size_alloc}) { 4164 while (my $size_alloc = delete $self->{size_alloc}) {
3421 my @queue = sort { $b->{visible} <=> $a->{visible} } 4165 my @queue = sort { $a->{visible} <=> $b->{visible} }
3422 values %$size_alloc; 4166 values %$size_alloc;
3423 4167
3424 while () { 4168 while () {
3425 my $widget = pop @queue || last; 4169 my $widget = pop @queue || last;
3426 4170
3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4171 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3428 4172
3429 $w = 0 if $w < 0; 4173 $w = max $widget->{min_w}, $w;
3430 $h = 0 if $h < 0; 4174 $h = max $widget->{min_h}, $h;
3431 4175
4176# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4177# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4178
4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4181
3432 $w = int $w + 0.5; 4182 $w = int $w + 0.5;
3433 $h = int $h + 0.5; 4183 $h = int $h + 0.5;
3434 4184
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4186 $widget->{old_w} = $widget->{w};
4187 $widget->{old_h} = $widget->{h};
4188
3436 $widget->{w} = $w; 4189 $widget->{w} = $w;
3437 $widget->{h} = $h; 4190 $widget->{h} = $h;
3438 4191
3439 $widget->emit (size_allocate => $w, $h); 4192 $widget->emit (size_allocate => $w, $h);
4193 }
3440 } 4194 }
3441 } 4195 }
3442 } 4196 }
3443 4197
3444 while ($self->{post_alloc_hook}) { 4198 while ($self->{post_alloc_hook}) {
3445 $_->() 4199 $_->()
3446 for values %{delete $self->{post_alloc_hook}}; 4200 for values %{delete $self->{post_alloc_hook}};
3447 } 4201 }
3448
3449 4202
3450 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4203 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4204 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3452 glClear GL_COLOR_BUFFER_BIT; 4205 glClear GL_COLOR_BUFFER_BIT;
3453 4206
… …
3455 glLoadIdentity; 4208 glLoadIdentity;
3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4209 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3457 glMatrixMode GL_MODELVIEW; 4210 glMatrixMode GL_MODELVIEW;
3458 glLoadIdentity; 4211 glLoadIdentity;
3459 4212
4213 {
4214 package CFPlus::UI::Base;
4215
4216 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4217 (0, 0, $self->{w}, $self->{h});
4218
3460 $self->_draw; 4219 $self->_draw;
4220 }
3461} 4221}
3462 4222
3463############################################################################# 4223#############################################################################
3464 4224
3465package CFClient::UI; 4225package CFPlus::UI;
3466 4226
3467$ROOT = new CFClient::UI::Root; 4227$ROOT = new CFPlus::UI::Root;
3468$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4228$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3469 4229
34701 42301
3471 4231

Diff Legend

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