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

Diff Legend

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