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

Diff Legend

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