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.174 by root, Tue Apr 25 11:18:49 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

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

Diff Legend

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