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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 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;
15 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}
43
16sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
17 if (!$GRAB) { 47 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
23 54
24 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
25 56
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 58
28 $TOOLTIP->set_markup ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 60 $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 } 61 }
40 62
41 return; 63 return;
42 } 64 }
43 } 65 }
… …
47 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
48} 70}
49 71
50# class methods for events 72# class methods for events
51sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 75 if $FOCUS;
54} 76}
55 77
56sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 80 if $FOCUS;
59} 81}
60 82
61sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
62 my ($ev) = @_; 84 my ($ev) = @_;
… …
71 check_tooltip; 93 check_tooltip;
72 } 94 }
73 95
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 97
76 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 100}
81 101
82sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
83 my ($ev) = @_; 103 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
85 105
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 107
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 109
90 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 112
95 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 115 $grab->update if $grab;
98 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 133
116 check_tooltip; 134 check_tooltip;
117 } 135 }
118 136
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 138 if $HOVER;
123} 139}
124 140
125# convert position array to integers 141# convert position array to integers
126sub harmonize { 142sub harmonize {
127 my ($vals) = @_; 143 my ($vals) = @_;
… …
133 $rem += $_ - $i; 149 $rem += $_ - $i;
134 $_ = $i; 150 $_ = $i;
135 } 151 }
136} 152}
137 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
138############################################################################# 195#############################################################################
139 196
140package CFClient::UI::Base; 197package CFClient::UI::Base;
141 198
142use strict; 199use strict;
… …
145 202
146sub new { 203sub new {
147 my $class = shift; 204 my $class = shift;
148 205
149 my $self = bless { 206 my $self = bless {
150 x => 0, 207 x => "center",
151 y => 0, 208 y => "center",
152 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
153 can_events => 1, 212 can_events => 1,
154 @_ 213 @_
155 }, $class; 214 }, $class;
156 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
157 for (keys %$self) { 218 for (keys %$self) {
158 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
160 } 221 }
161 } 222 }
162 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
163 $self 236 $self
164} 237}
165 238
166sub destroy { 239sub destroy {
167 my ($self) = @_; 240 my ($self) = @_;
… …
176 return if $self->{parent}; 249 return if $self->{parent};
177 250
178 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
179} 252}
180 253
181sub hide { 254sub set_visible {
182 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
183 278
184 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
186 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
187 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
188 if $self->{parent}; 313 if $self->{parent};
189} 314}
190 315
191sub move { 316sub move_abs {
192 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
193 318
194 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
197 322
198 $self->update; 323 $self->update;
199} 324}
200 325
201sub set_size { 326sub set_size {
202 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
203 328
204 $self->{user_w} = $w; 329 $self->{force_w} = $w;
205 $self->{user_h} = $h; 330 $self->{force_h} = $h;
206 331
207 $self->check_size; 332 $self->realloc;
208} 333}
209 334
210sub size_request { 335sub size_request {
211 require Carp; 336 require Carp;
212 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
214 339
215sub configure { 340sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
217 342
218 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
221 348
222 # use alignment to adjust x, y 349 # use alignment to adjust x, y
223 350
224 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 353 }
229 354
230 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 356 $self->{x} = $x;
232 $self->{y} = $y; 357 $self->{y} = $y;
233 $self->update; 358 $self->update;
234 } 359 }
235 360
236 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
238 } 368 }
239} 369}
240 370
241sub size_allocate { 371sub size_allocate {
242 # nothing to be done 372 # nothing to be done
243} 373}
244 374
245sub children { 375sub children {
246} 376}
247 377
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258}
259
260sub set_max_size { 378sub set_max_size {
261 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
262 380
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
383}
384
385sub set_tooltip {
386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
392
393 $self->{tooltip} = $tooltip;
394
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip;
398 }
265} 399}
266 400
267# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
268sub coord2local { 402sub coord2local {
269 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 418 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
286 420
287 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
288 422
289 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
290 424
291 $focus->update if $focus; 425 $focus->update if $focus;
292 $FOCUS->update; 426 $FOCUS->update;
293} 427}
294 428
… …
297 431
298 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
299 433
300 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
301 435
302 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
303 437
304 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
305} 442}
306 443
307sub mouse_motion { } 444sub mouse_motion { }
308sub button_up { } 445sub button_up { }
309sub key_down { } 446sub key_down { }
310sub key_up { } 447sub key_up { }
311 448
312sub button_down { 449sub button_down {
313 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
314 451
315 $self->focus_in; 452 $self->focus_in;
316} 453}
317 454
318sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
319sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
320sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
321sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
322sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
323 528
324sub draw { 529sub draw {
325 my ($self) = @_; 530 my ($self) = @_;
326 531
327 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 local $draw_x = $draw_x + $self->{x};
535 local $draw_y = $draw_y + $self->{y};
536
537 return if $draw_x + $self->{w} < 0;
538 return if $draw_x >= $draw_w;
539 return if $draw_y + $self->{h} < 0;
540 return if $draw_y >= $draw_h;
328 541
329 glPushMatrix; 542 glPushMatrix;
330 glTranslate $self->{x}, $self->{y}, 0; 543 glTranslate $self->{x}, $self->{y}, 0;
331 $self->_draw; 544 $self->_draw;
332 glPopMatrix; 545 glPopMatrix;
… …
344 glVertex $x , $y + $self->{h}; 557 glVertex $x , $y + $self->{h};
345 glEnd; 558 glEnd;
346 glDisable GL_BLEND; 559 glDisable GL_BLEND;
347 } 560 }
348 561
349 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
350 glPushMatrix; 563 glPushMatrix;
351 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 567 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 568 glVertex $self->{w} - 1, 0;
356 glVertex $self->{w}, $self->{h}; 569 glVertex $self->{w} - 1, $self->{h} - 1;
357 glVertex 0 , $self->{h}; 570 glVertex 0 , $self->{h} - 1;
358 glEnd; 571 glEnd;
359 glPopMatrix; 572 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 574 }
362} 575}
363 576
364sub _draw { 577sub _draw {
365 my ($self) = @_; 578 my ($self) = @_;
366 579
367 warn "no draw defined for $self\n"; 580 warn "no draw defined for $self\n";
368} 581}
369 582
370sub find_widget {
371 my ($self, $x, $y) = @_;
372
373 return () unless $self->{can_events};
374
375 return $self
376 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
377 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
378
379 ()
380}
381
382sub set_parent {
383 my ($self, $parent) = @_;
384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
386 Scalar::Util::weaken ($self->{parent} = $parent);
387}
388
389sub check_size {
390 my ($self) = @_;
391
392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
393}
394
395sub update {
396 my ($self) = @_;
397
398 $self->{parent}->update
399 if $self->{parent};
400}
401
402sub connect {
403 my ($self, $signal, $cb) = @_;
404
405 push @{ $self->{signal_cb}{$signal} }, $cb;
406}
407
408sub emit {
409 my ($self, $signal, @args) = @_;
410
411 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
412}
413
414sub DESTROY { 583sub DESTROY {
415 my ($self) = @_; 584 my ($self) = @_;
416 585
586 delete $WIDGET{$self+0};
417 #$self->deactivate; 587 #$self->deactivate;
418} 588}
419 589
420############################################################################# 590#############################################################################
421 591
… …
430 my $class = shift; 600 my $class = shift;
431 601
432 # range [value, low, high, page] 602 # range [value, low, high, page]
433 603
434 $class->SUPER::new ( 604 $class->SUPER::new (
435 bg => [0, 0, 0, 0.2], 605 #bg => [0, 0, 0, 0.2],
436 active_bg => [1, 1, 1, 0.5], 606 #active_bg => [1, 1, 1, 0.5],
437 @_ 607 @_
438 ) 608 )
439} 609}
440 610
441sub _draw { 611sub _draw {
442 my ($self) = @_; 612 my ($self) = @_;
443 613
614 my $color = $FOCUS == $self && $self->{active_bg}
615 ? $self->{active_bg}
616 : $self->{bg};
617
618 if ($color && (@$color < 4 || $color->[3])) {
444 my ($w, $h) = @$self{qw(w h)}; 619 my ($w, $h) = @$self{qw(w h)};
445 620
446 glEnable GL_BLEND; 621 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 623 glColor @$color;
449 624
450 glBegin GL_QUADS; 625 glBegin GL_QUADS;
451 glVertex 0 , 0; 626 glVertex 0 , 0;
452 glVertex 0 , $h; 627 glVertex 0 , $h;
453 glVertex $w, $h; 628 glVertex $w, $h;
454 glVertex $w, 0; 629 glVertex $w, 0;
455 glEnd; 630 glEnd;
456 631
457 glDisable GL_BLEND; 632 glDisable GL_BLEND;
633 }
458} 634}
459 635
460############################################################################# 636#############################################################################
461 637
462package CFClient::UI::Empty; 638package CFClient::UI::Empty;
… …
467 my ($class, %arg) = @_; 643 my ($class, %arg) = @_;
468 $class->SUPER::new (can_events => 0, %arg); 644 $class->SUPER::new (can_events => 0, %arg);
469} 645}
470 646
471sub size_request { 647sub size_request {
472 (0, 0) 648 my ($self) = @_;
649
650 ($self->{w} + 0, $self->{h} + 0)
473} 651}
474 652
475sub draw { } 653sub draw { }
476 654
477############################################################################# 655#############################################################################
… …
506 $self->{children} = [ 684 $self->{children} = [
507 sort { $a->{z} <=> $b->{z} } 685 sort { $a->{z} <=> $b->{z} }
508 @{$self->{children}}, @widgets 686 @{$self->{children}}, @widgets
509 ]; 687 ];
510 688
511 $_->check_size 689 $self->realloc;
512 for @widgets;
513
514 $self->update;
515} 690}
516 691
517sub children { 692sub children {
518 @{ $_[0]{children} } 693 @{ $_[0]{children} }
519} 694}
… …
524 delete $child->{parent}; 699 delete $child->{parent};
525 $child->hide; 700 $child->hide;
526 701
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 702 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 703
529 $self->check_size; 704 $self->realloc;
530 $self->update;
531} 705}
532 706
533sub clear { 707sub clear {
534 my ($self) = @_; 708 my ($self) = @_;
535 709
… …
539 for (@$children) { 713 for (@$children) {
540 delete $_->{parent}; 714 delete $_->{parent};
541 $_->hide; 715 $_->hide;
542 } 716 }
543 717
544 $self->check_size; 718 $self->realloc;
545 $self->update;
546} 719}
547 720
548sub find_widget { 721sub find_widget {
549 my ($self, $x, $y) = @_; 722 my ($self, $x, $y) = @_;
550 723
… …
625} 798}
626 799
627sub update { 800sub update {
628 my ($self) = @_; 801 my ($self) = @_;
629 802
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 803 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 804 $self->SUPER::update;
632} 805}
633 806
634sub size_allocate { 807sub size_allocate {
635 my ($self, $w, $h) = @_; 808 my ($self, $w, $h) = @_;
… …
637 $self->SUPER::size_allocate ($w, $h); 810 $self->SUPER::size_allocate ($w, $h);
638 $self->update; 811 $self->update;
639} 812}
640 813
641sub _render { 814sub _render {
815 my ($self) = @_;
816
642 $_[0]{children}[0]->draw; 817 $self->{children}[0]->draw;
643} 818}
644 819
645sub render_child { 820sub render_child {
646 my ($self) = @_; 821 my ($self) = @_;
647 822
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 823 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 824 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 825 glClear GL_COLOR_BUFFER_BIT;
651 826
827 {
828 package CFClient::UI::Base;
829
830 ($draw_x, $draw_y, $draw_w, $draw_h) =
831 (0, 0, $self->{w}, $self->{h});
832 }
833
652 $self->_render; 834 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 835 };
661} 836}
662 837
663sub _draw { 838sub _draw {
664 my ($self) = @_; 839 my ($self) = @_;
665 840
666 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
667 842
668 my $tex = $self->{texture} 843 my $tex = $self->{texture}
669 or return; 844 or return;
670 845
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 848 glColor 1, 1, 1, 1;
676 849
677 $tex->draw_quad (0, 0, $w, $h); 850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 851
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 852 glDisable GL_TEXTURE_2D;
681} 853}
682 854
683############################################################################# 855#############################################################################
684 856
685package CFClient::UI::ViewPort; 857package CFClient::UI::ViewPort;
686 858
687our @ISA = CFClient::UI::Window::; 859our @ISA = CFClient::UI::Window::;
688 860
861sub new {
862 my $class = shift;
863
864 $class->SUPER::new (
865 scroll_x => 0,
866 scroll_y => 1,
867 @_,
868 )
869}
870
689sub size_request { 871sub size_request {
690 my ($self) = @_; 872 my ($self) = @_;
691 873
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 874 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 875
695 @$self{qw(child_w child_h)} 876 $w = 10 if $self->{scroll_x};
877 $h = 10 if $self->{scroll_y};
878
879 ($w, $h)
696} 880}
697 881
698sub size_allocate { 882sub size_allocate {
699 my ($self, $w, $h) = @_; 883 my ($self, $w, $h) = @_;
700 884
885 my $child = $self->child;
886
887 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
888 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
889
890 $self->child->configure (0, 0, $w, $h);
701 $self->update; 891 $self->update;
702} 892}
703 893
704sub set_offset { 894sub set_offset {
705 my ($self, $x, $y) = @_; 895 my ($self, $x, $y) = @_;
… …
739} 929}
740 930
741sub _render { 931sub _render {
742 my ($self) = @_; 932 my ($self) = @_;
743 933
934 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
935 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
936
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 937 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 938
746 $self->SUPER::_render; 939 $self->SUPER::_render;
747} 940}
748 941
… …
756 my $class = shift; 949 my $class = shift;
757 950
758 my $self; 951 my $self;
759 952
760 my $slider = new CFClient::UI::Slider 953 my $slider = new CFClient::UI::Slider
761 vertical => 1, 954 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 955 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 956 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 957 $self->{vp}->set_offset (0, $_[1]);
765 }, 958 },
766 ; 959 ;
767 960
768 $self = $class->SUPER::new ( 961 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 962 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 963 slider => $slider,
771 @_, 964 @_,
772 ); 965 );
773 966
774 $self->{vp}->add ($self->{scrolled}); 967 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 969 $self->add ($self->{slider});
777 970
778 $self 971 $self
779} 972}
780 973
974sub update {
975 my ($self) = @_;
976
977 $self->SUPER::update;
978
979 # todo: overwrite size_allocate of child
980 my $child = $self->{vp}->child;
981 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982}
983
984sub size_allocate {
985 my ($self, $w, $h) = @_;
986
987 $self->SUPER::size_allocate ($w, $h);
988
989 my $child = $self->{vp}->child;
990 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
991}
992
781#TODO# update range on size_allocate depeneing on child 993#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 994# update viewport offset on scroll
783 995
784############################################################################# 996#############################################################################
785 997
786package CFClient::UI::Frame; 998package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 1002use CFClient::OpenGL;
791 1003
792sub new { 1004sub new {
793 my $class = shift; 1005 my $class = shift;
794 1006
795 my $self = $class->SUPER::new ( 1007 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 1008 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 1009 @_,
800 ); 1010 )
801
802 $self
803} 1011}
804 1012
805sub _draw { 1013sub _draw {
806 my ($self) = @_; 1014 my ($self) = @_;
807 1015
808 my ($w, $h) = ($self->{w}, $self->{h}); 1016 if ($self->{bg}) {
1017 my ($w, $h) = @$self{qw(w h)};
809 1018
810 glEnable GL_BLEND; 1019 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1020 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 1021 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 1022
815# glBegin GL_QUADS; 1023 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 1024 glVertex 0 , 0;
818# glVertex 0 , $h; 1025 glVertex 0 , $h;
819# glVertex $w, $h; 1026 glVertex $w, $h;
820# glVertex $w, 0; 1027 glVertex $w, 0;
821# glEnd; 1028 glEnd;
822 1029
823
824 $self->child->draw;
825 glDisable GL_BLEND; 1030 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 1031 }
1032
1033 $self->SUPER::_draw;
827} 1034}
828 1035
829############################################################################# 1036#############################################################################
830 1037
831package CFClient::UI::FancyFrame; 1038package CFClient::UI::FancyFrame;
832 1039
833our @ISA = CFClient::UI::Bin::; 1040our @ISA = CFClient::UI::Bin::;
834 1041
835use CFClient::OpenGL; 1042use CFClient::OpenGL;
836 1043
837my @tex = 1044my $bg =
1045 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1046 mipmap => 1, wrap => 1;
1047
1048my @border =
838 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
839 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1050 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
840 1051
841sub new { 1052sub new {
842 my $class = shift; 1053 my $class = shift;
843 1054
844 # TODO: user_x, user_y, overwrite moveto?
845
846 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
849 border => 0.6, 1058 border => 0.6,
850 can_events => 1, 1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
851 @_ 1062 @_
852 ); 1063 );
853 1064
854 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
855 align => 0, 1066 align => 0,
… …
879 my ($self, $w, $h) = @_; 1090 my ($self, $w, $h) = @_;
880 1091
881 $h -= List::Util::max 0, $self->border * 2; 1092 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 1093 $w -= List::Util::max 0, $self->border * 2;
883 1094
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1095 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885 if $self->{title}; 1096 if $self->{title};
886 1097
887 $self->child->configure ($self->border, $self->border, $w, $h); 1098 $self->child->configure ($self->border, $self->border, $w, $h);
888} 1099}
889 1100
… …
908 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
909 1120
910 my $dx = $ev->{x} - $ox; 1121 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy; 1122 my $dy = $ev->{y} - $oy;
912 1123
913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126
1127 $self->realloc;
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
916 $self->check_size;
917 }; 1129 };
918 1130
919 } elsif ($lr ^ $td) { 1131 } elsif ($lr ^ $td) {
920 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
921 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
… …
923 $self->{motion} = sub { 1135 $self->{motion} = sub {
924 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
925 1137
926 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
927 1139
928 $self->move ($bx + $x - $ox, $by + $y - $oy); 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
929 $self->update;
930 }; 1141 };
931 } 1142 }
932} 1143}
933 1144
934sub button_up { 1145sub button_up {
… …
947 my ($self) = @_; 1158 my ($self) = @_;
948 1159
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1160 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1161 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 1162
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1163 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1165
957 my $border = $self->border; 1166 my $border = $self->border;
958 1167
959 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1173
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1175 glColor @{ $self->{bg} };
967 1176
968 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
1178 # solve this better(?)
969 my $rep_x = $cw / $bg->{w}; 1179 $bg->{s} = $cw / $bg->{w};
970 my $rep_y = $ch / $bg->{h}; 1180 $bg->{t} = $ch / $bg->{h};
971
972 glColor @{ $self->{bg} };
973
974 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182 }
978 1183
979 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1185
983 $self->{title}->draw if $self->{title}; 1186 $self->{title}->draw if $self->{title};
984 1187
985 $self->child->draw; 1188 $self->child->draw;
986} 1189}
… …
998sub new { 1201sub new {
999 my $class = shift; 1202 my $class = shift;
1000 1203
1001 $class->SUPER::new ( 1204 $class->SUPER::new (
1002 col_expand => [], 1205 col_expand => [],
1003 @_ 1206 @_,
1004 ) 1207 )
1208}
1209
1210sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1212}
1006 1213
1007sub add { 1214sub add {
1008 my ($self, $x, $y, $child) = @_; 1215 my ($self, $x, $y, $child) = @_;
1009 1216
1010 $child->set_parent ($self); 1217 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1218 $self->{children}[$y][$x] = $child;
1012 1219
1013 $child->check_size; 1220 $self->realloc;
1014} 1221}
1015 1222
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
1020# TODO: move to container class maybe? send childs a signal on removal? 1223# TODO: move to container class maybe? send children a signal on removal?
1021sub clear { 1224sub clear {
1022 my ($self) = @_; 1225 my ($self) = @_;
1023 1226
1024 my @children = $self->children; 1227 my @children = $self->children;
1025 delete $self->{children}; 1228 delete $self->{children};
… …
1027 for (@children) { 1230 for (@children) {
1028 delete $_->{parent}; 1231 delete $_->{parent};
1029 $_->hide; 1232 $_->hide;
1030 } 1233 }
1031 1234
1032 $self->update; 1235 $self->realloc;
1033} 1236}
1034 1237
1035sub get_wh { 1238sub get_wh {
1036 my ($self) = @_; 1239 my ($self) = @_;
1037 1240
… …
1068sub size_allocate { 1271sub size_allocate {
1069 my ($self, $w, $h) = @_; 1272 my ($self, $w, $h) = @_;
1070 1273
1071 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
1072 1275
1073 my $req_w = sum @$ws; 1276 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1277 my $req_h = (sum @$hs) || 1;
1075 1278
1076 # TODO: nicer code && do row_expand 1279 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1280 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1281 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1282 my $col_expand = (sum @col_expand) || 1;
… …
1133 } 1336 }
1134} 1337}
1135 1338
1136############################################################################# 1339#############################################################################
1137 1340
1138package CFClient::UI::HBox; 1341package CFClient::UI::Box;
1139
1140# TODO: wrap into common Box base class
1141 1342
1142our @ISA = CFClient::UI::Container::; 1343our @ISA = CFClient::UI::Container::;
1143 1344
1144sub size_request { 1345sub size_request {
1145 my ($self) = @_; 1346 my ($self) = @_;
1146 1347
1147 my @alloc = map [$_->size_request], @{$self->{children}}; 1348 $self->{vertical}
1148 1349 ? (
1149 ( 1350 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1150 (List::Util::sum map $_->[0], @alloc), 1351 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1151 (List::Util::max map $_->[1], @alloc), 1352 )
1152 ) 1353 : (
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 )
1153} 1357}
1154 1358
1155sub size_allocate { 1359sub size_allocate {
1156 my ($self, $w, $h) = @_; 1360 my ($self, $w, $h) = @_;
1157 1361
1158 ($h, $w) = ($w, $h); 1362 my $space = $self->{vertical} ? $h : $w;
1159
1160 my $children = $self->{children}; 1363 my $children = $self->{children};
1161 1364
1162 my @h = map $_->{req_w}, @$children; 1365 my @req;
1163 1366
1164 my $req_h = List::Util::sum @h; 1367 if ($self->{homogeneous}) {
1165 1368 @req = ($space / (@$children || 1)) x @$children;
1166 if ($req_h > $h) {
1167 # ah well, not enough space
1168 $_ *= $h / $req_h for @h;
1169 } else { 1369 } else {
1370 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1371 my $req = List::Util::sum @req;
1372
1373 if ($req > $space) {
1374 # ah well, not enough space
1375 $_ *= $space / $req for @req;
1376 } else {
1170 my $exp = List::Util::sum map $_->{expand}, @$children; 1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1171 $exp ||= 1;
1172 1378
1379 $space = ($space - $req) / $expand; # remaining space to give away
1380
1381 $req[$_] += $space * $children->[$_]{expand}
1173 for (0 .. $#$children) { 1382 for 0 .. $#$children;
1174 my $child = $children->[$_];
1175
1176 my $alloc_h = $h[$_];
1177 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1178 $h[$_] = $alloc_h;
1179 } 1383 }
1180 } 1384 }
1181 1385
1182 CFClient::UI::harmonize \@h; 1386 CFClient::UI::harmonize \@req;
1183 1387
1184 my $y = 0; 1388 my $pos = 0;
1185 for (0 .. $#$children) { 1389 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_]; 1390 my $alloc = $req[$_];
1188 $child->configure ($y, 0, $h, $w); 1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1189 1392
1190 $y += $h; 1393 $pos += $alloc;
1191 } 1394 }
1192 1395
1193 1 1396 1
1194} 1397}
1195 1398
1196############################################################################# 1399#############################################################################
1197 1400
1401package CFClient::UI::HBox;
1402
1403our @ISA = CFClient::UI::Box::;
1404
1405sub new {
1406 my $class = shift;
1407
1408 $class->SUPER::new (
1409 vertical => 0,
1410 @_,
1411 )
1412}
1413
1414#############################################################################
1415
1198package CFClient::UI::VBox; 1416package CFClient::UI::VBox;
1199 1417
1200# TODO: wrap into common Box base class
1201
1202our @ISA = CFClient::UI::Container::; 1418our @ISA = CFClient::UI::Box::;
1203 1419
1204sub size_request { 1420sub new {
1205 my ($self) = @_; 1421 my $class = shift;
1206 1422
1207 my @alloc = map [$_->size_request], @{$self->{children}}; 1423 $class->SUPER::new (
1208 1424 vertical => 1,
1209 ( 1425 @_,
1210 (List::Util::max map $_->[0], @alloc),
1211 (List::Util::sum map $_->[1], @alloc),
1212 ) 1426 )
1213} 1427}
1214 1428
1215sub size_allocate {
1216 my ($self, $w, $h) = @_;
1217
1218 my $children = $self->{children};
1219
1220 my @h = map $_->{req_h}, @$children;
1221
1222 my $req_h = List::Util::sum @h;
1223
1224 if ($req_h > $h) {
1225 # ah well, not enough space
1226 $_ *= $h / $req_h for @h;
1227 } else {
1228 my $exp = List::Util::sum map $_->{expand}, @$children;
1229 $exp ||= 1;
1230
1231 for (0 .. $#$children) {
1232 my $child = $children->[$_];
1233
1234 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1235 }
1236 }
1237
1238 CFClient::UI::harmonize \@h;
1239
1240 my $y = 0;
1241 for (0 .. $#$children) {
1242 my $child = $children->[$_];
1243 my $h = $h[$_];
1244 $child->configure (0, $y, $w, $h);
1245
1246 $y += $h;
1247 }
1248
1249 1
1250}
1251
1252############################################################################# 1429#############################################################################
1253 1430
1254package CFClient::UI::Label; 1431package CFClient::UI::Label;
1255 1432
1256our @ISA = CFClient::UI::Base::; 1433our @ISA = CFClient::UI::DrawBG::;
1257 1434
1258use CFClient::OpenGL; 1435use CFClient::OpenGL;
1259 1436
1260sub new { 1437sub new {
1261 my ($class, %arg) = @_; 1438 my ($class, %arg) = @_;
1262 1439
1263 my $self = $class->SUPER::new ( 1440 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1441 fg => [1, 1, 1],
1442 #bg => none
1443 #active_bg => none
1265 #font => default_font 1444 #font => default_font
1445 #text => initial text
1446 #markup => initial narkup
1447 #max_w => maximum pixel width
1448 ellipsise => 3, # end
1449 layout => (new CFClient::Layout),
1266 fontsize => 1, 1450 fontsize => 1,
1267 text => "",
1268 align => -1, 1451 align => -1,
1269 valign => -1, 1452 valign => -1,
1270 padding => 2, 1453 padding_x => 2,
1271 layout => new CFClient::Layout, 1454 padding_y => 2,
1272 can_events => 0, 1455 can_events => 0,
1273 %arg 1456 %arg
1274 ); 1457 );
1275 1458
1276 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
1277 my $layout = new CFClient::Layout; 1460 my $layout = new CFClient::Layout;
1278 $layout->set_text (delete $self->{template}); 1461 $layout->set_text (delete $self->{template});
1279 $self->{template} = $layout; 1462 $self->{template} = $layout;
1280 } 1463 }
1281 1464
1282 $self->set_text (delete $self->{text}) if exists $self->{text}; 1465 if (exists $self->{markup}) {
1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1466 $self->set_markup (delete $self->{markup});
1467 } else {
1468 $self->set_text (delete $self->{text});
1469 }
1284 1470
1285 $self 1471 $self
1286} 1472}
1287 1473
1288sub escape { 1474sub escape($) {
1289 local $_ = $_[1]; 1475 local $_ = $_[0];
1290 1476
1291 s/&/&amp;/g; 1477 s/&/&amp;/g;
1292 s/>/&gt;/g; 1478 s/>/&gt;/g;
1293 s/</&lt;/g; 1479 s/</&lt;/g;
1294 1480
1295 $_[1] 1481 $_
1296} 1482}
1297 1483
1298sub update { 1484sub update {
1299 my ($self) = @_; 1485 my ($self) = @_;
1300 1486
… …
1306 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1307 1493
1308 return if $self->{text} eq "T$text"; 1494 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text"; 1495 $self->{text} = "T$text";
1310 1496
1497 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311 $self->{layout}->set_text ($text); 1498 $self->{layout}->set_text ($text);
1312 1499
1500 $self->realloc;
1313 $self->update; 1501 $self->update;
1314 $self->check_size;
1315} 1502}
1316 1503
1317sub set_markup { 1504sub set_markup {
1318 my ($self, $markup) = @_; 1505 my ($self, $markup) = @_;
1319 1506
1320 return if $self->{text} eq "M$markup"; 1507 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup"; 1508 $self->{text} = "M$markup";
1322 1509
1510 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1511
1512 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323 $self->{layout}->set_markup ($markup); 1513 $self->{layout}->set_markup ($markup);
1324 1514
1515 $self->realloc;
1325 $self->update; 1516 $self->update;
1326 $self->check_size;
1327} 1517}
1328 1518
1329sub size_request { 1519sub size_request {
1330 my ($self) = @_; 1520 my ($self) = @_;
1331 1521
1332 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1522 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $self->{layout}->set_width ($self->{max_w} || -1); 1523 $self->{layout}->set_width ($self->{max_w} || -1);
1524 $self->{layout}->set_ellipsise ($self->{ellipsise});
1525 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335 1527
1336 my ($w, $h) = $self->{layout}->size; 1528 my ($w, $h) = $self->{layout}->size;
1337 1529
1338 if (exists $self->{template}) { 1530 if (exists $self->{template}) {
… …
1343 1535
1344 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1345 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1346 } 1538 }
1347 1539
1348 ( 1540 ($w, $h)
1349 $w + $self->{padding} * 2,
1350 $h + $self->{padding} * 2,
1351 )
1352} 1541}
1353 1542
1354sub size_allocate { 1543sub size_allocate {
1355 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1356 1545
1357 delete $self->{texture}; 1546 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1358} 1548}
1359 1549
1360sub set_fontsize { 1550sub set_fontsize {
1361 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1362 1552
1363 $self->{fontsize} = $fontsize; 1553 $self->{fontsize} = $fontsize;
1364 delete $self->{texture}; 1554 delete $self->{texture};
1365 1555
1366 $self->update; 1556 $self->realloc;
1367 $self->check_size;
1368} 1557}
1369 1558
1370sub _draw { 1559sub _draw {
1371 my ($self) = @_; 1560 my ($self) = @_;
1372 1561
1562 $self->SUPER::_draw; # draw background, if applicable
1563
1373 my $tex = $self->{texture} ||= do { 1564 my $tex = $self->{texture} ||= do {
1565 $self->{layout}->set_foreground (@{$self->{fg}});
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1566 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{w}); 1567 $self->{layout}->set_width ($self->{w});
1568 $self->{layout}->set_ellipsise ($self->{ellipsise});
1569 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571
1377 new_from_layout CFClient::Texture $self->{layout} 1572 my $tex = new_from_layout CFClient::Texture $self->{layout};
1573
1574 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1576 : ($self->{w} - $tex->{w}) * 0.5);
1577
1578 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1580 : ($self->{h} - $tex->{h}) * 0.5);
1581
1582 $tex
1378 }; 1583 };
1379 1584
1380 glEnable GL_BLEND;
1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382 glEnable GL_TEXTURE_2D; 1585 glEnable GL_TEXTURE_2D;
1383 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384 1587
1588 if ($tex->{format} == GL_ALPHA) {
1385 glColor @{$self->{fg}}; 1589 glColor @{$self->{fg}};
1386
1387 $self->{ox} = int (
1388 $self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5
1391 );
1392
1393 $self->{oy} = int (
1394 $self->{valign} < 0 ? $self->{padding}
1395 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1396 : ($self->{h} - $tex->{h}) * 0.5
1397 );
1398
1399 $tex->draw_quad ($self->{ox}, $self->{oy}); 1590 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1591 } else {
1592 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1593 }
1400 1594
1401 glDisable GL_TEXTURE_2D; 1595 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403} 1596}
1404 1597
1405############################################################################# 1598#############################################################################
1406 1599
1407package CFClient::UI::EntryBase; 1600package CFClient::UI::EntryBase;
… …
1420 active_fg => [0, 0, 0], 1613 active_fg => [0, 0, 0],
1421 can_hover => 1, 1614 can_hover => 1,
1422 can_focus => 1, 1615 can_focus => 1,
1423 valign => 0, 1616 valign => 0,
1424 can_events => 1, 1617 can_events => 1,
1618 #text => ...
1425 @_ 1619 @_
1426 ) 1620 )
1427} 1621}
1428 1622
1429sub _set_text { 1623sub _set_text {
… …
1439 $self->{text} = $text; 1633 $self->{text} = $text;
1440 1634
1441 $text =~ s/./*/g if $self->{hidden}; 1635 $text =~ s/./*/g if $self->{hidden};
1442 $self->{layout}->set_text ("$text "); 1636 $self->{layout}->set_text ("$text ");
1443 1637
1444 $self->emit (changed => $self->{text}); 1638 $self->_emit (changed => $self->{text});
1639}
1640
1641sub set_text {
1642 my ($self, $text) = @_;
1643
1644 $self->{cursor} = length $text;
1645 $self->_set_text ($text);
1646
1647 $self->realloc;
1445} 1648}
1446 1649
1447sub get_text { 1650sub get_text {
1448 $_[0]{text} 1651 $_[0]{text}
1449} 1652}
… …
1452 my ($self) = @_; 1655 my ($self) = @_;
1453 1656
1454 my ($w, $h) = $self->SUPER::size_request; 1657 my ($w, $h) = $self->SUPER::size_request;
1455 1658
1456 ($w + 1, $h) # add 1 for cursor 1659 ($w + 1, $h) # add 1 for cursor
1457}
1458
1459sub size_allocate {
1460 my ($self, $w, $h) = @_;
1461
1462 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1463}
1464
1465sub set_text {
1466 my ($self, $text) = @_;
1467
1468 $self->{cursor} = length $text;
1469 $self->_set_text ($text);
1470 $self->update;
1471} 1660}
1472 1661
1473sub key_down { 1662sub key_down {
1474 my ($self, $ev) = @_; 1663 my ($self, $ev) = @_;
1475 1664
… …
1477 my $sym = $ev->{sym}; 1666 my $sym = $ev->{sym};
1478 my $uni = $ev->{unicode}; 1667 my $uni = $ev->{unicode};
1479 1668
1480 my $text = $self->get_text; 1669 my $text = $self->get_text;
1481 1670
1482 if ($sym == 8) { 1671 if ($uni == 8) {
1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1672 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484 } elsif ($sym == 127) { 1673 } elsif ($uni == 127) {
1485 substr $text, $self->{cursor}, 1, ""; 1674 substr $text, $self->{cursor}, 1, "";
1486 } elsif ($sym == CFClient::SDLK_LEFT) { 1675 } elsif ($sym == CFClient::SDLK_LEFT) {
1487 --$self->{cursor} if $self->{cursor}; 1676 --$self->{cursor} if $self->{cursor};
1488 } elsif ($sym == CFClient::SDLK_RIGHT) { 1677 } elsif ($sym == CFClient::SDLK_RIGHT) {
1489 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1678 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1490 } elsif ($sym == CFClient::SDLK_HOME) { 1679 } elsif ($sym == CFClient::SDLK_HOME) {
1491 $self->{cursor} = 0; 1680 $self->{cursor} = 0;
1492 } elsif ($sym == CFClient::SDLK_END) { 1681 } elsif ($sym == CFClient::SDLK_END) {
1493 $self->{cursor} = length $text; 1682 $self->{cursor} = length $text;
1494 } elsif ($sym == 27) { 1683 } elsif ($uni == 27) {
1495 $self->emit ('escape'); 1684 $self->_emit ('escape');
1496 } elsif ($uni) { 1685 } elsif ($uni) {
1497 substr $text, $self->{cursor}++, 0, chr $uni; 1686 substr $text, $self->{cursor}++, 0, chr $uni;
1498 } 1687 }
1499 1688
1500 $self->_set_text ($text); 1689 $self->_set_text ($text);
1501 $self->update; 1690
1691 $self->realloc;
1502} 1692}
1503 1693
1504sub focus_in { 1694sub focus_in {
1505 my ($self) = @_; 1695 my ($self) = @_;
1506 1696
… …
1586 if ($sym == 13) { 1776 if ($sym == 13) {
1587 unshift @{$self->{history}}, 1777 unshift @{$self->{history}},
1588 my $txt = $self->get_text; 1778 my $txt = $self->get_text;
1589 $self->{history_pointer} = -1; 1779 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = ''; 1780 $self->{history_saveback} = '';
1591 $self->emit (activate => $txt); 1781 $self->_emit (activate => $txt);
1592 $self->update; 1782 $self->update;
1593 1783
1594 } elsif ($sym == CFClient::SDLK_UP) { 1784 } elsif ($sym == CFClient::SDLK_UP) {
1595 if ($self->{history_pointer} < 0) { 1785 if ($self->{history_pointer} < 0) {
1596 $self->{history_saveback} = $self->get_text; 1786 $self->{history_saveback} = $self->get_text;
… …
1633 1823
1634sub new { 1824sub new {
1635 my $class = shift; 1825 my $class = shift;
1636 1826
1637 $class->SUPER::new ( 1827 $class->SUPER::new (
1638 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1639 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1640 bg => [1, 1, 1, 0.2],
1641 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1642 can_hover => 1, 1832 can_hover => 1,
1643 align => 0, 1833 align => 0,
1644 valign => 0, 1834 valign => 0,
1645 can_events => 1, 1835 can_events => 1,
1646 @_ 1836 @_
1647 ) 1837 )
1648} 1838}
1649 1839
1840sub activate { }
1841
1650sub button_up { 1842sub button_up {
1651 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1652 1844
1845 $self->emit ("activate")
1653 if ($x >= 0 && $x < $self->{w} 1846 if $x >= 0 && $x < $self->{w}
1654 && $y >= 0 && $y < $self->{h}) { 1847 && $y >= 0 && $y < $self->{h};
1655 $self->emit ("activate");
1656 }
1657} 1848}
1658 1849
1659sub _draw { 1850sub _draw {
1660 my ($self) = @_; 1851 my ($self) = @_;
1661 1852
… …
1663 1854
1664 if ($GRAB == $self) { 1855 if ($GRAB == $self) {
1665 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1666 } 1857 }
1667 1858
1668 glEnable GL_BLEND;
1669 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670 glEnable GL_TEXTURE_2D; 1859 glEnable GL_TEXTURE_2D;
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 glColor 0, 0, 0, 1; 1861 glColor 0, 0, 0, 1;
1673 1862
1674 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1863 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675 1864
1676 glDisable GL_TEXTURE_2D; 1865 glDisable GL_TEXTURE_2D;
1677 glDisable GL_BLEND;
1678 1866
1679 $self->SUPER::_draw; 1867 $self->SUPER::_draw;
1680} 1868}
1681 1869
1682############################################################################# 1870#############################################################################
… …
1693 1881
1694sub new { 1882sub new {
1695 my $class = shift; 1883 my $class = shift;
1696 1884
1697 $class->SUPER::new ( 1885 $class->SUPER::new (
1698 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1699 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 1889 active_fg => [1, 1, 0],
1890 bg => [0, 0, 0, 0.2],
1891 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 1892 state => 0,
1702 can_hover => 1, 1893 can_hover => 1,
1703 @_ 1894 @_
1704 ) 1895 )
1705} 1896}
1706 1897
1707sub size_request { 1898sub size_request {
1708 my ($self) = @_; 1899 my ($self) = @_;
1709 1900
1710 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1711} 1902}
1712 1903
1713sub button_down { 1904sub button_down {
1714 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1715 1906
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1718 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1720 } 1911 }
1721} 1912}
1722 1913
1723sub _draw { 1914sub _draw {
1724 my ($self) = @_; 1915 my ($self) = @_;
1725 1916
1726 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1727 1918
1728 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1729 1920
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1921 my ($w, $h) = @$self{qw(w h)};
1922
1923 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1731 1924
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1926
1734 glEnable GL_BLEND; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1928
1735 glEnable GL_TEXTURE_2D; 1929 glEnable GL_TEXTURE_2D;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737
1738 my $tex = $self->{state} ? $tex[1] : $tex[0];
1739
1740 $tex->draw_quad (0, 0, $s, $s); 1930 $tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742 glDisable GL_TEXTURE_2D; 1931 glDisable GL_TEXTURE_2D;
1743 glDisable GL_BLEND;
1744} 1932}
1745 1933
1746############################################################################# 1934#############################################################################
1747 1935
1748package CFClient::UI::Image; 1936package CFClient::UI::Image;
… …
1791 glTranslate 0, -$self->{w}, 0; 1979 glTranslate 0, -$self->{w}, 0;
1792 1980
1793 ($w, $h) = ($h, $w); 1981 ($w, $h) = ($h, $w);
1794 } 1982 }
1795 1983
1796 glEnable GL_BLEND;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 glEnable GL_TEXTURE_2D; 1984 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 1986
1801 $tex->draw_quad (0, 0, $w, $h); 1987 $tex->draw_quad_alpha (0, 0, $w, $h);
1802 1988
1803 glDisable GL_BLEND;
1804 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1805} 1990}
1806 1991
1807############################################################################# 1992#############################################################################
1808 1993
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2182 qw(s1_slider.png s1_slider_bg.png);
1998 2183
1999sub new { 2184sub new {
2000 my $class = shift; 2185 my $class = shift;
2001 2186
2002 # range [value, low, high, page] 2187 # range [value, low, high, page, unit]
2003 2188
2004 # TODO: 0-width page 2189 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2190 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2191 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2194 active_fg => [0, 0, 0],
2195 bg => [0, 0, 0, 0.2],
2196 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2197 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2198 min_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2199 min_h => $::WIDTH / 80,
2013 vertical => 0, 2200 vertical => 0,
2014 can_hover => 1, 2201 can_hover => 1,
2015 inner_pad => 5, 2202 inner_pad => 0.02,
2016 @_ 2203 @_
2017 ); 2204 );
2018 2205
2206 $self->set_value ($self->{range}[0]);
2207 $self->update;
2208
2019 $self 2209 $self
2020} 2210}
2021 2211
2212sub changed { }
2213
2214sub set_range {
2215 my ($self, $range) = @_;
2216
2217 ($range, $self->{range}) = ($self->{range}, $range);
2218
2219 $self->update
2220 if "@$range" ne "@{$self->{range}}";
2221}
2222
2223sub set_value {
2224 my ($self, $value) = @_;
2225
2226 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2227
2228 $hi = $lo + 1 if $hi <= $lo;
2229
2230 $page = $hi - $lo if $page > $hi - $lo;
2231
2232 $value = $lo if $value < $lo;
2233 $value = $hi - $page if $value > $hi - $page;
2234
2235 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2236 if $unit;
2237
2238 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2239
2240 if ($value != $old_value) {
2241 $self->_emit (changed => $value);
2242 $self->update;
2243 }
2244}
2245
2022sub size_request { 2246sub size_request {
2023 my ($self) = @_; 2247 my ($self) = @_;
2024 2248
2025 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
2026 my $h = $self->{req_h};
2027
2028 $self->{vertical} ? ($h, $w) : ($w, $h)
2029} 2250}
2030 2251
2031sub button_down { 2252sub button_down {
2032 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
2033 2254
2034 $self->SUPER::button_down ($ev, $x, $y); 2255 $self->SUPER::button_down ($ev, $x, $y);
2256
2257 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258
2035 $self->mouse_motion ($ev, $x, $y); 2259 $self->mouse_motion ($ev, $x, $y);
2036} 2260}
2037 2261
2038sub mouse_motion { 2262sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
2040 2264
2041 if ($GRAB == $self) { 2265 if ($GRAB == $self) {
2266 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2267
2268 my (undef, $lo, $hi, $page) = @{$self->{range}};
2269
2270 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271
2272 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2273 }
2274}
2275
2276sub update {
2277 my ($self) = @_;
2278
2279 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2280 $self->set_value ($self->{range}[0]);
2281
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2282 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100;
2043 2284
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2285 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2286
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2287 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2288 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2289
2049 $x -= $inner_pad_px; # substract the padding 2290 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2291 $value = $value * $self->{scale} + $self->{offset};
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2292
2055 $self->emit (changed => $x); 2293 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2294 $self->{knob_w} = $knob_w;
2057 } 2295 });
2058}
2059 2296
2060# the inner_* stuff is for generating a padding for the slider handle, 2297 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2298}
2067 2299
2068sub _draw { 2300sub _draw {
2069 my ($self) = @_; 2301 my ($self) = @_;
2070 2302
2071 $self->SUPER::_draw (); 2303 $self->SUPER::_draw ();
2072 2304
2073 my ($w, $h) = @$self{qw(w h)}; 2305 glScale $self->{w}, $self->{h};
2074 2306
2075 if ($self->{vertical}) { 2307 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2308 # draw a vertical slider like a rotated horizontal slider
2077 2309
2310 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2311 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2312 }
2083 2313
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2314 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2315 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2316
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_BLEND;
2106 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2107 glEnable GL_TEXTURE_2D; 2317 glEnable GL_TEXTURE_2D;
2108 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109 2319
2110 # draw background 2320 # draw background
2111 $tex[1]->draw_quad (0, 0, $w, $h); 2321 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112 2322
2113 # draw handle 2323 # draw handle
2114 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2324 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115 2325
2116 glDisable GL_BLEND;
2117 glDisable GL_TEXTURE_2D; 2326 glDisable GL_TEXTURE_2D;
2118} 2327}
2328
2329#############################################################################
2330
2331package CFClient::UI::ValSlider;
2332
2333our @ISA = CFClient::UI::HBox::;
2334
2335sub new {
2336 my ($class, %arg) = @_;
2337
2338 my $range = delete $arg{range};
2339
2340 my $self = $class->SUPER::new (
2341 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2342 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2343 to_value => sub { shift },
2344 from_value => sub { shift },
2345 %arg,
2346 );
2347
2348 $self->{slider}->connect (changed => sub {
2349 my ($self, $value) = @_;
2350 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2351 $self->{parent}->emit (changed => $value);
2352 });
2353
2354# $self->{entry}->connect (changed => sub {
2355# my ($self, $value) = @_;
2356# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2357# $self->{parent}->emit (changed => $value);
2358# });
2359
2360 $self->add ($self->{slider}, $self->{entry});
2361
2362 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2363
2364 $self
2365}
2366
2367sub set_range { shift->{slider}->set_range (@_) }
2368sub set_value { shift->{slider}->set_value (@_) }
2119 2369
2120############################################################################# 2370#############################################################################
2121 2371
2122package CFClient::UI::TextView; 2372package CFClient::UI::TextView;
2123 2373
… …
2132 fontsize => 1, 2382 fontsize => 1,
2133 can_events => 0, 2383 can_events => 0,
2134 #font => default_font 2384 #font => default_font
2135 @_, 2385 @_,
2136 2386
2137 layout => (new CFClient::Layout), 2387 layout => (new CFClient::Layout 1),
2138 par => [], 2388 par => [],
2139 height => 0, 2389 height => 0,
2140 children => [ 2390 children => [
2141 (new CFClient::UI::Empty expand => 1), 2391 (new CFClient::UI::Empty expand => 1),
2142 (new CFClient::UI::Slider vertical => 1), 2392 (new CFClient::UI::Slider vertical => 1),
… …
2153 2403
2154 $self->{fontsize} = $fontsize; 2404 $self->{fontsize} = $fontsize;
2155 $self->reflow; 2405 $self->reflow;
2156} 2406}
2157 2407
2158sub text_height {
2159 my ($self, $text) = @_;
2160
2161 my $layout = $self->{layout};
2162
2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164 $layout->set_width ($self->{children}[0]{w});
2165 $layout->set_text ($text);
2166
2167 ($layout->size)[1]
2168}
2169
2170sub reflow {
2171 my ($self) = @_;
2172
2173 $self->{need_reflow}++;
2174 $self->update;
2175}
2176
2177sub size_allocate { 2408sub size_allocate {
2178 my ($self, $w, $h) = @_; 2409 my ($self, $w, $h) = @_;
2179 2410
2180 $self->SUPER::size_allocate ($w, $h); 2411 $self->SUPER::size_allocate ($w, $h);
2181 2412
… …
2184 $self->{layout}->set_width ($self->{children}[0]{w}); 2415 $self->{layout}->set_width ($self->{children}[0]{w});
2185 2416
2186 $self->reflow; 2417 $self->reflow;
2187} 2418}
2188 2419
2420sub text_size {
2421 my ($self, $text, $indent) = @_;
2422
2423 my $layout = $self->{layout};
2424
2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426 $layout->set_width ($self->{children}[0]{w} - $indent);
2427 $layout->set_markup ($text);
2428
2429 $layout->size
2430}
2431
2432sub reflow {
2433 my ($self) = @_;
2434
2435 $self->{need_reflow}++;
2436 $self->update;
2437}
2438
2439sub set_offset {
2440 my ($self, $offset) = @_;
2441
2442 # todo: base offset on lines or so, not on pixels
2443 $self->{children}[1]->set_value ($offset);
2444}
2445
2446sub clear {
2447 my ($self) = @_;
2448
2449 $self->{par} = [];
2450 $self->{height} = 0;
2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452}
2453
2189sub add_paragraph { 2454sub add_paragraph {
2190 my ($self, $color, $text) = @_; 2455 my ($self, $color, $text, $indent) = @_;
2191 2456
2192 #TODO: intelligently "reformat" paragraph 2457 for my $line (split /\n/, $text) {
2193 2458 my ($w, $h) = $self->text_size ($line);
2194 my $height = $self->text_height ($text);
2195
2196 $self->{height} += $height; 2459 $self->{height} += $h;
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2461 }
2197 2462
2198 push @{$self->{par}}, [$height, $color, $text];
2199
2200 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2463 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2201 $self->{children}[1]->update;
2202} 2464}
2203 2465
2204sub update { 2466sub update {
2205 my ($self) = @_; 2467 my ($self) = @_;
2206 2468
… …
2208 2470
2209 return unless $self->{h} > 0; 2471 return unless $self->{h} > 0;
2210 2472
2211 delete $self->{texture}; 2473 delete $self->{texture};
2212 2474
2213 $ROOT->on_refresh ($self, sub { 2475 $ROOT->on_post_alloc ($self, sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477
2214 if (delete $self->{need_reflow}) { 2478 if (delete $self->{need_reflow}) {
2215 my $height = 0; 2479 my $height = 0;
2216 2480
2217 $height += $_->[0] = $self->text_height ($_->[2]) 2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
2218 for @{$self->{par}}; 2485 for (@{$self->{par}}) {
2486 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2487 $layout->set_width ($W - $_->[3]);
2488 $layout->set_markup ($_->[4]);
2489 my ($w, $h) = $layout->size;
2490 $_->[0] = $w + $_->[3];
2491 $_->[1] = $h;
2492 }
2493
2494 $height += $_->[1];
2495 }
2219 2496
2220 $self->{height} = $height; 2497 $self->{height} = $height;
2221 2498
2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2223 2500
2224 delete $self->{texture}; 2501 delete $self->{texture};
2225 } 2502 }
2226 2503
2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2228 glClearColor 0, 0, 0, 0; 2505 glClearColor 0.5, 0.5, 0.5, 0;
2229 glClear GL_COLOR_BUFFER_BIT; 2506 glClear GL_COLOR_BUFFER_BIT;
2230 2507
2508 my $top = int $self->{children}[1]{range}[0];
2509
2510 my $y0 = $top;
2511 my $y1 = $top + $H;
2512
2513 my $y = 0;
2514
2515 my $layout = $self->{layout};
2516
2517 $layout->set_font ($self->{font}) if $self->{font};
2518
2231 glEnable GL_BLEND; 2519 glEnable GL_BLEND;
2520 #TODO# not correct in windows where rgba is forced off
2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2521 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235
2236 my $top = int $self->{children}[1]{range}[0];
2237
2238 my $y0 = $top;
2239 my $y1 = $top + $self->{h};
2240
2241 my $y = 0;
2242
2243 my $layout = $self->{layout};
2244
2245 $layout->set_font ($self->{font}) if $self->{font};
2246 2522
2247 for my $par (@{$self->{par}}) { 2523 for my $par (@{$self->{par}}) {
2248 my $h = $par->[0]; 2524 my $h = $par->[1];
2249 2525
2250 if ($y0 < $y + $h && $y < $y1) { 2526 if ($y0 < $y + $h && $y < $y1) {
2527 $layout->set_foreground (@{ $par->[2] });
2528 $layout->set_width ($W - $par->[3]);
2251 $layout->set_text ($par->[2]); 2529 $layout->set_markup ($par->[4]);
2252 2530
2253 glColor @{ $par->[1] }; 2531 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254 my ($W, $H) = $layout->size; 2532
2255 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2533 glRasterPos $par->[3], $y - $y0;
2534 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2256 } 2535 }
2257 2536
2258 $y += $h; 2537 $y += $h;
2259 } 2538 }
2260 2539
2261 glDisable GL_TEXTURE_2D;
2262 glDisable GL_BLEND; 2540 glDisable GL_BLEND;
2263 }; 2541 };
2264 }); 2542 });
2265} 2543}
2266 2544
2267sub _draw { 2545sub _draw {
2268 my ($self) = @_; 2546 my ($self) = @_;
2269 2547
2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272 glEnable GL_TEXTURE_2D; 2548 glEnable GL_TEXTURE_2D;
2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1; 2550 glColor 1, 1, 1, 1;
2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2551 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276 glDisable GL_TEXTURE_2D; 2552 glDisable GL_TEXTURE_2D;
2277 glDisable GL_BLEND;
2278 2553
2279 $self->{children}[1]->draw; 2554 $self->{children}[1]->draw;
2280 2555
2281} 2556}
2282 2557
… …
2330 2605
2331sub new { 2606sub new {
2332 my $class = shift; 2607 my $class = shift;
2333 2608
2334 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2335 state => 0, 2610 state => 0,
2336 connect_activate => \&toggle_flopper, 2611 on_activate => \&toggle_flopper,
2337 @_ 2612 @_
2338 ); 2613 );
2339 2614
2340 if ($self->{state}) {
2341 $self->{state} = 0;
2342 $self->toggle_flopper;
2343 }
2344
2345 $self 2615 $self
2346} 2616}
2347 2617
2348sub toggle_flopper { 2618sub toggle_flopper {
2349 my ($self) = @_; 2619 my ($self) = @_;
2350 2620
2351 # TODO: use animation 2621 $self->{other}->toggle_visibility;
2352 if ($self->{state} = !$self->{state}) {
2353 $CFClient::UI::ROOT->add ($self->{other});
2354 $self->{other}->move ($self->coord2global (0, $self->{h}));
2355 $self->emit ("open");
2356 } else {
2357 $CFClient::UI::ROOT->remove ($self->{other});
2358 $self->emit ("close");
2359 }
2360
2361 $self->emit (changed => $self->{state});
2362} 2622}
2363 2623
2364############################################################################# 2624#############################################################################
2365 2625
2366package CFClient::UI::Tooltip; 2626package CFClient::UI::Tooltip;
… …
2376 @_, 2636 @_,
2377 can_events => 0, 2637 can_events => 0,
2378 ) 2638 )
2379} 2639}
2380 2640
2381sub set_markup { 2641sub set_tooltip_from {
2382 my ($self, $text) = @_; 2642 my ($self, $widget) = @_;
2383 2643
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2644 my $tooltip = $widget->{tooltip};
2385 $self->{label}->set_markup ($text); 2645
2386 $self->add ($self->{label}); 2646 if ($ENV{CFPLUS_DEBUG} & 2) {
2647 $tooltip .= "\n\n" . (ref $widget) . "\n"
2648 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649 . "req $widget->{req_w} $widget->{req_h}\n"
2650 . "visible $widget->{visible}";
2651 }
2652
2653 $self->add (new CFClient::UI::Label
2654 markup => $tooltip,
2655 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2656 fontsize => 0.8,
2657 fg => [0, 0, 0, 1],
2658 ellipsise => 0,
2659 font => ($widget->{tooltip_font} || $::FONT_PROP),
2660 );
2387} 2661}
2388 2662
2389sub size_request { 2663sub size_request {
2390 my ($self) = @_; 2664 my ($self) = @_;
2391
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393 2665
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2666 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395 2667
2396 ($w + 4, $h + 4) 2668 ($w + 4, $h + 4)
2397} 2669}
… …
2400 my ($self, $w, $h) = @_; 2672 my ($self, $w, $h) = @_;
2401 2673
2402 $self->SUPER::size_allocate ($w - 4, $h - 4); 2674 $self->SUPER::size_allocate ($w - 4, $h - 4);
2403} 2675}
2404 2676
2677sub visibility_change {
2678 my ($self, $visible) = @_;
2679
2680 return unless $visible;
2681
2682 $self->{root}->on_post_alloc ("move_$self" => sub {
2683 my $widget = $self->{owner}
2684 or return;
2685
2686 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687
2688 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689 if $x + $self->{w} > $::WIDTH;
2690
2691 $self->move_abs ($x, $y);
2692 });
2693}
2694
2405sub _draw { 2695sub _draw {
2406 my ($self) = @_; 2696 my ($self) = @_;
2407 2697
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375; 2698 glTranslate 0.375, 0.375;
2410 2699
2411 my ($w, $h) = @$self{qw(w h)}; 2700 my ($w, $h) = @$self{qw(w h)};
2412 2701
2413 glColor 1, 0.8, 0.4; 2702 glColor 1, 0.8, 0.4;
… …
2424 glVertex 0 , $h; 2713 glVertex 0 , $h;
2425 glVertex $w, $h; 2714 glVertex $w, $h;
2426 glVertex $w, 0; 2715 glVertex $w, 0;
2427 glEnd; 2716 glEnd;
2428 2717
2429 glPopMatrix; 2718 glTranslate 2 - 0.375, 2 - 0.375;
2430 2719
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw; 2720 $self->SUPER::_draw;
2433} 2721}
2434 2722
2435############################################################################# 2723#############################################################################
2436 2724
… …
2441use CFClient::OpenGL; 2729use CFClient::OpenGL;
2442 2730
2443sub new { 2731sub new {
2444 my $class = shift; 2732 my $class = shift;
2445 2733
2446 $class->SUPER::new ( 2734 my $self = $class->SUPER::new (
2447 aspect => 1, 2735 aspect => 1,
2736 can_events => 0,
2448 @_, 2737 @_,
2449 ) 2738 );
2739
2740 if ($self->{anim} && $self->{animspeed}) {
2741 Scalar::Util::weaken (my $widget = $self);
2742
2743 $self->{timer} = Event->timer (
2744 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2745 hard => 1,
2746 interval => $self->{animspeed},
2747 cb => sub {
2748 ++$widget->{frame};
2749 $widget->update;
2750 },
2751 );
2752 }
2753
2754 $self
2450} 2755}
2451 2756
2452sub size_request { 2757sub size_request {
2453 (32, 8) 2758 (32, 8)
2454} 2759}
2455 2760
2761sub update {
2762 my ($self) = @_;
2763
2764 return unless $self->{visible};
2765
2766 $self->SUPER::update;
2767}
2768
2456sub _draw { 2769sub _draw {
2457 my ($self) = @_; 2770 my ($self) = @_;
2458 2771
2459 return unless $::CONN;#d# manage and cache textures differently 2772 return unless $::CONN;
2773
2774 my $face;
2775
2776 if ($self->{frame}) {
2777 my $anim = $::CONN->{anim}[$self->{anim}];
2778
2779 $face = $anim->[ $self->{frame} % @$anim ]
2780 if $anim && @$anim;
2781 }
2782
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2783 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461 2784
2462 # TODO animation
2463 if ($tex) { 2785 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D; 2786 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1; 2788 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2789 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 } 2791 }
2473} 2792}
2474 2793
2475############################################################################# 2794sub DESTROY {
2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_,
2549 );
2550
2551 $self
2552}
2553
2554sub set_items {
2555 my ($self, $items) = @_; 2795 my ($self) = @_;
2556 2796
2557 $self->{scrolled}->clear; 2797 $self->{timer}->cancel
2558 return unless $items; 2798 if $self->{timer};
2559 2799
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2800 $self->SUPER::DESTROY;
2561
2562 $self->{real_items} = \@items;
2563
2564 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2570 }
2571
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573}
2574
2575sub size_request {
2576 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h});
2578} 2801}
2579 2802
2580############################################################################# 2803#############################################################################
2581 2804
2582package CFClient::UI::Menu; 2805package CFClient::UI::Menu;
… …
2617 2840
2618# popup given the event (must be a mouse button down event currently) 2841# popup given the event (must be a mouse button down event currently)
2619sub popup { 2842sub popup {
2620 my ($self, $ev) = @_; 2843 my ($self, $ev) = @_;
2621 2844
2622 $self->emit ("popdown"); 2845 $self->_emit ("popdown");
2623 2846
2624 # maybe save $GRAB? must be careful about events... 2847 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self; 2848 $GRAB = $self;
2626 $self->{button} = $ev->{button}; 2849 $self->{button} = $ev->{button};
2627 2850
2628 $self->show; 2851 $self->show;
2629 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2852 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2630} 2853}
2631 2854
2632sub mouse_motion { 2855sub mouse_motion {
2633 my ($self, $ev, $x, $y) = @_; 2856 my ($self, $ev, $x, $y) = @_;
2634 2857
… …
2642 2865
2643 if ($ev->{button} == $self->{button}) { 2866 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB; 2867 undef $GRAB;
2645 $self->hide; 2868 $self->hide;
2646 2869
2647 $self->emit ("popdown"); 2870 $self->_emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover}; 2871 $self->{hover}[1]->() if $self->{hover};
2649 } 2872 }
2650} 2873}
2651 2874
2652############################################################################# 2875#############################################################################
2653 2876
2654package CFClient::UI::Root; 2877package CFClient::UI::Statusbox;
2655 2878
2656our @ISA = CFClient::UI::Container::; 2879our @ISA = CFClient::UI::VBox::;
2657
2658use CFClient::OpenGL;
2659 2880
2660sub new { 2881sub new {
2661 my $class = shift; 2882 my $class = shift;
2662 2883
2663 $class->SUPER::new ( 2884 $class->SUPER::new (
2885 fontsize => 0.8,
2664 @_, 2886 @_,
2665 ) 2887 )
2666} 2888}
2667 2889
2890sub reorder {
2891 my ($self) = @_;
2892 my $NOW = time;
2893
2894 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 }
2897
2898 my @widgets;
2899
2900 my @items = sort {
2901 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} };
2904
2905 my $count = 10 + 1;
2906 for my $item (@items) {
2907 last unless --$count;
2908
2909 push @widgets, $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text};
2914
2915 for ($short) {
2916 s/^\s+//;
2917 s/\s+/ /g;
2918 }
2919
2920 new CFClient::UI::Label
2921 markup => $short,
2922 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg},
2928 can_events => 1,
2929 can_hover => 1
2930 };
2931 }
2932
2933 $self->clear;
2934 $self->SUPER::add (reverse @widgets);
2935}
2936
2937sub add {
2938 my ($self, $text, %arg) = @_;
2939
2940 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//;
2942
2943 return unless $text;
2944
2945 my $timeout = time + ((delete $arg{timeout}) || 60);
2946
2947 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948
2949 if (my $item = $self->{item}{$group}) {
2950 if ($item->{text} eq $text) {
2951 $item->{count}++;
2952 } else {
2953 $item->{count} = 1;
2954 $item->{text} = $item->{tooltip} = $text;
2955 }
2956 $item->{id} = ++$self->{id};
2957 $item->{timeout} = $timeout;
2958 delete $item->{label};
2959 } else {
2960 $self->{item}{$group} = {
2961 id => ++$self->{id},
2962 text => $text,
2963 timeout => $timeout,
2964 tooltip => $text,
2965 fg => [0.8, 0.8, 0.8, 0.8],
2966 pri => 0,
2967 count => 1,
2968 %arg,
2969 };
2970 }
2971
2972 $self->reorder;
2973}
2974
2668sub configure { 2975sub reconfigure {
2976 my ($self) = @_;
2977
2978 delete $_->{label}
2979 for values %{ $self->{item} || {} };
2980
2981 $self->reorder;
2982 $self->SUPER::reconfigure;
2983}
2984
2985#############################################################################
2986
2987package CFClient::UI::Inventory;
2988
2989our @ISA = CFClient::UI::ScrolledWindow::;
2990
2991sub new {
2992 my $class = shift;
2993
2994 my $self = $class->SUPER::new (
2995 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2996 @_,
2997 );
2998
2999 $self
3000}
3001
3002sub set_items {
3003 my ($self, $items) = @_;
3004
3005 $self->{scrolled}->clear;
3006 return unless $items;
3007
3008 my @items = sort {
3009 ($a->{type} <=> $b->{type})
3010 or ($a->{name} cmp $b->{name})
3011 } @$items;
3012
3013 $self->{real_items} = \@items;
3014
3015 my $row = 0;
3016 for my $item (@items) {
3017 CFClient::Item::update_widgets $item;
3018
3019 $self->{scrolled}->add (0, $row, $item->{face_widget});
3020 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3021 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3022
3023 $row++;
3024 }
3025}
3026
3027#############################################################################
3028
3029package CFClient::UI::BindEditor;
3030
3031our @ISA = CFClient::UI::FancyFrame::;
3032
3033sub new {
3034 my $class = shift;
3035
3036 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3037
3038 $self->add (my $vb = new CFClient::UI::VBox);
3039
3040
3041 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3042 text => "start recording",
3043 tooltip => "Start/Stops recording of actions."
3044 ."All subsequent actions after the recording started will be captured."
3045 ."The actions are displayed after the record was stopped."
3046 ."To bind the action you have to click on the 'Bind' button",
3047 on_activate => sub {
3048 unless ($self->{recording}) {
3049 $self->start;
3050 } else {
3051 $self->stop;
3052 }
3053 });
3054
3055 $vb->add (new CFClient::UI::Label text => "Actions:");
3056 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3057
3058 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3059 $vb->add (my $hb = new CFClient::UI::HBox);
3060 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3061 $hb->add (new CFClient::UI::Button
3062 text => "bind",
3063 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3064 on_activate => sub {
3065 $self->ask_for_bind;
3066 });
3067
3068 $vb->add (my $hb = new CFClient::UI::HBox);
3069 $hb->add (new CFClient::UI::Button
3070 text => "ok",
3071 expand => 1,
3072 tooltip => "This closes the binding editor and saves the binding",
3073 on_activate => sub {
3074 $self->hide;
3075 $self->commit;
3076 });
3077
3078 $hb->add (new CFClient::UI::Button
3079 text => "cancel",
3080 expand => 1,
3081 tooltip => "This closes the binding editor without saving",
3082 on_activate => sub {
3083 $self->hide;
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 });
3087
3088 $self->update_binding_widgets;
3089
3090 $self
3091}
3092
3093sub commit {
3094 my ($self) = @_;
3095 my ($mod, $sym, $cmds) = $self->get_binding;
3096 if ($sym != 0 && @$cmds > 0) {
3097 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3098 ."'. Don't forget 'Save Config'!");
3099 $self->{binding_change}->($mod, $sym, $cmds)
3100 if $self->{binding_change};
3101 } else {
3102 $::STATUSBOX->add ("No action bound, no key or action specified!");
3103 $self->{binding_cancel}->()
3104 if $self->{binding_cancel};
3105 }
3106}
3107
3108sub start {
3109 my ($self) = @_;
3110
3111 $self->{rec_btn}->set_text ("stop recording");
3112 $self->{recording} = 1;
3113 $self->clear_command_list;
3114 $::CONN->start_record if $::CONN;
3115}
3116
3117sub stop {
3118 my ($self) = @_;
3119
3120 $self->{rec_btn}->set_text ("start recording");
3121 $self->{recording} = 0;
3122
3123 my $rec;
3124 $rec = $::CONN->stop_record if $::CONN;
3125 return unless ref $rec eq 'ARRAY';
3126 $self->set_command_list ($rec);
3127}
3128
3129# if $commit is true, the binding will be set after the user entered a key combo
3130sub ask_for_bind {
3131 my ($self, $commit) = @_;
3132
3133 CFClient::Binder::open_binding_dialog (sub {
3134 my ($mod, $sym) = @_;
3135 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3136 $self->update_binding_widgets;
3137 $self->commit if $commit;
3138 });
3139}
3140
3141# $mod and $sym are the modifiers and key symbol
3142# $cmds is a array ref of strings (the commands)
3143# $cb is the callback that is executed on OK
3144# $ccb is the callback that is executed on CANCEL and
3145# when the binding was unsuccessful on OK
3146sub set_binding {
2669 my ($self, $x, $y, $w, $h) = @_; 3147 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2670 3148
2671 $self->{w} = $w; 3149 $self->clear_command_list;
2672 $self->{h} = $h; 3150 $self->{recording} = 0;
2673} 3151 $self->{rec_btn}->set_text ("start recording");
2674 3152
2675sub check_size { 3153 $self->{binding} = [$mod, $sym];
3154 $self->{commands} = $cmds;
3155
3156 $self->{binding_change} = $cb;
3157 $self->{binding_cancel} = $ccb;
3158
3159 $self->update_binding_widgets;
3160}
3161
3162# this is a shortcut method that asks for a binding
3163# and then just binds it.
3164sub do_quick_binding {
2676 my ($self) = @_; 3165 my ($self, $cmds) = @_;
3166 $self->set_binding (undef, undef, $cmds, sub {
3167 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3168 });
3169 $self->ask_for_bind (1);
3170}
2677 3171
2678 $self->size_allocate ($self->{w}, $self->{h}) 3172sub update_binding_widgets {
2679 if $self->{w}; 3173 my ($self) = @_;
3174 my ($mod, $sym, $cmds) = $self->get_binding;
3175 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3176 $self->set_command_list ($cmds);
3177}
3178
3179sub get_binding {
3180 my ($self) = @_;
3181 return (
3182 $self->{binding}->[0],
3183 $self->{binding}->[1],
3184 [ grep { defined $_ } @{$self->{commands}} ]
3185 );
3186}
3187
3188sub clear_command_list {
3189 my ($self) = @_;
3190 $self->{cmdbox}->clear ();
3191}
3192
3193sub set_command_list {
3194 my ($self, $cmds) = @_;
3195
3196 $self->{cmdbox}->clear ();
3197 $self->{commands} = $cmds;
3198
3199 my $idx = 0;
3200
3201 for (@$cmds) {
3202 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3203
3204 my $i = $idx;
3205 $hb->add (new CFClient::UI::Label text => $_);
3206 $hb->add (new CFClient::UI::Button
3207 text => "delete",
3208 tooltip => "Deletes the action from the record",
3209 on_activate => sub {
3210 $self->{cmdbox}->remove ($hb);
3211 $cmds->[$i] = undef;
3212 });
3213
3214
3215 $idx++
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::SpellList;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (new CFClient::UI::ScrolledWindow
3231 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3232
3233 $self;
3234}
3235
3236# XXX: Do sorting? Argl...
3237sub add_spell {
3238 my ($self, $spell) = @_;
3239 $self->{spells}->{$spell->{name}} = $spell;
3240
3241 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3242 face => $spell->{face},
3243 can_hover => 1,
3244 can_events => 1,
3245 tooltip => $spell->{message});
3246
3247 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3248 text => $spell->{name},
3249 can_hover => 1,
3250 can_events => 1,
3251 tooltip => $spell->{message},
3252 expand => 1);
3253
3254 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3255 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3256 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3257 expand => 1);
3258
3259 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3260 text => "bind to key",
3261 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3262}
3263
3264sub rebuild_spell_list {
3265 my ($self) = @_;
3266 $self->{tbl_idx} = 0;
3267 $self->add_spell ($_) for values %{$self->{spells}};
3268}
3269
3270sub remove_spell {
3271 my ($self, $spell) = @_;
3272 delete $self->{spells}->{$spell->{name}};
3273 $self->rebuild_spell_list;
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::Root;
3279
3280our @ISA = CFClient::UI::Container::;
3281
3282use CFClient::OpenGL;
3283
3284sub new {
3285 my $class = shift;
3286
3287 my $self = $class->SUPER::new (
3288 visible => 1,
3289 @_,
3290 );
3291
3292 Scalar::Util::weaken ($self->{root} = $self);
3293
3294 $self
2680} 3295}
2681 3296
2682sub size_request { 3297sub size_request {
2683 my ($self) = @_; 3298 my ($self) = @_;
2684 3299
2685 ($self->{w}, $self->{h}) 3300 ($self->{w}, $self->{h})
3301}
3302
3303sub _to_pixel {
3304 my ($coord, $size, $max) = @_;
3305
3306 $coord =
3307 $coord eq "center" ? ($max - $size) * 0.5
3308 : $coord eq "max" ? $max
3309 : $coord;
3310
3311 $coord = 0 if $coord < 0;
3312 $coord = $max - $size if $coord > $max - $size;
3313
3314 int $coord + 0.5
2686} 3315}
2687 3316
2688sub size_allocate { 3317sub size_allocate {
2689 my ($self, $w, $h) = @_; 3318 my ($self, $w, $h) = @_;
2690 3319
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706
2707 for my $child ($self->children) { 3320 for my $child ($self->children) {
2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709 3322
2710 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3323 $X = $child->{force_x} if exists $child->{force_x};
2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3324 $Y = $child->{force_y} if exists $child->{force_y};
3325
3326 $X = _to_pixel $X, $W, $self->{w};
3327 $Y = _to_pixel $Y, $H, $self->{h};
3328
2712 $child->configure ($X, $Y, $W, $H); 3329 $child->configure ($X, $Y, $W, $H);
2713 } 3330 }
2714
2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717} 3331}
2718 3332
2719sub coord2local { 3333sub coord2local {
2720 my ($self, $x, $y) = @_; 3334 my ($self, $x, $y) = @_;
2721 3335
… …
2729} 3343}
2730 3344
2731sub update { 3345sub update {
2732 my ($self) = @_; 3346 my ($self) = @_;
2733 3347
2734 $self->check_size;
2735 $::WANT_REFRESH++; 3348 $::WANT_REFRESH++;
2736} 3349}
2737 3350
2738sub add { 3351sub add {
2739 my ($self, $child) = @_; 3352 my ($self, @children) = @_;
2740 3353
2741 # integerise window positions 3354 $_->{is_toplevel} = 1
2742 $child->{x} = int $child->{x}; 3355 for @children;
2743 $child->{y} = int $child->{y};
2744 3356
2745 $self->SUPER::add ($child); 3357 $self->SUPER::add (@children);
3358}
3359
3360sub remove {
3361 my ($self, @children) = @_;
3362
3363 $self->SUPER::remove (@children);
3364
3365 delete $self->{is_toplevel}
3366 for @children;
3367
3368 while (@children) {
3369 my $w = pop @children;
3370 push @children, $w->children;
3371 $w->set_invisible;
3372 }
2746} 3373}
2747 3374
2748sub on_refresh { 3375sub on_refresh {
2749 my ($self, $id, $cb) = @_; 3376 my ($self, $id, $cb) = @_;
2750 3377
2751 $self->{refresh_hook}{$id} = $cb; 3378 $self->{refresh_hook}{$id} = $cb;
2752} 3379}
2753 3380
3381sub on_post_alloc {
3382 my ($self, $id, $cb) = @_;
3383
3384 $self->{post_alloc_hook}{$id} = $cb;
3385}
3386
2754sub draw { 3387sub draw {
2755 my ($self) = @_; 3388 my ($self) = @_;
2756
2757 if ($self->{check_size}) {
2758 my @queue = ([], []);
2759
2760 for (;;) {
2761 if ($self->{check_size}) {
2762 # heuristic: check containers last
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2764 for values %{delete $self->{check_size}}
2765 }
2766
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2768
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request;
2772
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2774 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h;
2776
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2778
2779 $widget->{parent}->check_size
2780 if $widget->{parent};
2781 }
2782 }
2783 }
2784
2785 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_;
2788
2789 $widget->{w} = $w;
2790 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h);
2793 }
2794 }
2795 3389
2796 while ($self->{refresh_hook}) { 3390 while ($self->{refresh_hook}) {
2797 $_->() 3391 $_->()
2798 for values %{delete $self->{refresh_hook}}; 3392 for values %{delete $self->{refresh_hook}};
2799 } 3393 }
2800 3394
3395 if ($self->{realloc}) {
3396 my %queue;
3397 my @queue;
3398 my $widget;
3399
3400 outer:
3401 while () {
3402 if (my $realloc = delete $self->{realloc}) {
3403 for $widget (values %$realloc) {
3404 $widget->{visible} or next; # do not resize invisible widgets
3405
3406 $queue{$widget+0}++ and next; # duplicates are common
3407
3408 push @{ $queue[$widget->{visible}] }, $widget;
3409 }
3410 }
3411
3412 while () {
3413 @queue or last outer;
3414
3415 $widget = pop @{ $queue[-1] || [] }
3416 and last;
3417
3418 pop @queue;
3419 }
3420
3421 delete $queue{$widget+0};
3422
3423 my ($w, $h) = $widget->size_request;
3424
3425 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3427
3428 $w = $widget->{force_w} if exists $widget->{force_w};
3429 $h = $widget->{force_h} if exists $widget->{force_h};
3430
3431 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3432 || delete $widget->{force_realloc}) {
3433 $widget->{req_w} = $w;
3434 $widget->{req_h} = $h;
3435
3436 $self->{size_alloc}{$widget+0} = $widget;
3437
3438 if (my $parent = $widget->{parent}) {
3439 $self->{realloc}{$parent+0} = $parent
3440 unless $queue{$parent+0};
3441
3442 $parent->{force_size_alloc} = 1;
3443 $self->{size_alloc}{$parent+0} = $parent;
3444 }
3445 }
3446
3447 delete $self->{realloc}{$widget+0};
3448 }
3449 }
3450
3451 while (my $size_alloc = delete $self->{size_alloc}) {
3452 my @queue = sort { $b->{visible} <=> $a->{visible} }
3453 values %$size_alloc;
3454
3455 while () {
3456 my $widget = pop @queue || last;
3457
3458 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3459
3460 $w = 0 if $w < 0;
3461 $h = 0 if $h < 0;
3462
3463 $w = int $w + 0.5;
3464 $h = int $h + 0.5;
3465
3466 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3467 $widget->{old_w} = $widget->{w};
3468 $widget->{old_h} = $widget->{h};
3469
3470 $widget->{w} = $w;
3471 $widget->{h} = $h;
3472
3473 $widget->emit (size_allocate => $w, $h);
3474 }
3475 }
3476 }
3477
3478 while ($self->{post_alloc_hook}) {
3479 $_->()
3480 for values %{delete $self->{post_alloc_hook}};
3481 }
3482
3483
2801 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
2804 3487
2805 glMatrixMode GL_PROJECTION; 3488 glMatrixMode GL_PROJECTION;
2806 glLoadIdentity; 3489 glLoadIdentity;
2807 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
2809 glLoadIdentity; 3492 glLoadIdentity;
2810 3493
3494 {
3495 package CFClient::UI::Base;
3496
3497 ($draw_x, $draw_y, $draw_w, $draw_h) =
3498 (0, 0, $self->{w}, $self->{h});
3499 }
3500
2811 $self->_draw; 3501 $self->_draw;
2812} 3502}
2813 3503
2814############################################################################# 3504#############################################################################
2815 3505
2816package CFClient::UI; 3506package CFClient::UI;
2817 3507
2818$ROOT = new CFClient::UI::Root; 3508$ROOT = new CFClient::UI::Root;
2819$TOOLTIP = new CFClient::UI::Tooltip; 3509$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820 3510
28211 35111
2822 3512

Diff Legend

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