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

Diff Legend

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