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.138 by root, Wed Apr 19 23:37:49 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

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

Diff Legend

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