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.188 by root, Mon May 8 21:16:09 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
15 43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_markup ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 60 }
40 61
41 return; 62 return;
42 } 63 }
43 } 64 }
… …
47 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
48} 69}
49 70
50# class methods for events 71# class methods for events
51sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 74 if $FOCUS;
54} 75}
55 76
56sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 79 if $FOCUS;
59} 80}
60 81
61sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
62 my ($ev) = @_; 83 my ($ev) = @_;
… …
71 check_tooltip; 92 check_tooltip;
72 } 93 }
73 94
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 96
76 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 99}
81 100
82sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
83 my ($ev) = @_; 102 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
85 104
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 106
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 108
90 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 111
95 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 114 $grab->update if $grab;
98 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 132
116 check_tooltip; 133 check_tooltip;
117 } 134 }
118 135
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 137 if $HOVER;
123} 138}
124 139
125# convert position array to integers 140# convert position array to integers
126sub harmonize { 141sub harmonize {
127 my ($vals) = @_; 142 my ($vals) = @_;
… …
133 $rem += $_ - $i; 148 $rem += $_ - $i;
134 $_ = $i; 149 $_ = $i;
135 } 150 }
136} 151}
137 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
138############################################################################# 194#############################################################################
139 195
140package CFClient::UI::Base; 196package CFClient::UI::Base;
141 197
142use strict; 198use strict;
… …
145 201
146sub new { 202sub new {
147 my $class = shift; 203 my $class = shift;
148 204
149 my $self = bless { 205 my $self = bless {
150 x => 0, 206 x => "center",
151 y => 0, 207 y => "center",
152 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
153 can_events => 1, 211 can_events => 1,
154 @_ 212 @_
155 }, $class; 213 }, $class;
156 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
157 for (keys %$self) { 217 for (keys %$self) {
158 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
160 } 220 }
161 } 221 }
162 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
163 $self 235 $self
164} 236}
165 237
166sub destroy { 238sub destroy {
167 my ($self) = @_; 239 my ($self) = @_;
… …
176 return if $self->{parent}; 248 return if $self->{parent};
177 249
178 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
179} 251}
180 252
181sub hide { 253sub set_visible {
182 my ($self) = @_; 254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
183 277
184 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
186 280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
187 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
188 if $self->{parent}; 312 if $self->{parent};
189} 313}
190 314
191sub move { 315sub move_abs {
192 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
193 317
194 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
197 321
198 $self->update; 322 $self->update;
199} 323}
200 324
201sub set_size { 325sub set_size {
202 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
203 327
204 $self->{user_w} = $w; 328 $self->{force_w} = $w;
205 $self->{user_h} = $h; 329 $self->{force_h} = $h;
206 330
207 $self->check_size; 331 $self->realloc;
208} 332}
209 333
210sub size_request { 334sub size_request {
211 require Carp; 335 require Carp;
212 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
214 338
215sub configure { 339sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
217 341
218 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
221 347
222 # use alignment to adjust x, y 348 # use alignment to adjust x, y
223 349
224 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 352 }
229 353
230 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 355 $self->{x} = $x;
232 $self->{y} = $y; 356 $self->{y} = $y;
233 $self->update; 357 $self->update;
234 } 358 }
235 359
236 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 361 return unless $self->{visible};
238 $self->{h} = $h;
239 362
240 $self->size_allocate ($w, $h); 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 364 }
244} 365}
245 366
246sub size_allocate { 367sub size_allocate {
247 # nothing to be done 368 # nothing to be done
248} 369}
249 370
250sub children { 371sub children {
251} 372}
252 373
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263}
264
265sub set_max_size { 374sub set_max_size {
266 my ($self, $w, $h) = @_; 375 my ($self, $w, $h) = @_;
267 376
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 377 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 378 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 379}
271 380
272# return top left coordinates 381sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 382 my ($self, $tooltip) = @_;
275 383
276 $self->{parent} 384 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 385 $tooltip =~ s/\s+$//;
278 386
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 387 return if $self->{tooltip} eq $tooltip;
388
389 $self->{tooltip} = $tooltip;
390
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip;
394 }
280} 395}
281 396
282# translate global coordinates to local coordinate system 397# translate global coordinates to local coordinate system
283sub coord2local { 398sub coord2local {
284 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
285 400
286 my ($X, $Y) = $self->_topleft; 401 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 402}
289 403
290# translate local coordinates to global coordinate system 404# translate local coordinates to global coordinate system
291sub coord2global { 405sub coord2global {
292 my ($self, $x, $y) = @_; 406 my ($self, $x, $y) = @_;
293 407
294 my ($X, $Y) = $self->_topleft; 408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 409}
297 410
298sub focus_in { 411sub focus_in {
299 my ($self) = @_; 412 my ($self) = @_;
300 413
301 return if $FOCUS == $self; 414 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 415 return unless $self->{can_focus};
303 416
304 my $focus = $FOCUS; $FOCUS = $self; 417 my $focus = $FOCUS; $FOCUS = $self;
305 418
306 $self->emit (focus_in => $focus); 419 $self->_emit (focus_in => $focus);
307 420
308 $focus->update if $focus; 421 $focus->update if $focus;
309 $FOCUS->update; 422 $FOCUS->update;
310} 423}
311 424
… …
314 427
315 return unless $FOCUS == $self; 428 return unless $FOCUS == $self;
316 429
317 my $focus = $FOCUS; undef $FOCUS; 430 my $focus = $FOCUS; undef $FOCUS;
318 431
319 $self->emit (focus_out => $focus); 432 $self->_emit (focus_out => $focus);
320 433
321 $focus->update if $focus; #? 434 $focus->update if $focus; #?
435
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
437 unless $FOCUS;
322} 438}
323 439
324sub mouse_motion { } 440sub mouse_motion { }
325sub button_up { } 441sub button_up { }
326sub key_down { } 442sub key_down { }
327sub key_up { } 443sub key_up { }
328 444
329sub button_down { 445sub button_down {
330 my ($self, $ev, $x, $y) = @_; 446 my ($self, $ev, $x, $y) = @_;
331 447
332 $self->focus_in; 448 $self->focus_in;
… …
335sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
336sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
337sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
338sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
339sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456
457sub find_widget {
458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self};
504
505 $self->{root}{realloc}{$self} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 }
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
518
519sub reconfigure {
520 my ($self) = @_;
521
522 $self->realloc;
523 $self->update;
524}
340 525
341sub draw { 526sub draw {
342 my ($self) = @_; 527 my ($self) = @_;
343 528
344 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
361 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
362 glEnd; 547 glEnd;
363 glDisable GL_BLEND; 548 glDisable GL_BLEND;
364 } 549 }
365 550
366 if ($ENV{PCLIENT_DEBUG}) { 551 if ($ENV{CFPLUS_DEBUG}) {
367 glPushMatrix; 552 glPushMatrix;
368 glColor 1, 1, 0, 1; 553 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 555 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 556 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 557 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 558 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 559 glVertex 0 , $self->{h} - 1;
375 glEnd; 560 glEnd;
376 glPopMatrix; 561 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 563 }
379} 564}
380 565
381sub _draw { 566sub _draw {
382 my ($self) = @_; 567 my ($self) = @_;
383 568
384 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
385} 570}
386 571
387sub find_widget {
388 my ($self, $x, $y) = @_;
389
390 return () unless $self->{can_events};
391
392 return $self
393 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
394 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
395
396 ()
397}
398
399sub set_parent {
400 my ($self, $parent) = @_;
401
402 Scalar::Util::weaken ($self->{parent} = $parent);
403}
404
405sub check_size {
406 my ($self) = @_;
407
408 $self->{parent}
409 or return 1;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429}
430
431sub update {
432 my ($self) = @_;
433
434 $self->{parent}->update
435 if $self->{parent};
436}
437
438sub connect {
439 my ($self, $signal, $cb) = @_;
440
441 push @{ $self->{signal_cb}{$signal} }, $cb;
442}
443
444sub emit {
445 my ($self, $signal, @args) = @_;
446
447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
448}
449
450sub DESTROY { 572sub DESTROY {
451 my ($self) = @_; 573 my ($self) = @_;
452 574
575 delete $WIDGET{$self+0};
453 #$self->deactivate; 576 #$self->deactivate;
454} 577}
455 578
456############################################################################# 579#############################################################################
457 580
… …
466 my $class = shift; 589 my $class = shift;
467 590
468 # range [value, low, high, page] 591 # range [value, low, high, page]
469 592
470 $class->SUPER::new ( 593 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 594 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 595 #active_bg => [1, 1, 1, 0.5],
473 @_ 596 @_
474 ) 597 )
475} 598}
476 599
477sub _draw { 600sub _draw {
478 my ($self) = @_; 601 my ($self) = @_;
479 602
603 my $color = $FOCUS == $self && $self->{active_bg}
604 ? $self->{active_bg}
605 : $self->{bg};
606
607 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 608 my ($w, $h) = @$self{qw(w h)};
481 609
482 glEnable GL_BLEND; 610 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 612 glColor @$color;
485 613
486 glBegin GL_QUADS; 614 glBegin GL_QUADS;
487 glVertex 0 , 0; 615 glVertex 0 , 0;
488 glVertex 0 , $h; 616 glVertex 0 , $h;
489 glVertex $w, $h; 617 glVertex $w, $h;
490 glVertex $w, 0; 618 glVertex $w, 0;
491 glEnd; 619 glEnd;
492 620
493 glDisable GL_BLEND; 621 glDisable GL_BLEND;
622 }
494} 623}
495 624
496############################################################################# 625#############################################################################
497 626
498package CFClient::UI::Empty; 627package CFClient::UI::Empty;
… …
503 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
504 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
505} 634}
506 635
507sub size_request { 636sub size_request {
508 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
509} 640}
510 641
511sub draw { } 642sub draw { }
512 643
513############################################################################# 644#############################################################################
… …
542 $self->{children} = [ 673 $self->{children} = [
543 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
544 @{$self->{children}}, @widgets 675 @{$self->{children}}, @widgets
545 ]; 676 ];
546 677
547 $_->check_size 678 $self->realloc;
548 for @widgets;
549
550 $self->update;
551} 679}
552 680
553sub children { 681sub children {
554 @{ $_[0]{children} } 682 @{ $_[0]{children} }
555} 683}
… …
560 delete $child->{parent}; 688 delete $child->{parent};
561 $child->hide; 689 $child->hide;
562 690
563 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
564 692
565 $self->check_size; 693 $self->realloc;
566 $self->update;
567} 694}
568 695
569sub clear { 696sub clear {
570 my ($self) = @_; 697 my ($self) = @_;
571 698
… …
575 for (@$children) { 702 for (@$children) {
576 delete $_->{parent}; 703 delete $_->{parent};
577 $_->hide; 704 $_->hide;
578 } 705 }
579 706
580 $self->check_size; 707 $self->realloc;
581 $self->update;
582} 708}
583 709
584sub find_widget { 710sub find_widget {
585 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
586 712
… …
639sub size_request { 765sub size_request {
640 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
641} 767}
642 768
643sub size_allocate { 769sub size_allocate {
644 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
645 771
646 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
647} 773}
648 774
649############################################################################# 775#############################################################################
… …
661} 787}
662 788
663sub update { 789sub update {
664 my ($self) = @_; 790 my ($self) = @_;
665 791
666 $ROOT->on_refresh ($self => sub { $self->render_child }); 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
667 $self->SUPER::update; 793 $self->SUPER::update;
668} 794}
669 795
670sub size_allocate { 796sub size_allocate {
671 my ($self, $w, $h) = @_; 797 my ($self, $w, $h, $changed) = @_;
672 798
673 $self->SUPER::size_allocate ($w, $h); 799 $self->SUPER::size_allocate ($w, $h, $changed);
674 $self->update; 800 $self->update
801 if $changed;
675} 802}
676 803
677sub _render { 804sub _render {
678 $_[0]{children}[0]->draw; 805 $_[0]{children}[0]->draw;
679} 806}
… …
684 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
685 glClearColor 0, 0, 0, 0; 812 glClearColor 0, 0, 0, 0;
686 glClear GL_COLOR_BUFFER_BIT; 813 glClear GL_COLOR_BUFFER_BIT;
687 814
688 $self->_render; 815 $self->_render;
689# glColorMask 1, 1, 1, 0;
690# glEnable GL_BLEND;
691# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692# glRasterPos 0, 0;
693# glCopyPixels 0, 0, $self->{w}, $self->{h};
694# glDisable GL_BLEND;
695# glColorMask 1, 1, 1, 1;
696 }; 816 };
697} 817}
698 818
699sub _draw { 819sub _draw {
700 my ($self) = @_; 820 my ($self) = @_;
… …
702 my ($w, $h) = ($self->w, $self->h); 822 my ($w, $h) = ($self->w, $self->h);
703 823
704 my $tex = $self->{texture} 824 my $tex = $self->{texture}
705 or return; 825 or return;
706 826
707 glEnable GL_BLEND;
708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
709 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
710 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711 glColor 0, 0, 0, 1; 829 glColor 1, 1, 1, 1;
712 830
713 $tex->draw_quad (0, 0, $w, $h); 831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
714 832
715 glDisable GL_BLEND;
716 glDisable GL_TEXTURE_2D; 833 glDisable GL_TEXTURE_2D;
717} 834}
718 835
719############################################################################# 836#############################################################################
720 837
721package CFClient::UI::ViewPort; 838package CFClient::UI::ViewPort;
722 839
723our @ISA = CFClient::UI::Window::; 840our @ISA = CFClient::UI::Window::;
724 841
842sub new {
843 my $class = shift;
844
845 $class->SUPER::new (
846 scroll_x => 0,
847 scroll_y => 1,
848 @_,
849 )
850}
851
725sub size_request { 852sub size_request {
726 my ($self) = @_; 853 my ($self) = @_;
727 854
728 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
729 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
730 856
731 @$self{qw(child_w child_h)} 857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
732} 861}
733 862
734sub size_allocate { 863sub size_allocate {
735 my ($self, $w, $h) = @_; 864 my ($self, $w, $h, $changed) = @_;
736 865
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
868
869 $self->child->configure (0, 0, $w, $h);
737 $self->update; 870 $self->update;
738} 871}
739 872
740sub set_offset { 873sub set_offset {
741 my ($self, $x, $y) = @_; 874 my ($self, $x, $y) = @_;
… …
744 $self->{view_y} = int $y; 877 $self->{view_y} = int $y;
745 878
746 $self->update; 879 $self->update;
747} 880}
748 881
749# hmm, this does not work for topleft of $self... but we should not aks for that 882# hmm, this does not work for topleft of $self... but we should not ask for that
750sub _topleft { 883sub coord2local {
751 my ($self, $x, $y) = @_; 884 my ($self, $x, $y) = @_;
752 885
753 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 886 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
887}
888
889sub coord2global {
890 my ($self, $x, $y) = @_;
891
892 $x = List::Util::min $self->{w}, $x - $self->{view_x};
893 $y = List::Util::min $self->{h}, $y - $self->{view_y};
894
895 $self->SUPER::coord2global ($x, $y)
754} 896}
755 897
756sub find_widget { 898sub find_widget {
757 my ($self, $x, $y) = @_; 899 my ($self, $x, $y) = @_;
758 900
… …
783 my $class = shift; 925 my $class = shift;
784 926
785 my $self; 927 my $self;
786 928
787 my $slider = new CFClient::UI::Slider 929 my $slider = new CFClient::UI::Slider
788 vertical => 1, 930 vertical => 1,
789 range => [0, 0, 1, 0.01], # HACK fix 931 range => [0, 0, 1, 0.01], # HACK fix
790 connect_changed => sub { 932 on_changed => sub {
791 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 933 $self->{vp}->set_offset (0, $_[1]);
792 }, 934 },
793 ; 935 ;
794 936
795 $self = $class->SUPER::new ( 937 $self = $class->SUPER::new (
796 vp => (new CFClient::UI::ViewPort), 938 vp => (new CFClient::UI::ViewPort expand => 1),
797 slider => $slider, 939 slider => $slider,
798 @_, 940 @_,
799 ); 941 );
800 942
801 $self->{vp}->add ($self->{scrolled}); 943 $self->{vp}->add ($self->{scrolled});
… …
803 $self->add ($self->{slider}); 945 $self->add ($self->{slider});
804 946
805 $self 947 $self
806} 948}
807 949
950sub update {
951 my ($self) = @_;
952
953 $self->SUPER::update;
954
955 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
960sub size_allocate {
961 my ($self, $w, $h, $changed) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967}
968
808#TODO# update range on size_allocate depeneing on child 969#TODO# update range on size_allocate depending on child
809# update viewport offset on scroll 970# update viewport offset on scroll
810 971
811############################################################################# 972#############################################################################
812 973
813package CFClient::UI::Frame; 974package CFClient::UI::Frame;
… …
817use CFClient::OpenGL; 978use CFClient::OpenGL;
818 979
819sub new { 980sub new {
820 my $class = shift; 981 my $class = shift;
821 982
822 my $self = $class->SUPER::new ( 983 $class->SUPER::new (
823 bg => [1, 1, 1, 1], 984 bg => undef,
824 border_bg => [1, 1, 1, 1],
825 border => 0.8,
826 @_ 985 @_,
827 ); 986 )
828
829 $self
830} 987}
831 988
832sub _draw { 989sub _draw {
833 my ($self) = @_; 990 my ($self) = @_;
834 991
835 my ($w, $h) = ($self->{w}, $self->{h}); 992 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)};
836 994
837 glEnable GL_BLEND; 995 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 997 glColor @{ $self->{bg} };
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
841 998
842# glBegin GL_QUADS; 999 glBegin GL_QUADS;
843# glColor 0, 0, 0, 0;
844# glVertex 0 , 0; 1000 glVertex 0 , 0;
845# glVertex 0 , $h; 1001 glVertex 0 , $h;
846# glVertex $w, $h; 1002 glVertex $w, $h;
847# glVertex $w, 0; 1003 glVertex $w, 0;
848# glEnd; 1004 glEnd;
849 1005
850
851 $self->child->draw;
852 glDisable GL_BLEND; 1006 glDisable GL_BLEND;
853 glDisable GL_TEXTURE_2D; 1007 }
1008
1009 $self->SUPER::_draw;
854} 1010}
855 1011
856############################################################################# 1012#############################################################################
857 1013
858package CFClient::UI::FancyFrame; 1014package CFClient::UI::FancyFrame;
859 1015
860our @ISA = CFClient::UI::Bin::; 1016our @ISA = CFClient::UI::Bin::;
861 1017
862use CFClient::OpenGL; 1018use CFClient::OpenGL;
863 1019
864my @tex = 1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
866 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
867 1027
868sub new { 1028sub new {
869 my $class = shift; 1029 my $class = shift;
870 1030
871 # TODO: user_x, user_y, overwrite moveto?
872
873 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
874 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
875 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
876 border => 0.6, 1034 border => 0.6,
877 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
878 @_ 1038 @_
879 ); 1039 );
880 1040
881 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
882 align => 0, 1042 align => 0,
… …
901 $h + $self->border * 2, 1061 $h + $self->border * 2,
902 ) 1062 )
903} 1063}
904 1064
905sub size_allocate { 1065sub size_allocate {
906 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
907 1069
908 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
909 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
910 1072
911 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
912 if $self->{title}; 1074 if $self->{title};
913 1075
914 $self->child->configure ($self->border, $self->border, $w, $h); 1076 $self->child->configure ($self->border, $self->border, $w, $h);
915} 1077}
916 1078
… …
935 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
936 1098
937 my $dx = $ev->{x} - $ox; 1099 my $dx = $ev->{x} - $ox;
938 my $dy = $ev->{y} - $oy; 1100 my $dy = $ev->{y} - $oy;
939 1101
940 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
941 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104
1105 $self->realloc;
942 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
943 $self->check_size;
944 }; 1107 };
945 1108
946 } elsif ($lr ^ $td) { 1109 } elsif ($lr ^ $td) {
947 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
948 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
… …
950 $self->{motion} = sub { 1113 $self->{motion} = sub {
951 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
952 1115
953 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
954 1117
955 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
956 $self->update;
957 }; 1119 };
958 } 1120 }
959} 1121}
960 1122
961sub button_up { 1123sub button_up {
… …
974 my ($self) = @_; 1136 my ($self) = @_;
975 1137
976 my ($w, $h ) = ($self->{w}, $self->{h}); 1138 my ($w, $h ) = ($self->{w}, $self->{h});
977 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
978 1140
979 glEnable GL_BLEND;
980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
981 glEnable GL_TEXTURE_2D; 1141 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1143
984 my $border = $self->border; 1144 my $border = $self->border;
985 1145
986 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1151
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1153 glColor @{ $self->{bg} };
994 1154
995 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
1156 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1157 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1158 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 }
1005 1161
1006 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND;
1008 }
1009 1163
1010 $self->{title}->draw if $self->{title}; 1164 $self->{title}->draw if $self->{title};
1011 1165
1012 $self->child->draw; 1166 $self->child->draw;
1013} 1167}
… …
1025sub new { 1179sub new {
1026 my $class = shift; 1180 my $class = shift;
1027 1181
1028 $class->SUPER::new ( 1182 $class->SUPER::new (
1029 col_expand => [], 1183 col_expand => [],
1030 @_ 1184 @_,
1031 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032} 1190}
1033 1191
1034sub add { 1192sub add {
1035 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
1036 1194
1037 $child->set_parent ($self); 1195 $child->set_parent ($self);
1038 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
1039 1197
1040 $child->check_size; 1198 $self->realloc;
1041} 1199}
1042 1200
1043sub children {
1044 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1045}
1046
1047# TODO: move to container class maybe? send childs a signal on removal? 1201# TODO: move to container class maybe? send children a signal on removal?
1048sub clear { 1202sub clear {
1049 my ($self) = @_; 1203 my ($self) = @_;
1050 1204
1051 my @children = $self->children; 1205 my @children = $self->children;
1052 delete $self->{children}; 1206 delete $self->{children};
… …
1054 for (@children) { 1208 for (@children) {
1055 delete $_->{parent}; 1209 delete $_->{parent};
1056 $_->hide; 1210 $_->hide;
1057 } 1211 }
1058 1212
1059 $self->update; 1213 $self->realloc;
1060} 1214}
1061 1215
1062sub get_wh { 1216sub get_wh {
1063 my ($self) = @_; 1217 my ($self) = @_;
1064 1218
… …
1091 (sum @$hs), 1245 (sum @$hs),
1092 ) 1246 )
1093} 1247}
1094 1248
1095sub size_allocate { 1249sub size_allocate {
1096 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
1097 1251
1098 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
1099 1253
1100 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
1101 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
1102 1256
1103 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
1104 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
1105 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
1106 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
1160 } 1314 }
1161} 1315}
1162 1316
1163############################################################################# 1317#############################################################################
1164 1318
1319package CFClient::UI::Box;
1320
1321our @ISA = CFClient::UI::Container::;
1322
1323sub size_request {
1324 my ($self) = @_;
1325
1326 $self->{vertical}
1327 ? (
1328 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1330 )
1331 : (
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 )
1335}
1336
1337sub size_allocate {
1338 my ($self, $w, $h, $changed) = @_;
1339
1340 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children};
1342
1343 my @req;
1344
1345 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children;
1347 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1349 my $req = List::Util::sum @req;
1350
1351 if ($req > $space) {
1352 # ah well, not enough space
1353 $_ *= $space / $req for @req;
1354 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1356
1357 $space = ($space - $req) / $expand; # remaining space to give away
1358
1359 $req[$_] += $space * $children->[$_]{expand}
1360 for 0 .. $#$children;
1361 }
1362 }
1363
1364 CFClient::UI::harmonize \@req;
1365
1366 my $pos = 0;
1367 for (0 .. $#$children) {
1368 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370
1371 $pos += $alloc;
1372 }
1373
1374 1
1375}
1376
1377#############################################################################
1378
1165package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
1166 1380
1167# TODO: wrap into common Box base class
1168
1169our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
1170 1382
1171sub size_request { 1383sub new {
1172 my ($self) = @_; 1384 my $class = shift;
1173 1385
1174 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
1175 1387 vertical => 0,
1176 ( 1388 @_,
1177 (List::Util::sum map $_->[0], @alloc),
1178 (List::Util::max map $_->[1], @alloc),
1179 ) 1389 )
1180} 1390}
1181 1391
1182sub size_allocate {
1183 my ($self, $w, $h) = @_;
1184
1185 ($h, $w) = ($w, $h);
1186
1187 my $children = $self->{children};
1188
1189 my @h = map $_->{req_w}, @$children;
1190
1191 my $req_h = List::Util::sum @h;
1192
1193 if ($req_h > $h) {
1194 # ah well, not enough space
1195 $_ *= $h / $req_h for @h;
1196 } else {
1197 my $exp = List::Util::sum map $_->{expand}, @$children;
1198 $exp ||= 1;
1199
1200 for (0 .. $#$children) {
1201 my $child = $children->[$_];
1202
1203 my $alloc_h = $h[$_];
1204 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1205 $h[$_] = $alloc_h;
1206 }
1207 }
1208
1209 CFClient::UI::harmonize \@h;
1210
1211 my $y = 0;
1212 for (0 .. $#$children) {
1213 my $child = $children->[$_];
1214 my $h = $h[$_];
1215 $child->configure ($y, 0, $h, $w);
1216
1217 $y += $h;
1218 }
1219
1220 1
1221}
1222
1223############################################################################# 1392#############################################################################
1224 1393
1225package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1226 1395
1227# TODO: wrap into common Box base class
1228
1229our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1230 1397
1231sub size_request { 1398sub new {
1232 my ($self) = @_; 1399 my $class = shift;
1233 1400
1234 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1235 1402 vertical => 1,
1236 ( 1403 @_,
1237 (List::Util::max map $_->[0], @alloc),
1238 (List::Util::sum map $_->[1], @alloc),
1239 ) 1404 )
1240} 1405}
1241 1406
1242sub size_allocate {
1243 my ($self, $w, $h) = @_;
1244
1245 my $children = $self->{children};
1246
1247 my @h = map $_->{req_h}, @$children;
1248
1249 my $req_h = List::Util::sum @h;
1250
1251 if ($req_h > $h) {
1252 # ah well, not enough space
1253 $_ *= $h / $req_h for @h;
1254 } else {
1255 my $exp = List::Util::sum map $_->{expand}, @$children;
1256 $exp ||= 1;
1257
1258 for (0 .. $#$children) {
1259 my $child = $children->[$_];
1260
1261 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1262 }
1263 }
1264
1265 CFClient::UI::harmonize \@h;
1266
1267 my $y = 0;
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_];
1271 $child->configure (0, $y, $w, $h);
1272
1273 $y += $h;
1274 }
1275
1276 1
1277}
1278
1279############################################################################# 1407#############################################################################
1280 1408
1281package CFClient::UI::Label; 1409package CFClient::UI::Label;
1282 1410
1283our @ISA = CFClient::UI::Base::; 1411our @ISA = CFClient::UI::DrawBG::;
1284 1412
1285use CFClient::OpenGL; 1413use CFClient::OpenGL;
1286 1414
1287sub new { 1415sub new {
1288 my ($class, %arg) = @_; 1416 my ($class, %arg) = @_;
1289 1417
1290 my $self = $class->SUPER::new ( 1418 my $self = $class->SUPER::new (
1291 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1420 #bg => none
1421 #active_bg => none
1292 #font => default_font 1422 #font => default_font
1423 #text => initial text
1424 #markup => initial narkup
1425 #max_w => maximum pixel width
1426 ellipsise => 3, # end
1427 layout => (new CFClient::Layout),
1293 fontsize => 1, 1428 fontsize => 1,
1294 text => "",
1295 align => -1, 1429 align => -1,
1296 valign => -1, 1430 valign => -1,
1297 padding => 2, 1431 padding_x => 2,
1298 layout => new CFClient::Layout, 1432 padding_y => 2,
1299 can_events => 0, 1433 can_events => 0,
1300 %arg 1434 %arg
1301 ); 1435 );
1302 1436
1303 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
1304 my $layout = new CFClient::Layout; 1438 my $layout = new CFClient::Layout;
1305 $layout->set_text (delete $self->{template}); 1439 $layout->set_text (delete $self->{template});
1306 $self->{template} = $layout; 1440 $self->{template} = $layout;
1307 } 1441 }
1308 1442
1309 $self->set_text (delete $self->{text}) if exists $self->{text}; 1443 if (exists $self->{markup}) {
1310 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1444 $self->set_markup (delete $self->{markup});
1445 } else {
1446 $self->set_text (delete $self->{text});
1447 }
1311 1448
1312 $self 1449 $self
1313} 1450}
1314 1451
1315sub escape { 1452sub escape($) {
1316 local $_ = $_[1]; 1453 local $_ = $_[0];
1317 1454
1318 s/&/&amp;/g; 1455 s/&/&amp;/g;
1319 s/>/&gt;/g; 1456 s/>/&gt;/g;
1320 s/</&lt;/g; 1457 s/</&lt;/g;
1321 1458
1322 $_[1] 1459 $_
1323} 1460}
1324 1461
1325sub update { 1462sub update {
1326 my ($self) = @_; 1463 my ($self) = @_;
1327 1464
… …
1333 my ($self, $text) = @_; 1470 my ($self, $text) = @_;
1334 1471
1335 return if $self->{text} eq "T$text"; 1472 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text"; 1473 $self->{text} = "T$text";
1337 1474
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1338 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1339 1477
1340 delete $self->{texture}; 1478 $self->realloc;
1341 $self->update; 1479 $self->update;
1342 $self->check_size;
1343} 1480}
1344 1481
1345sub set_markup { 1482sub set_markup {
1346 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1347 1484
1348 return if $self->{text} eq "M$markup"; 1485 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup"; 1486 $self->{text} = "M$markup";
1350 1487
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1351 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1352 1492
1353 delete $self->{texture}; 1493 $self->realloc;
1354 $self->update; 1494 $self->update;
1355 $self->check_size;
1356} 1495}
1357 1496
1358sub size_request { 1497sub size_request {
1359 my ($self) = @_; 1498 my ($self) = @_;
1360 1499
1361 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1500 $self->{layout}->set_font ($self->{font}) if $self->{font};
1362 $self->{layout}->set_width ($self->{max_w} || -1); 1501 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1363 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1364 1505
1365 my ($w, $h) = $self->{layout}->size; 1506 my ($w, $h) = $self->{layout}->size;
1366 1507
1367 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1372 1513
1373 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1374 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1375 } 1516 }
1376 1517
1377 ( 1518 ($w, $h)
1378 $w + $self->{padding} * 2,
1379 $h + $self->{padding} * 2,
1380 )
1381} 1519}
1382 1520
1383sub size_allocate { 1521sub size_allocate {
1384 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1385 1523
1386 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1387} 1526}
1388 1527
1389sub set_fontsize { 1528sub set_fontsize {
1390 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1391 1530
1392 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1393 delete $self->{texture}; 1532 delete $self->{texture};
1394 1533
1395 $self->update; 1534 $self->realloc;
1396 $self->check_size;
1397} 1535}
1398 1536
1399sub _draw { 1537sub _draw {
1400 my ($self) = @_; 1538 my ($self) = @_;
1401 1539
1540 $self->SUPER::_draw; # draw background, if applicable
1541
1402 my $tex = $self->{texture} ||= do { 1542 my $tex = $self->{texture} ||= do {
1543 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1544 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $self->{layout}->set_width ($self->{w}); 1545 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549
1406 new_from_layout CFClient::Texture $self->{layout} 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1551
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5);
1555
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1407 }; 1561 };
1408 1562
1409 glEnable GL_BLEND;
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411 glEnable GL_TEXTURE_2D; 1563 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1565
1566 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1567 glColor @{$self->{fg}};
1415
1416 $self->{ox} = int (
1417 $self->{align} < 0 ? $self->{padding}
1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1421
1422 $self->{oy} = int (
1423 $self->{valign} < 0 ? $self->{padding}
1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1427
1428 $tex->draw_quad ($self->{ox}, $self->{oy}); 1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569 } else {
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571 }
1429 1572
1430 glDisable GL_TEXTURE_2D; 1573 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1574}
1433 1575
1434############################################################################# 1576#############################################################################
1435 1577
1436package CFClient::UI::EntryBase; 1578package CFClient::UI::EntryBase;
… …
1449 active_fg => [0, 0, 0], 1591 active_fg => [0, 0, 0],
1450 can_hover => 1, 1592 can_hover => 1,
1451 can_focus => 1, 1593 can_focus => 1,
1452 valign => 0, 1594 valign => 0,
1453 can_events => 1, 1595 can_events => 1,
1596 #text => ...
1454 @_ 1597 @_
1455 ) 1598 )
1456} 1599}
1457 1600
1458sub _set_text { 1601sub _set_text {
… …
1468 $self->{text} = $text; 1611 $self->{text} = $text;
1469 1612
1470 $text =~ s/./*/g if $self->{hidden}; 1613 $text =~ s/./*/g if $self->{hidden};
1471 $self->{layout}->set_text ("$text "); 1614 $self->{layout}->set_text ("$text ");
1472 1615
1473 $self->emit (changed => $self->{text}); 1616 $self->_emit (changed => $self->{text});
1617}
1618
1619sub set_text {
1620 my ($self, $text) = @_;
1621
1622 $self->{cursor} = length $text;
1623 $self->_set_text ($text);
1624
1625 $self->realloc;
1474} 1626}
1475 1627
1476sub get_text { 1628sub get_text {
1477 $_[0]{text} 1629 $_[0]{text}
1478} 1630}
… …
1481 my ($self) = @_; 1633 my ($self) = @_;
1482 1634
1483 my ($w, $h) = $self->SUPER::size_request; 1635 my ($w, $h) = $self->SUPER::size_request;
1484 1636
1485 ($w + 1, $h) # add 1 for cursor 1637 ($w + 1, $h) # add 1 for cursor
1486}
1487
1488sub size_allocate {
1489 my ($self, $w, $h) = @_;
1490
1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492}
1493
1494sub set_text {
1495 my ($self, $text) = @_;
1496
1497 $self->{cursor} = length $text;
1498 $self->_set_text ($text);
1499 $self->update;
1500} 1638}
1501 1639
1502sub key_down { 1640sub key_down {
1503 my ($self, $ev) = @_; 1641 my ($self, $ev) = @_;
1504 1642
… …
1506 my $sym = $ev->{sym}; 1644 my $sym = $ev->{sym};
1507 my $uni = $ev->{unicode}; 1645 my $uni = $ev->{unicode};
1508 1646
1509 my $text = $self->get_text; 1647 my $text = $self->get_text;
1510 1648
1511 if ($sym == 8) { 1649 if ($uni == 8) {
1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1650 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513 } elsif ($sym == 127) { 1651 } elsif ($uni == 127) {
1514 substr $text, $self->{cursor}, 1, ""; 1652 substr $text, $self->{cursor}, 1, "";
1515 } elsif ($sym == CFClient::SDLK_LEFT) { 1653 } elsif ($sym == CFClient::SDLK_LEFT) {
1516 --$self->{cursor} if $self->{cursor}; 1654 --$self->{cursor} if $self->{cursor};
1517 } elsif ($sym == CFClient::SDLK_RIGHT) { 1655 } elsif ($sym == CFClient::SDLK_RIGHT) {
1518 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1656 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1519 } elsif ($sym == CFClient::SDLK_HOME) { 1657 } elsif ($sym == CFClient::SDLK_HOME) {
1520 $self->{cursor} = 0; 1658 $self->{cursor} = 0;
1521 } elsif ($sym == CFClient::SDLK_END) { 1659 } elsif ($sym == CFClient::SDLK_END) {
1522 $self->{cursor} = length $text; 1660 $self->{cursor} = length $text;
1523 } elsif ($sym == 27) { 1661 } elsif ($uni == 27) {
1524 $self->emit ('escape'); 1662 $self->_emit ('escape');
1525 } elsif ($uni) { 1663 } elsif ($uni) {
1526 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1527 } 1665 }
1528 1666
1529 $self->_set_text ($text); 1667 $self->_set_text ($text);
1530 $self->update; 1668
1669 $self->realloc;
1531} 1670}
1532 1671
1533sub focus_in { 1672sub focus_in {
1534 my ($self) = @_; 1673 my ($self) = @_;
1535 1674
… …
1615 if ($sym == 13) { 1754 if ($sym == 13) {
1616 unshift @{$self->{history}}, 1755 unshift @{$self->{history}},
1617 my $txt = $self->get_text; 1756 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1; 1757 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = ''; 1758 $self->{history_saveback} = '';
1620 $self->emit (activate => $txt); 1759 $self->_emit (activate => $txt);
1621 $self->update; 1760 $self->update;
1622 1761
1623 } elsif ($sym == CFClient::SDLK_UP) { 1762 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) { 1763 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text; 1764 $self->{history_saveback} = $self->get_text;
… …
1662 1801
1663sub new { 1802sub new {
1664 my $class = shift; 1803 my $class = shift;
1665 1804
1666 $class->SUPER::new ( 1805 $class->SUPER::new (
1667 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1668 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1669 bg => [1, 1, 1, 0.2],
1670 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1671 can_hover => 1, 1810 can_hover => 1,
1672 align => 0, 1811 align => 0,
1673 valign => 0, 1812 valign => 0,
1674 can_events => 1, 1813 can_events => 1,
1675 @_ 1814 @_
1676 ) 1815 )
1677} 1816}
1678 1817
1818sub activate { }
1819
1679sub button_up { 1820sub button_up {
1680 my ($self, $ev, $x, $y) = @_; 1821 my ($self, $ev, $x, $y) = @_;
1681 1822
1823 $self->emit ("activate")
1682 if ($x >= 0 && $x < $self->{w} 1824 if $x >= 0 && $x < $self->{w}
1683 && $y >= 0 && $y < $self->{h}) { 1825 && $y >= 0 && $y < $self->{h};
1684 $self->emit ("activate");
1685 }
1686} 1826}
1687 1827
1688sub _draw { 1828sub _draw {
1689 my ($self) = @_; 1829 my ($self) = @_;
1690 1830
… …
1692 1832
1693 if ($GRAB == $self) { 1833 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1834 $self->{fg} = $self->{active_fg};
1695 } 1835 }
1696 1836
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1839 glColor 0, 0, 0, 1;
1702 1840
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1842
1705 glDisable GL_TEXTURE_2D; 1843 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1844
1708 $self->SUPER::_draw; 1845 $self->SUPER::_draw;
1709} 1846}
1710 1847
1711############################################################################# 1848#############################################################################
… …
1722 1859
1723sub new { 1860sub new {
1724 my $class = shift; 1861 my $class = shift;
1725 1862
1726 $class->SUPER::new ( 1863 $class->SUPER::new (
1727 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1728 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1729 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1868 bg => [0, 0, 0, 0.2],
1869 active_bg => [1, 1, 1, 0.5],
1730 state => 0, 1870 state => 0,
1731 can_hover => 1, 1871 can_hover => 1,
1732 @_ 1872 @_
1733 ) 1873 )
1734} 1874}
1735 1875
1736sub size_request { 1876sub size_request {
1737 my ($self) = @_; 1877 my ($self) = @_;
1738 1878
1739 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1740} 1880}
1741 1881
1742sub button_down { 1882sub button_down {
1743 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1744 1884
1745 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1746 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1747 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1748 $self->emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1749 } 1889 }
1750} 1890}
1751 1891
1752sub _draw { 1892sub _draw {
1753 my ($self) = @_; 1893 my ($self) = @_;
1754 1894
1755 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1756 1896
1757 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1758 1898
1759 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1899 my ($w, $h) = @$self{qw(w h)};
1900
1901 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1760 1902
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1904
1763 glEnable GL_BLEND; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1906
1764 glEnable GL_TEXTURE_2D; 1907 glEnable GL_TEXTURE_2D;
1765 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767 my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769 $tex->draw_quad (0, 0, $s, $s); 1908 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1909 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1910}
1774 1911
1775############################################################################# 1912#############################################################################
1776 1913
1777package CFClient::UI::Image; 1914package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 1957 glTranslate 0, -$self->{w}, 0;
1821 1958
1822 ($w, $h) = ($h, $w); 1959 ($w, $h) = ($h, $w);
1823 } 1960 }
1824 1961
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 1962 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 1964
1830 $tex->draw_quad (0, 0, $w, $h); 1965 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 1966
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 1967 glDisable GL_TEXTURE_2D;
1834} 1968}
1835 1969
1836############################################################################# 1970#############################################################################
1837 1971
… …
2026 qw(s1_slider.png s1_slider_bg.png); 2160 qw(s1_slider.png s1_slider_bg.png);
2027 2161
2028sub new { 2162sub new {
2029 my $class = shift; 2163 my $class = shift;
2030 2164
2031 # range [value, low, high, page] 2165 # range [value, low, high, page, unit]
2032 2166
2033 # TODO: 0-width page 2167 # TODO: 0-width page
2034 # TODO: req_w/h are wrong with vertical 2168 # TODO: req_w/h are wrong with vertical
2035 # TODO: calculations are off 2169 # TODO: calculations are off
2036 my $self = $class->SUPER::new ( 2170 my $self = $class->SUPER::new (
2037 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
2038 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2173 bg => [0, 0, 0, 0.2],
2174 active_bg => [1, 1, 1, 0.5],
2039 range => [0, 0, 100, 10], 2175 range => [0, 0, 100, 10, 0],
2040 req_w => $::WIDTH / 80, 2176 min_w => $::WIDTH / 80,
2041 req_h => $::WIDTH / 80, 2177 min_h => $::WIDTH / 80,
2042 vertical => 0, 2178 vertical => 0,
2043 can_hover => 1, 2179 can_hover => 1,
2044 inner_pad => 5, 2180 inner_pad => 0.02,
2045 @_ 2181 @_
2046 ); 2182 );
2047 2183
2184 $self->set_value ($self->{range}[0]);
2185 $self->update;
2186
2048 $self 2187 $self
2049} 2188}
2050 2189
2190sub changed { }
2191
2192sub set_range {
2193 my ($self, $range) = @_;
2194
2195 ($range, $self->{range}) = ($self->{range}, $range);
2196
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}";
2199}
2200
2201sub set_value {
2202 my ($self, $value) = @_;
2203
2204 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2205
2206 $hi = $lo + 1 if $hi <= $lo;
2207
2208 $page = $hi - $lo if $page > $hi - $lo;
2209
2210 $value = $lo if $value < $lo;
2211 $value = $hi - $page if $value > $hi - $page;
2212
2213 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2214 if $unit;
2215
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217
2218 if ($value != $old_value) {
2219 $self->_emit (changed => $value);
2220 $self->update;
2221 }
2222}
2223
2051sub size_request { 2224sub size_request {
2052 my ($self) = @_; 2225 my ($self) = @_;
2053 2226
2054 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
2055 my $h = $self->{req_h};
2056
2057 $self->{vertical} ? ($h, $w) : ($w, $h)
2058} 2228}
2059 2229
2060sub button_down { 2230sub button_down {
2061 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
2062 2232
2063 $self->SUPER::button_down ($ev, $x, $y); 2233 $self->SUPER::button_down ($ev, $x, $y);
2234
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236
2064 $self->mouse_motion ($ev, $x, $y); 2237 $self->mouse_motion ($ev, $x, $y);
2065} 2238}
2066 2239
2067sub mouse_motion { 2240sub mouse_motion {
2068 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
2069 2242
2070 if ($GRAB == $self) { 2243 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245
2246 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2251 }
2252}
2253
2254sub update {
2255 my ($self) = @_;
2256
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2258 $self->set_value ($self->{range}[0]);
2259
2071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2260 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100;
2072 2262
2073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2263 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074 2264
2075 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2265 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2266 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077 2267
2078 $x -= $inner_pad_px; # substract the padding 2268 $value = ($value - $lo) / $range;
2079 $x = $x * ($hi - $lo) / $inner_w + $lo; 2269 $value = $value * $self->{scale} + $self->{offset};
2080 $x = $lo if $x < $lo;
2081 $x = $hi - $page if $x > $hi - $page;
2082 $self->{range}[0] = $x;
2083 2270
2084 $self->emit (changed => $x); 2271 $self->{knob_x} = $value - $knob_w * 0.5;
2085 $self->update; 2272 $self->{knob_w} = $knob_w;
2086 } 2273 });
2087}
2088 2274
2089# the inner_* stuff is for generating a padding for the slider handle, 2275 $self->SUPER::update;
2090# so that the handle doesn't leave the texture. This calculation isn't 100%
2091# correct propably, but it does the job for now
2092sub _calc_inner_pad_px {
2093 my ($self, $w) = @_;
2094 ($w / 100) * $self->{inner_pad} # % to pixels
2095} 2276}
2096 2277
2097sub _draw { 2278sub _draw {
2098 my ($self) = @_; 2279 my ($self) = @_;
2099 2280
2100 $self->SUPER::_draw (); 2281 $self->SUPER::_draw ();
2101 2282
2102 my ($w, $h) = @$self{qw(w h)}; 2283 glScale $self->{w}, $self->{h};
2103 2284
2104 if ($self->{vertical}) { 2285 if ($self->{vertical}) {
2105 # draw a vertical slider like a rotated horizontal slider 2286 # draw a vertical slider like a rotated horizontal slider
2106 2287
2288 glTranslate 1, 0, 0;
2107 glRotate 90, 0, 0, 1; 2289 glRotate 90, 0, 0, 1;
2108 glTranslate 0, -$self->{w}, 0;
2109
2110 ($w, $h) = ($h, $w);
2111 } 2290 }
2112 2291
2113 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2292 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2293 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115 2294
2116 my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118 $hi = $value + 1 if $lo == $hi;
2119
2120 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123 $page = int $page * $inner_w / ($hi - $lo);
2124 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126 $w -= $page;
2127 $page &= ~1;
2128 glTranslate $page * 0.5, 0, 0;
2129 $page ||= 2;
2130
2131 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134 glEnable GL_BLEND;
2135 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2297
2139 # draw background 2298 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2299 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141 2300
2142 # draw handle 2301 # draw handle
2143 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2302 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2303
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2304 glDisable GL_TEXTURE_2D;
2147} 2305}
2306
2307#############################################################################
2308
2309package CFClient::UI::ValSlider;
2310
2311our @ISA = CFClient::UI::HBox::;
2312
2313sub new {
2314 my ($class, %arg) = @_;
2315
2316 my $range = delete $arg{range};
2317
2318 my $self = $class->SUPER::new (
2319 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2320 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2321 to_value => sub { shift },
2322 from_value => sub { shift },
2323 %arg,
2324 );
2325
2326 $self->{slider}->connect (changed => sub {
2327 my ($self, $value) = @_;
2328 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2329 $self->{parent}->emit (changed => $value);
2330 });
2331
2332# $self->{entry}->connect (changed => sub {
2333# my ($self, $value) = @_;
2334# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2335# $self->{parent}->emit (changed => $value);
2336# });
2337
2338 $self->add ($self->{slider}, $self->{entry});
2339
2340 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2341
2342 $self
2343}
2344
2345sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) }
2148 2347
2149############################################################################# 2348#############################################################################
2150 2349
2151package CFClient::UI::TextView; 2350package CFClient::UI::TextView;
2152 2351
… …
2161 fontsize => 1, 2360 fontsize => 1,
2162 can_events => 0, 2361 can_events => 0,
2163 #font => default_font 2362 #font => default_font
2164 @_, 2363 @_,
2165 2364
2166 layout => (new CFClient::Layout), 2365 layout => (new CFClient::Layout 1),
2167 par => [], 2366 par => [],
2168 height => 0, 2367 height => 0,
2169 children => [ 2368 children => [
2170 (new CFClient::UI::Empty expand => 1), 2369 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2370 (new CFClient::UI::Slider vertical => 1),
… …
2182 2381
2183 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
2184 $self->reflow; 2383 $self->reflow;
2185} 2384}
2186 2385
2187sub text_height {
2188 my ($self, $text) = @_;
2189
2190 my $layout = $self->{layout};
2191
2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $layout->set_width ($self->{children}[0]{w});
2194 $layout->set_text ($text);
2195
2196 ($layout->size)[1]
2197}
2198
2199sub reflow {
2200 my ($self) = @_;
2201
2202 $self->{need_reflow}++;
2203 $self->update;
2204}
2205
2206sub size_allocate { 2386sub size_allocate {
2207 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
2208 2388
2209 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2210 2392
2211 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2212 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2213 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2214 2396
2215 $self->reflow; 2397 $self->reflow;
2216} 2398}
2217 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
2218sub add_paragraph { 2434sub add_paragraph {
2219 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2220 2436
2221 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2222 2438 my ($w, $h) = $self->text_size ($line);
2223 my $height = $self->text_height ($text);
2224
2225 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2226 2442
2227 push @{$self->{par}}, [$height, $color, $text];
2228
2229 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2230 $self->{children}[1]->update;
2231} 2444}
2232 2445
2233sub update { 2446sub update {
2234 my ($self) = @_; 2447 my ($self) = @_;
2235 2448
… …
2237 2450
2238 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2239 2452
2240 delete $self->{texture}; 2453 delete $self->{texture};
2241 2454
2242 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2243 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2244 my $height = 0; 2459 my $height = 0;
2245 2460
2246 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2247 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2248 2476
2249 $self->{height} = $height; 2477 $self->{height} = $height;
2250 2478
2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252 2480
2253 delete $self->{texture}; 2481 delete $self->{texture};
2254 } 2482 }
2255 2483
2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2257 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2259 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2260 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2262 glEnable GL_TEXTURE_2D;
2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265 my $top = int $self->{children}[1]{range}[0];
2266
2267 my $y0 = $top;
2268 my $y1 = $top + $self->{h};
2269
2270 my $y = 0;
2271
2272 my $layout = $self->{layout};
2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275 2502
2276 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2504 my $h = $par->[1];
2278 2505
2279 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2280 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2281 2510
2282 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283 my ($W, $H) = $layout->size; 2512
2284 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2285 } 2515 }
2286 2516
2287 $y += $h; 2517 $y += $h;
2288 } 2518 }
2289 2519
2290 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2292 }; 2521 };
2293 }); 2522 });
2294} 2523}
2295 2524
2296sub _draw { 2525sub _draw {
2297 my ($self) = @_; 2526 my ($self) = @_;
2298 2527
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2533
2308 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2309 2535
2310} 2536}
2311 2537
… …
2359 2585
2360sub new { 2586sub new {
2361 my $class = shift; 2587 my $class = shift;
2362 2588
2363 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2364 state => 0, 2590 state => 0,
2365 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2366 @_ 2592 @_
2367 ); 2593 );
2368 2594
2369 if ($self->{state}) {
2370 $self->{state} = 0;
2371 $self->toggle_flopper;
2372 }
2373
2374 $self 2595 $self
2375} 2596}
2376 2597
2377sub toggle_flopper { 2598sub toggle_flopper {
2378 my ($self) = @_; 2599 my ($self) = @_;
2379 2600
2380 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2381 if ($self->{state} = !$self->{state}) {
2382 $CFClient::UI::ROOT->add ($self->{other});
2383 $self->{other}->move ($self->coord2global (0, $self->{h}));
2384 $self->emit ("open");
2385 } else {
2386 $CFClient::UI::ROOT->remove ($self->{other});
2387 $self->emit ("close");
2388 }
2389
2390 $self->emit (changed => $self->{state});
2391} 2602}
2392 2603
2393############################################################################# 2604#############################################################################
2394 2605
2395package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2405 @_, 2616 @_,
2406 can_events => 0, 2617 can_events => 0,
2407 ) 2618 )
2408} 2619}
2409 2620
2410sub set_markup { 2621sub set_tooltip_from {
2411 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2412 2623
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 $self->add (new CFClient::UI::Label
2414 $self->{label}->set_markup ($text); 2625 markup => $widget->{tooltip},
2415 $self->add ($self->{label}); 2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8,
2628 fg => [0, 0, 0, 1],
2629 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP),
2631 );
2416} 2632}
2417 2633
2418sub size_request { 2634sub size_request {
2419 my ($self) = @_; 2635 my ($self) = @_;
2420 2636
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2638
2425 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2426} 2640}
2427 2641
2428sub size_allocate { 2642sub size_allocate {
2429 my ($self, $w, $h) = @_; 2643 my ($self, $w, $h, $changed) = @_;
2430 2644
2645 return unless $changed;
2646
2431 $self->SUPER::size_allocate ($w - 4, $h - 4); 2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2648}
2649
2650sub visibility_change {
2651 my ($self, $visible) = @_;
2652
2653 return unless $visible;
2654
2655 $self->{root}->on_post_alloc ("move_$self" => sub {
2656 my $widget = $self->{owner}
2657 or return;
2658
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH;
2663
2664 $self->move_abs ($x, $y);
2665 });
2432} 2666}
2433 2667
2434sub _draw { 2668sub _draw {
2435 my ($self) = @_; 2669 my ($self) = @_;
2436 2670
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2671 glTranslate 0.375, 0.375;
2439 2672
2440 my ($w, $h) = @$self{qw(w h)}; 2673 my ($w, $h) = @$self{qw(w h)};
2441 2674
2442 glColor 1, 0.8, 0.4; 2675 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2686 glVertex 0 , $h;
2454 glVertex $w, $h; 2687 glVertex $w, $h;
2455 glVertex $w, 0; 2688 glVertex $w, 0;
2456 glEnd; 2689 glEnd;
2457 2690
2458 glPopMatrix; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2459 2692
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2462} 2694}
2463 2695
2464############################################################################# 2696#############################################################################
2465 2697
… …
2470use CFClient::OpenGL; 2702use CFClient::OpenGL;
2471 2703
2472sub new { 2704sub new {
2473 my $class = shift; 2705 my $class = shift;
2474 2706
2475 $class->SUPER::new ( 2707 my $self = $class->SUPER::new (
2476 aspect => 1, 2708 aspect => 1,
2709 can_events => 0,
2477 @_, 2710 @_,
2478 ) 2711 );
2712
2713 if ($self->{anim} && $self->{animspeed}) {
2714 Scalar::Util::weaken (my $widget = $self);
2715
2716 $self->{timer} = Event->timer (
2717 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2718 hard => 1,
2719 interval => $self->{animspeed},
2720 cb => sub {
2721 ++$widget->{frame};
2722 $widget->update;
2723 },
2724 );
2725 }
2726
2727 $self
2479} 2728}
2480 2729
2481sub size_request { 2730sub size_request {
2482 (32, 8) 2731 (32, 8)
2483} 2732}
2484 2733
2734sub update {
2735 my ($self) = @_;
2736
2737 return unless $self->{visible};
2738
2739 $self->SUPER::update;
2740}
2741
2485sub _draw { 2742sub _draw {
2486 my ($self) = @_; 2743 my ($self) = @_;
2487 2744
2488 return unless $::CONN;#d# manage and cache textures differently 2745 return unless $::CONN;
2746
2747 my $face;
2748
2749 if ($self->{frame}) {
2750 my $anim = $::CONN->{anim}[$self->{anim}];
2751
2752 $face = $anim->[ $self->{frame} % @$anim ]
2753 if $anim && @$anim;
2754 }
2755
2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2490 2757
2491 # TODO animation
2492 if ($tex) { 2758 if ($tex) {
2493 glEnable GL_BLEND;
2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495 glEnable GL_TEXTURE_2D; 2759 glEnable GL_TEXTURE_2D;
2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497 glColor 1, 1, 1, 1; 2761 glColor 1, 1, 1, 1;
2498 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499 glDisable GL_TEXTURE_2D; 2763 glDisable GL_TEXTURE_2D;
2500 glDisable GL_BLEND;
2501 } 2764 }
2765}
2766
2767sub DESTROY {
2768 my ($self) = @_;
2769
2770 $self->{timer}->cancel
2771 if $self->{timer};
2772
2773 $self->SUPER::DESTROY;
2502} 2774}
2503 2775
2504############################################################################# 2776#############################################################################
2505 2777
2506package CFClient::UI::InventoryItem; 2778package CFClient::UI::Inventory;
2507 2779
2508our @ISA = CFClient::UI::HBox::; 2780our @ISA = CFClient::UI::ScrolledWindow::;
2509 2781
2510sub new { 2782sub new {
2511 my $class = shift; 2783 my $class = shift;
2512 2784
2513 my %args = @_;
2514
2515 my $item = $args{item};
2516
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521
2522 my $self = $class->SUPER::new ( 2785 my $self = $class->SUPER::new (
2523 can_hover => 1, 2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2524 can_events => 1,
2525 tooltip => (CFClient::UI::Label->escape ($desc)
2526 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2527 connect_button_down => sub {
2528 my ($self, $ev, $x, $y) = @_;
2529
2530 # todo: maybe put examine on 1? but should just be a tooltip :(
2531 if ($ev->{button} == 1) {
2532 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2533 } elsif ($ev->{button} == 2) {
2534 $::CONN->send ("apply $item->{tag}");
2535 } elsif ($ev->{button} == 3) {
2536 CFClient::UI::Menu->new (
2537 items => [
2538 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539 [
2540 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541 sub { $::CONN->send ("lock $item->{tag}") },
2542 ],
2543 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2544 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2545 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2546 ],
2547 )->popup ($ev);
2548 }
2549
2550 1
2551 },
2552 %args
2553 );
2554 $self->add(new CFClient::UI::Face
2555 can_events => 0,
2556 face => $item->{face},
2557 anim => $item->{anim},
2558 animspeed => $item->{animspeed});
2559 $self->add(new CFClient::UI::Label
2560 can_events => 0,
2561 text => $desc);
2562
2563 $self
2564}
2565
2566#############################################################################
2567
2568package CFClient::UI::Inventory;
2569
2570our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub new {
2573 my $class = shift;
2574
2575 my $self = $class->SUPER::new (
2576 scrolled => (new CFClient::UI::VBox),
2577 @_, 2787 @_,
2578 ); 2788 );
2579 2789
2580 $self 2790 $self
2581} 2791}
… …
2584 my ($self, $items) = @_; 2794 my ($self, $items) = @_;
2585 2795
2586 $self->{scrolled}->clear; 2796 $self->{scrolled}->clear;
2587 return unless $items; 2797 return unless $items;
2588 2798
2589 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2590 2803
2591 $self->{real_items} = \@items; 2804 $self->{real_items} = \@items;
2592 2805
2806 my $row = 0;
2593 for my $item (@items) { 2807 for my $item (@items) {
2594 my $desc = $item->{nrof} < 2 2808 CFClient::Item::update_widgets $item;
2595 ? $item->{name}
2596 : "$item->{nrof} $item->{name_pl}";
2597 2809
2598 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2599 } 2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2600 2813
2601# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2814 $row++;
2602} 2815 }
2603
2604sub size_request {
2605 my ($self) = @_;
2606 ($self->{req_w}, $self->{req_h});
2607} 2816}
2608 2817
2609############################################################################# 2818#############################################################################
2610 2819
2611package CFClient::UI::Menu; 2820package CFClient::UI::Menu;
… …
2646 2855
2647# popup given the event (must be a mouse button down event currently) 2856# popup given the event (must be a mouse button down event currently)
2648sub popup { 2857sub popup {
2649 my ($self, $ev) = @_; 2858 my ($self, $ev) = @_;
2650 2859
2651 $self->emit ("popdown"); 2860 $self->_emit ("popdown");
2652 2861
2653 # maybe save $GRAB? must be careful about events... 2862 # maybe save $GRAB? must be careful about events...
2654 $GRAB = $self; 2863 $GRAB = $self;
2655 $self->{button} = $ev->{button}; 2864 $self->{button} = $ev->{button};
2656 2865
2657 $self->show; 2866 $self->show;
2658 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2659} 2868}
2660 2869
2661sub mouse_motion { 2870sub mouse_motion {
2662 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2663 2872
… …
2671 2880
2672 if ($ev->{button} == $self->{button}) { 2881 if ($ev->{button} == $self->{button}) {
2673 undef $GRAB; 2882 undef $GRAB;
2674 $self->hide; 2883 $self->hide;
2675 2884
2676 $self->emit ("popdown"); 2885 $self->_emit ("popdown");
2677 $self->{hover}[1]->() if $self->{hover}; 2886 $self->{hover}[1]->() if $self->{hover};
2678 } 2887 }
2679} 2888}
2680 2889
2681############################################################################# 2890#############################################################################
2682 2891
2892package CFClient::UI::Statusbox;
2893
2894our @ISA = CFClient::UI::VBox::;
2895
2896sub new {
2897 my $class = shift;
2898
2899 $class->SUPER::new (
2900 fontsize => 0.8,
2901 @_,
2902 )
2903}
2904
2905sub reorder {
2906 my ($self) = @_;
2907 my $NOW = time;
2908
2909 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 }
2912
2913 my @widgets;
2914
2915 my @items = sort {
2916 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} };
2919
2920 my $count = 10 + 1;
2921 for my $item (@items) {
2922 last unless --$count;
2923
2924 push @widgets, $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text};
2929
2930 for ($short) {
2931 s/^\s+//;
2932 s/\s+/ /g;
2933 }
2934
2935 new CFClient::UI::Label
2936 markup => $short,
2937 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg},
2943 can_events => 1,
2944 can_hover => 1
2945 };
2946 }
2947
2948 $self->clear;
2949 $self->SUPER::add (reverse @widgets);
2950}
2951
2952sub add {
2953 my ($self, $text, %arg) = @_;
2954
2955 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//;
2957
2958 return unless $text;
2959
2960 my $timeout = time + ((delete $arg{timeout}) || 60);
2961
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963
2964 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) {
2966 $item->{count}++;
2967 } else {
2968 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text;
2970 }
2971 $item->{id} = ++$self->{id};
2972 $item->{timeout} = $timeout;
2973 delete $item->{label};
2974 } else {
2975 $self->{item}{$group} = {
2976 id => ++$self->{id},
2977 text => $text,
2978 timeout => $timeout,
2979 tooltip => $text,
2980 fg => [0.8, 0.8, 0.8, 0.8],
2981 pri => 0,
2982 count => 1,
2983 %arg,
2984 };
2985 }
2986
2987 $self->reorder;
2988}
2989
2990sub reconfigure {
2991 my ($self) = @_;
2992
2993 delete $_->{label}
2994 for values %{ $self->{item} || {} };
2995
2996 $self->reorder;
2997 $self->SUPER::reconfigure;
2998}
2999
3000#############################################################################
3001
2683package CFClient::UI::Root; 3002package CFClient::UI::Root;
2684 3003
2685our @ISA = CFClient::UI::Container::; 3004our @ISA = CFClient::UI::Container::;
2686 3005
2687use CFClient::OpenGL; 3006use CFClient::OpenGL;
2688 3007
2689sub check_size { 3008sub new {
2690 my ($self) = @_; 3009 my $class = shift;
2691 3010
2692 $self->configure (0, 0, $self->{w}, $self->{h}); 3011 my $self = $class->SUPER::new (
2693} 3012 visible => 1,
2694
2695sub size_request {
2696 my ($self) = @_;
2697
2698 ($self->{w}, $self->{h})
2699}
2700
2701sub size_allocate {
2702 my ($self, $w, $h) = @_;
2703
2704 my $old_w = $self->{old_w};
2705 my $old_h = $self->{old_h};
2706
2707 if ($old_w && $old_h) {
2708 for my $child ($self->children) {
2709 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717 } 3013 @_,
2718 } 3014 );
2719 3015
2720 $self->{old_w} = $w; 3016 Scalar::Util::weaken ($self->{root} = $self);
2721 $self->{old_h} = $h; 3017
3018 $self
2722} 3019}
2723 3020
2724sub configure { 3021sub configure {
2725 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
2726 3023
2727 $self->SUPER::configure ($x, $y, $w, $h); 3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request {
3038 my ($self) = @_;
3039
3040 ($self->{w}, $self->{h})
3041}
3042
3043sub _to_pixel {
3044 my ($coord, $size, $max) = @_;
3045
3046 $coord =
3047 $coord eq "center" ? ($max - $size) * 0.5
3048 : $coord eq "max" ? $max
3049 : $coord;
3050
3051 $coord = 0 if $coord < 0;
3052 $coord = $max - $size if $coord > $max - $size;
3053
3054 int $coord + 0.5
3055}
3056
3057sub size_allocate {
3058 my ($self, $w, $h, $changed) = @_;
2728 3059
2729 for my $child ($self->children) { 3060 for my $child ($self->children) {
2730 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2731 3062
2732 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3063 $X = $child->{force_x} if exists $child->{force_x};
2733 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3064 $Y = $child->{force_y} if exists $child->{force_y};
3065
3066 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h};
3068
2734 $child->configure ($X, $Y, $W, $H); 3069 $child->configure ($X, $Y, $W, $H);
2735 } 3070 }
2736} 3071}
2737 3072
2738sub _topleft { 3073sub coord2local {
2739 my ($self, $x, $y) = @_; 3074 my ($self, $x, $y) = @_;
2740 3075
2741 ($x, $y) 3076 ($x, $y)
2742} 3077}
2743 3078
3079sub coord2global {
3080 my ($self, $x, $y) = @_;
3081
3082 ($x, $y)
3083}
3084
2744sub update { 3085sub update {
2745 my ($self) = @_; 3086 my ($self) = @_;
2746 3087
2747 $self->check_size; 3088 $::WANT_REFRESH++;
2748 ::refresh ();
2749} 3089}
2750 3090
2751sub add { 3091sub add {
2752 my ($self, $child) = @_; 3092 my ($self, @children) = @_;
2753 3093
2754 # integerize window positions 3094 $_->{is_toplevel} = 1
2755 $child->{x} = int $child->{x}; 3095 for @children;
2756 $child->{y} = int $child->{y};
2757 3096
2758 $self->SUPER::add ($child); 3097 $self->SUPER::add (@children);
3098}
3099
3100sub remove {
3101 my ($self, @children) = @_;
3102
3103 $self->SUPER::remove (@children);
3104
3105 delete $self->{is_toplevel}
3106 for @children;
3107
3108 while (@children) {
3109 my $w = pop @children;
3110 push @children, $w->children;
3111 $w->set_invisible;
3112 }
2759} 3113}
2760 3114
2761sub on_refresh { 3115sub on_refresh {
2762 my ($self, $id, $cb) = @_; 3116 my ($self, $id, $cb) = @_;
2763 3117
2764 $self->{refresh_hook}{$id} = $cb; 3118 $self->{refresh_hook}{$id} = $cb;
2765} 3119}
2766 3120
3121sub on_post_alloc {
3122 my ($self, $id, $cb) = @_;
3123
3124 $self->{post_alloc_hook}{$id} = $cb;
3125}
3126
2767sub draw { 3127sub draw {
2768 my ($self) = @_; 3128 my ($self) = @_;
2769 3129
2770 while (my $rcb = delete $self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
2771 $_->() for values %$rcb; 3131 $_->()
3132 for values %{delete $self->{refresh_hook}};
3133 }
3134
3135 if ($self->{realloc}) {
3136 my @queue;
3137
3138 while () {
3139 if ($self->{realloc}) {
3140 #TODO use array-of-depth approach
3141
3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
3144 }
3145
3146 my $widget = pop @queue || last;
3147
3148 $widget->{visible} or last; # do not resize invisible widgets
3149
3150 my ($w, $h) = $widget->size_request;
3151
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154
3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
3158 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h;
3160
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3162
3163 push @queue, $widget->{parent}
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3165 }
3166 }
3167
3168 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3170 values %$size_alloc;
3171
3172 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last };
3174
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177
3178 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0;
3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h, $changed);
3190 }
3191 }
3192
3193 while ($self->{post_alloc_hook}) {
3194 $_->()
3195 for values %{delete $self->{post_alloc_hook}};
2772 } 3196 }
2773 3197
2774 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3198 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2775 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2776 glClear GL_COLOR_BUFFER_BIT; 3200 glClear GL_COLOR_BUFFER_BIT;
2777 3201
2778 glMatrixMode GL_PROJECTION; 3202 glMatrixMode GL_PROJECTION;
2779 glLoadIdentity; 3203 glLoadIdentity;
2780 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2781 glMatrixMode GL_MODELVIEW; 3205 glMatrixMode GL_MODELVIEW;
2782 glLoadIdentity; 3206 glLoadIdentity;
2783 3207
2784 $self->_draw; 3208 $self->_draw;
2785} 3209}
… …
2787############################################################################# 3211#############################################################################
2788 3212
2789package CFClient::UI; 3213package CFClient::UI;
2790 3214
2791$ROOT = new CFClient::UI::Root; 3215$ROOT = new CFClient::UI::Root;
2792$TOOLTIP = new CFClient::UI::Tooltip; 3216$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2793 3217
27941 32181
2795 3219

Diff Legend

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