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.179 by elmex, Fri Apr 28 05:17:21 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
674# glColorMask 1, 1, 1, 0; 818 $self->_render;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
681 }; 819 };
682} 820}
683 821
684sub _draw { 822sub _draw {
685 my ($self) = @_; 823 my ($self) = @_;
… …
687 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
688 826
689 my $tex = $self->{texture} 827 my $tex = $self->{texture}
690 or return; 828 or return;
691 829
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
697 833
698 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 835
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
702} 837}
703 838
704############################################################################# 839#############################################################################
705 840
706package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
707 842
708our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
709
710sub new { die }
711
712sub size_request {
713 my ($self) = @_;
714
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718 @$self{qw(child_w child_h)}
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 $self->{children}[1]->draw;
725}
726
727
728#############################################################################
729
730package CFClient::UI::Frame;
731
732our @ISA = CFClient::UI::Bin::;
733
734use CFClient::OpenGL;
735 844
736sub new { 845sub new {
737 my $class = shift; 846 my $class = shift;
738 847
739 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
740 bg => [1, 1, 1, 1], 849 scroll_x => 0,
741 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
742 border => 0.8,
743 @_ 851 @_,
744 ); 852 )
745
746 $self
747} 853}
748 854
749sub _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 {
750 my ($self) = @_; 867 my ($self, $w, $h) = @_;
751 868
752 my ($w, $h) = ($self->{w}, $self->{h}); 869 my $child = $self->child;
753 870
754 glEnable GL_BLEND; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
756 glEnable GL_TEXTURE_2D;
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 873
759# glBegin GL_QUADS; 874 $self->child->configure (0, 0, $w, $h);
760# glColor 0, 0, 0, 0; 875 $self->update;
761# glVertex 0 , 0; 876}
762# glVertex 0 , $h;
763# glVertex $w, $h;
764# glVertex $w, 0;
765# glEnd;
766 877
878sub set_offset {
879 my ($self, $x, $y) = @_;
767 880
768 $self->child->draw; 881 $self->{view_x} = int $x;
769 glDisable GL_BLEND; 882 $self->{view_y} = int $y;
770 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;
771} 921}
772 922
773############################################################################# 923#############################################################################
774 924
775package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
776 926
777our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
778
779use CFClient::OpenGL;
780
781my @tex =
782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
783 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
784 928
785sub new { 929sub new {
786 my $class = shift; 930 my $class = shift;
787 931
788 # 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;
789 1035
790 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
793 border => 0.6, 1039 border => 0.6,
794 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
795 @_ 1043 @_
796 ); 1044 );
797 1045
798 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 1047 align => 0,
… …
823 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
824 1072
825 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
827 1075
828 $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)
829 if $self->{title}; 1077 if $self->{title};
830 1078
831 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
832} 1080}
833 1081
… …
852 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
853 1101
854 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
856 1104
857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
860 $self->check_size;
861 }; 1110 };
862 1111
863 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
864 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
865 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
867 $self->{motion} = sub { 1116 $self->{motion} = sub {
868 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
869 1118
870 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
871 1120
872 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
873 $self->update;
874 }; 1122 };
875 } 1123 }
876} 1124}
877 1125
878sub button_up { 1126sub button_up {
… …
891 my ($self) = @_; 1139 my ($self) = @_;
892 1140
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 1143
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1146
901 my $border = $self->border; 1147 my $border = $self->border;
902 1148
903 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1154
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
911 1157
912 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
913 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
914 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
915
916 glColor @{ $self->{bg} };
917
918 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
922 1164
923 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1166
927 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
928 1168
929 $self->child->draw; 1169 $self->child->draw;
930} 1170}
… …
942sub new { 1182sub new {
943 my $class = shift; 1183 my $class = shift;
944 1184
945 $class->SUPER::new ( 1185 $class->SUPER::new (
946 col_expand => [], 1186 col_expand => [],
947 @_ 1187 @_,
948 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
949} 1193}
950 1194
951sub add { 1195sub add {
952 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
953 1197
954 $child->set_parent ($self); 1198 $child->set_parent ($self);
955 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
956 1200
957 $child->check_size; 1201 $self->realloc;
958} 1202}
959 1203
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
964# 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?
965sub clear { 1205sub clear {
966 my ($self) = @_; 1206 my ($self) = @_;
967 1207
968 my @children = $self->children; 1208 my @children = $self->children;
969 delete $self->{children}; 1209 delete $self->{children};
… …
971 for (@children) { 1211 for (@children) {
972 delete $_->{parent}; 1212 delete $_->{parent};
973 $_->hide; 1213 $_->hide;
974 } 1214 }
975 1215
976 $self->update; 1216 $self->realloc;
977} 1217}
978 1218
979sub get_wh { 1219sub get_wh {
980 my ($self) = @_; 1220 my ($self) = @_;
981 1221
… …
1012sub size_allocate { 1252sub size_allocate {
1013 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1014 1254
1015 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1016 1256
1017 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1018 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1019 1259
1020 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1021 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1022 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1023 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1077 } 1317 }
1078} 1318}
1079 1319
1080############################################################################# 1320#############################################################################
1081 1321
1082package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1083
1084# TODO: wrap into common Box base class
1085 1323
1086our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1087 1325
1088sub size_request { 1326sub size_request {
1089 my ($self) = @_; 1327 my ($self) = @_;
1090 1328
1091 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1092 1330 ? (
1093 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1094 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1095 (List::Util::max map $_->[1], @alloc), 1333 )
1096 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1097} 1338}
1098 1339
1099sub size_allocate { 1340sub size_allocate {
1100 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1101 1342
1102 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1103
1104 my $children = $self->{children}; 1344 my $children = $self->{children};
1105 1345
1106 my @h = map $_->{req_w}, @$children; 1346 my @req;
1107 1347
1108 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1109 1349 @req = ($space / (@$children || 1)) x @$children;
1110 if ($req_h > $h) {
1111 # ah well, not enough space
1112 $_ *= $h / $req_h for @h;
1113 } 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 {
1114 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1115 $exp ||= 1;
1116 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1117 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1118 my $child = $children->[$_];
1119
1120 my $alloc_h = $h[$_];
1121 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1122 $h[$_] = $alloc_h;
1123 } 1364 }
1124 } 1365 }
1125 1366
1126 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1127 1368
1128 my $y = 0; 1369 my $pos = 0;
1129 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1130 my $child = $children->[$_];
1131 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1132 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1133 1373
1134 $y += $h; 1374 $pos += $alloc;
1135 } 1375 }
1136 1376
1137 1 1377 1
1138} 1378}
1139 1379
1140############################################################################# 1380#############################################################################
1141 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
1142package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1143 1398
1144# TODO: wrap into common Box base class
1145
1146our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1147 1400
1148sub size_request { 1401sub new {
1149 my ($self) = @_; 1402 my $class = shift;
1150 1403
1151 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1152 1405 vertical => 1,
1153 ( 1406 @_,
1154 (List::Util::max map $_->[0], @alloc),
1155 (List::Util::sum map $_->[1], @alloc),
1156 ) 1407 )
1157} 1408}
1158 1409
1159sub size_allocate {
1160 my ($self, $w, $h) = @_;
1161
1162 my $children = $self->{children};
1163
1164 my @h = map $_->{req_h}, @$children;
1165
1166 my $req_h = List::Util::sum @h;
1167
1168 if ($req_h > $h) {
1169 # ah well, not enough space
1170 $_ *= $h / $req_h for @h;
1171 } else {
1172 my $exp = List::Util::sum map $_->{expand}, @$children;
1173 $exp ||= 1;
1174
1175 for (0 .. $#$children) {
1176 my $child = $children->[$_];
1177
1178 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1179 }
1180 }
1181
1182 CFClient::UI::harmonize \@h;
1183
1184 my $y = 0;
1185 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_];
1188 $child->configure (0, $y, $w, $h);
1189
1190 $y += $h;
1191 }
1192
1193 1
1194}
1195
1196############################################################################# 1410#############################################################################
1197 1411
1198package CFClient::UI::Label; 1412package CFClient::UI::Label;
1199 1413
1200our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1201 1415
1202use CFClient::OpenGL; 1416use CFClient::OpenGL;
1203 1417
1204sub new { 1418sub new {
1205 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1206 1420
1207 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1209 #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),
1210 fontsize => 1, 1431 fontsize => 1,
1211 text => "",
1212 align => -1, 1432 align => -1,
1213 valign => -1, 1433 valign => -1,
1214 padding => 2, 1434 padding_x => 2,
1215 layout => new CFClient::Layout, 1435 padding_y => 2,
1216 can_events => 0, 1436 can_events => 0,
1217 %arg 1437 %arg
1218 ); 1438 );
1219 1439
1220 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1443 $self->{template} = $layout;
1224 } 1444 }
1225 1445
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1227 $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 }
1228 1451
1229 $self 1452 $self
1230} 1453}
1231 1454
1232sub escape { 1455sub escape($) {
1233 local $_ = $_[1]; 1456 local $_ = $_[0];
1234 1457
1235 s/&/&amp;/g; 1458 s/&/&amp;/g;
1236 s/>/&gt;/g; 1459 s/>/&gt;/g;
1237 s/</&lt;/g; 1460 s/</&lt;/g;
1238 1461
1239 $_[1] 1462 $_
1240} 1463}
1241 1464
1242sub update { 1465sub update {
1243 my ($self) = @_; 1466 my ($self) = @_;
1244 1467
1245 delete $self->{texture}; 1468 delete $self->{texture};
1246 $self->SUPER::update; 1469 $self->SUPER::update;
1247} 1470}
1248 1471
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1472sub set_text {
1256 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1257 1474
1258 return if $self->{text} eq "T$text"; 1475 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1260 1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1262 1480
1263 delete $self->{texture}; 1481 $self->realloc;
1264 $self->update; 1482 $self->update;
1265 $self->check_size;
1266} 1483}
1267 1484
1268sub set_markup { 1485sub set_markup {
1269 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1270 1487
1271 return if $self->{text} eq "M$markup"; 1488 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1489 $self->{text} = "M$markup";
1273 1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1275 1495
1276 delete $self->{texture}; 1496 $self->realloc;
1277 $self->update; 1497 $self->update;
1278 $self->check_size;
1279} 1498}
1280 1499
1281sub size_request { 1500sub size_request {
1282 my ($self) = @_; 1501 my ($self) = @_;
1283 1502
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $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});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1508
1288 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1289 1510
1290 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1295 1516
1296 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1297 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1298 } 1519 }
1299 1520
1300 ( 1521 ($w, $h)
1301 $w + $self->{padding} * 2,
1302 $h + $self->{padding} * 2,
1303 )
1304} 1522}
1305 1523
1306sub size_allocate { 1524sub size_allocate {
1307 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1308 1526
1309 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1310} 1529}
1311 1530
1312sub set_fontsize { 1531sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1314 1533
1315 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1535 delete $self->{texture};
1317 $self->check_size; 1536
1318 $self->update; 1537 $self->realloc;
1319} 1538}
1320 1539
1321sub _draw { 1540sub _draw {
1322 my ($self) = @_; 1541 my ($self) = @_;
1323 1542
1543 $self->SUPER::_draw; # draw background, if applicable
1544
1324 my $tex = $self->{texture} ||= do { 1545 my $tex = $self->{texture} ||= do {
1546 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $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});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552
1328 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
1329 }; 1564 };
1330 1565
1331 glEnable GL_BLEND;
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333 glEnable GL_TEXTURE_2D; 1566 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1568
1569 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1570 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $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 }
1351 1575
1352 glDisable GL_TEXTURE_2D; 1576 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1577}
1355 1578
1356############################################################################# 1579#############################################################################
1357 1580
1358package CFClient::UI::EntryBase; 1581package CFClient::UI::EntryBase;
… …
1371 active_fg => [0, 0, 0], 1594 active_fg => [0, 0, 0],
1372 can_hover => 1, 1595 can_hover => 1,
1373 can_focus => 1, 1596 can_focus => 1,
1374 valign => 0, 1597 valign => 0,
1375 can_events => 1, 1598 can_events => 1,
1599 #text => ...
1376 @_ 1600 @_
1377 ) 1601 )
1378} 1602}
1379 1603
1380sub _set_text { 1604sub _set_text {
… …
1390 $self->{text} = $text; 1614 $self->{text} = $text;
1391 1615
1392 $text =~ s/./*/g if $self->{hidden}; 1616 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1617 $self->{layout}->set_text ("$text ");
1394 1618
1395 $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;
1396} 1629}
1397 1630
1398sub get_text { 1631sub get_text {
1399 $_[0]{text} 1632 $_[0]{text}
1400} 1633}
… …
1403 my ($self) = @_; 1636 my ($self) = @_;
1404 1637
1405 my ($w, $h) = $self->SUPER::size_request; 1638 my ($w, $h) = $self->SUPER::size_request;
1406 1639
1407 ($w + 1, $h) # add 1 for cursor 1640 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414}
1415
1416sub set_text {
1417 my ($self, $text) = @_;
1418
1419 $self->{cursor} = length $text;
1420 $self->_set_text ($text);
1421 $self->update;
1422} 1641}
1423 1642
1424sub key_down { 1643sub key_down {
1425 my ($self, $ev) = @_; 1644 my ($self, $ev) = @_;
1426 1645
… …
1428 my $sym = $ev->{sym}; 1647 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1648 my $uni = $ev->{unicode};
1430 1649
1431 my $text = $self->get_text; 1650 my $text = $self->get_text;
1432 1651
1433 if ($sym == 8) { 1652 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1653 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1654 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1655 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1656 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1657 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1658 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1659 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1660 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1661 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1662 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1663 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1664 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1665 $self->_emit ('escape');
1447 } elsif ($uni) { 1666 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1449 } 1668 }
1450 1669
1451 $self->_set_text ($text); 1670 $self->_set_text ($text);
1452 $self->update; 1671
1672 $self->realloc;
1453} 1673}
1454 1674
1455sub focus_in { 1675sub focus_in {
1456 my ($self) = @_; 1676 my ($self) = @_;
1457 1677
… …
1537 if ($sym == 13) { 1757 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1758 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1759 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1; 1760 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1761 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1762 $self->_emit (activate => $txt);
1543 $self->update; 1763 $self->update;
1544 1764
1545 } elsif ($sym == CFClient::SDLK_UP) { 1765 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1766 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1767 $self->{history_saveback} = $self->get_text;
… …
1584 1804
1585sub new { 1805sub new {
1586 my $class = shift; 1806 my $class = shift;
1587 1807
1588 $class->SUPER::new ( 1808 $class->SUPER::new (
1589 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1590 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1593 can_hover => 1, 1813 can_hover => 1,
1594 align => 0, 1814 align => 0,
1595 valign => 0, 1815 valign => 0,
1596 can_events => 1, 1816 can_events => 1,
1597 @_ 1817 @_
1598 ) 1818 )
1599} 1819}
1600 1820
1821sub activate { }
1822
1601sub button_up { 1823sub button_up {
1602 my ($self, $ev, $x, $y) = @_; 1824 my ($self, $ev, $x, $y) = @_;
1603 1825
1826 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 1827 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 1828 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate");
1607 }
1608} 1829}
1609 1830
1610sub _draw { 1831sub _draw {
1611 my ($self) = @_; 1832 my ($self) = @_;
1612 1833
… …
1614 1835
1615 if ($GRAB == $self) { 1836 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1837 $self->{fg} = $self->{active_fg};
1617 } 1838 }
1618 1839
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1840 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1842 glColor 0, 0, 0, 1;
1624 1843
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1845
1627 glDisable GL_TEXTURE_2D; 1846 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1847
1630 $self->SUPER::_draw; 1848 $self->SUPER::_draw;
1631} 1849}
1632 1850
1633############################################################################# 1851#############################################################################
… …
1644 1862
1645sub new { 1863sub new {
1646 my $class = shift; 1864 my $class = shift;
1647 1865
1648 $class->SUPER::new ( 1866 $class->SUPER::new (
1649 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1650 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1651 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],
1652 state => 0, 1873 state => 0,
1653 can_hover => 1, 1874 can_hover => 1,
1654 @_ 1875 @_
1655 ) 1876 )
1656} 1877}
1657 1878
1658sub size_request { 1879sub size_request {
1659 my ($self) = @_; 1880 my ($self) = @_;
1660 1881
1661 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1662} 1883}
1663 1884
1664sub button_down { 1885sub button_down {
1665 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1666 1887
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1669 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1670 $self->emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1671 } 1892 }
1672} 1893}
1673 1894
1674sub _draw { 1895sub _draw {
1675 my ($self) = @_; 1896 my ($self) = @_;
1676 1897
1677 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1678 1899
1679 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1680 1901
1681 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;
1682 1905
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1907
1685 glEnable GL_BLEND; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909
1686 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1911 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1912 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1913}
1696 1914
1697############################################################################# 1915#############################################################################
1698 1916
1699package CFClient::UI::Image; 1917package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 1960 glTranslate 0, -$self->{w}, 0;
1743 1961
1744 ($w, $h) = ($h, $w); 1962 ($w, $h) = ($h, $w);
1745 } 1963 }
1746 1964
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 1967
1752 $tex->draw_quad (0, 0, $w, $h); 1968 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 1969
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 1970 glDisable GL_TEXTURE_2D;
1756} 1971}
1757 1972
1758############################################################################# 1973#############################################################################
1759 1974
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2163 qw(s1_slider.png s1_slider_bg.png);
1949 2164
1950sub new { 2165sub new {
1951 my $class = shift; 2166 my $class = shift;
1952 2167
1953 # range [value, low, high, page] 2168 # range [value, low, high, page, unit]
1954 2169
1955 # TODO: 0-width page 2170 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2171 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2172 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
1960 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],
1961 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2179 min_w => $::WIDTH / 80,
1963 req_h => 20, 2180 min_h => $::WIDTH / 80,
1964 vertical => 0, 2181 vertical => 0,
1965 can_hover => 1, 2182 can_hover => 1,
1966 inner_pad => 5, 2183 inner_pad => 0.02,
1967 @_ 2184 @_
1968 ); 2185 );
1969 2186
2187 $self->set_value ($self->{range}[0]);
2188 $self->update;
2189
1970 $self 2190 $self
1971} 2191}
1972 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
1973sub size_request { 2227sub size_request {
1974 my ($self) = @_; 2228 my ($self) = @_;
1975 2229
1976 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
1977 my $h = $self->{req_h};
1978
1979 $self->{vertical} ? ($h, $w) : ($w, $h)
1980} 2231}
1981 2232
1982sub button_down { 2233sub button_down {
1983 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
1984 2235
1985 $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
1986 $self->mouse_motion ($ev, $x, $y); 2240 $self->mouse_motion ($ev, $x, $y);
1987} 2241}
1988 2242
1989sub mouse_motion { 2243sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
1991 2245
1992 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
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2263 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100;
1994 2265
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2267
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2268 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2269 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2270
2000 $x -= $inner_pad_px; # substract the padding 2271 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2272 $value = $value * $self->{scale} + $self->{offset};
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2273
2006 $self->emit (changed => $x); 2274 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2275 $self->{knob_w} = $knob_w;
2008 } 2276 });
2009}
2010 2277
2011# the inner_* stuff is for generating a padding for the slider handle, 2278 $self->SUPER::update;
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017} 2279}
2018 2280
2019sub _draw { 2281sub _draw {
2020 my ($self) = @_; 2282 my ($self) = @_;
2021 2283
2022 $self->SUPER::_draw (); 2284 $self->SUPER::_draw ();
2023 2285
2024 my ($w, $h) = @$self{qw(w h)}; 2286 glScale $self->{w}, $self->{h};
2025 2287
2026 if ($self->{vertical}) { 2288 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2289 # draw a vertical slider like a rotated horizontal slider
2028 2290
2291 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2292 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2293 }
2034 2294
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2295 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2296 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2297
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2298 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2300
2061 # draw background 2301 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2302 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2303
2064 # draw handle 2304 # draw handle
2065 $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);
2066 2306
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2307 glDisable GL_TEXTURE_2D;
2069} 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 (@_) }
2070 2350
2071############################################################################# 2351#############################################################################
2072 2352
2073package CFClient::UI::TextView; 2353package CFClient::UI::TextView;
2074 2354
… …
2083 fontsize => 1, 2363 fontsize => 1,
2084 can_events => 0, 2364 can_events => 0,
2085 #font => default_font 2365 #font => default_font
2086 @_, 2366 @_,
2087 2367
2088 layout => (new CFClient::Layout), 2368 layout => (new CFClient::Layout 1),
2089 par => [], 2369 par => [],
2090 height => 0, 2370 height => 0,
2091 children => [ 2371 children => [
2092 (new CFClient::UI::Empty expand => 1), 2372 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2373 (new CFClient::UI::Slider vertical => 1),
… …
2104 2384
2105 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2386 $self->reflow;
2107} 2387}
2108 2388
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2389sub size_allocate {
2129 my ($self, $w, $h) = @_; 2390 my ($self, $w, $h) = @_;
2130 2391
2131 $self->SUPER::size_allocate ($w, $h); 2392 $self->SUPER::size_allocate ($w, $h);
2132 2393
… …
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2397
2137 $self->reflow; 2398 $self->reflow;
2138} 2399}
2139 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
2140sub add_paragraph { 2435sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2436 my ($self, $color, $text, $indent) = @_;
2142 2437
2143 #TODO: intelligently "reformat" paragraph 2438 for my $line (split /\n/, $text) {
2144 2439 my ($w, $h) = $self->text_size ($line);
2145 my $height = $self->text_height ($text);
2146
2147 $self->{height} += $height; 2440 $self->{height} += $h;
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2442 }
2148 2443
2149 push @{$self->{par}}, [$height, $color, $text];
2150
2151 $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]);
2152 $self->{children}[1]->update;
2153} 2445}
2154 2446
2155sub update { 2447sub update {
2156 my ($self) = @_; 2448 my ($self) = @_;
2157 2449
… …
2159 2451
2160 return unless $self->{h} > 0; 2452 return unless $self->{h} > 0;
2161 2453
2162 delete $self->{texture}; 2454 delete $self->{texture};
2163 2455
2164 $ROOT->on_refresh ($self, sub { 2456 $ROOT->on_post_alloc ($self, sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458
2165 if (delete $self->{need_reflow}) { 2459 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2460 my $height = 0;
2167 2461
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2169 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 }
2170 2477
2171 $self->{height} = $height; 2478 $self->{height} = $height;
2172 2479
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174 2481
2175 delete $self->{texture}; 2482 delete $self->{texture};
2176 } 2483 }
2177 2484
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2179 glClearColor 0, 0, 0, 0; 2486 glClearColor 0.5, 0.5, 0.5, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2487 glClear GL_COLOR_BUFFER_BIT;
2181 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
2182 glEnable GL_BLEND; 2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187 my $top = int $self->{children}[1]{range}[0];
2188
2189 my $y0 = $top;
2190 my $y1 = $top + $self->{h};
2191
2192 my $y = 0;
2193
2194 my $layout = $self->{layout};
2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197 2503
2198 for my $par (@{$self->{par}}) { 2504 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2505 my $h = $par->[1];
2200 2506
2201 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]);
2202 $layout->set_text ($par->[2]); 2510 $layout->set_markup ($par->[4]);
2203 2511
2204 glColor @{ $par->[1] }; 2512 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2513
2206 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;
2207 } 2516 }
2208 2517
2209 $y += $h; 2518 $y += $h;
2210 } 2519 }
2211 2520
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2521 glDisable GL_BLEND;
2214 }; 2522 };
2215 }); 2523 });
2216} 2524}
2217 2525
2218sub _draw { 2526sub _draw {
2219 my ($self) = @_; 2527 my ($self) = @_;
2220 2528
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2529 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2531 glColor 1, 1, 1, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2534
2230 $self->{children}[1]->draw; 2535 $self->{children}[1]->draw;
2231 2536
2232} 2537}
2233 2538
… …
2281 2586
2282sub new { 2587sub new {
2283 my $class = shift; 2588 my $class = shift;
2284 2589
2285 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2286 state => 0, 2591 state => 0,
2287 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2288 @_ 2593 @_
2289 ); 2594 );
2290 2595
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2596 $self
2297} 2597}
2298 2598
2299sub toggle_flopper { 2599sub toggle_flopper {
2300 my ($self) = @_; 2600 my ($self) = @_;
2301 2601
2302 # TODO: use animation 2602 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2603}
2314 2604
2315############################################################################# 2605#############################################################################
2316 2606
2317package CFClient::UI::Tooltip; 2607package CFClient::UI::Tooltip;
… …
2327 @_, 2617 @_,
2328 can_events => 0, 2618 can_events => 0,
2329 ) 2619 )
2330} 2620}
2331 2621
2332sub set_markup { 2622sub set_tooltip_from {
2333 my ($self, $text) = @_; 2623 my ($self, $widget) = @_;
2334 2624
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2625 my $tooltip = $widget->{tooltip};
2336 $self->{label}->set_markup ($text); 2626
2337 $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 );
2338} 2642}
2339 2643
2340sub size_request { 2644sub size_request {
2341 my ($self) = @_; 2645 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2646
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2648
2347 ($w + 4, $h + 4) 2649 ($w + 4, $h + 4)
2348} 2650}
… …
2351 my ($self, $w, $h) = @_; 2653 my ($self, $w, $h) = @_;
2352 2654
2353 $self->SUPER::size_allocate ($w - 4, $h - 4); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2354} 2656}
2355 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
2356sub _draw { 2676sub _draw {
2357 my ($self) = @_; 2677 my ($self) = @_;
2358 2678
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2679 glTranslate 0.375, 0.375;
2361 2680
2362 my ($w, $h) = @$self{qw(w h)}; 2681 my ($w, $h) = @$self{qw(w h)};
2363 2682
2364 glColor 1, 0.8, 0.4; 2683 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2694 glVertex 0 , $h;
2376 glVertex $w, $h; 2695 glVertex $w, $h;
2377 glVertex $w, 0; 2696 glVertex $w, 0;
2378 glEnd; 2697 glEnd;
2379 2698
2380 glPopMatrix; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2381 2700
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2384} 2702}
2385 2703
2386############################################################################# 2704#############################################################################
2387 2705
… …
2392use CFClient::OpenGL; 2710use CFClient::OpenGL;
2393 2711
2394sub new { 2712sub new {
2395 my $class = shift; 2713 my $class = shift;
2396 2714
2397 $class->SUPER::new ( 2715 my $self = $class->SUPER::new (
2398 aspect => 1, 2716 aspect => 1,
2717 can_events => 0,
2399 @_, 2718 @_,
2400 ) 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
2401} 2736}
2402 2737
2403sub size_request { 2738sub size_request {
2404 (32, 8) 2739 (32, 8)
2405} 2740}
2406 2741
2742sub update {
2743 my ($self) = @_;
2744
2745 return unless $self->{visible};
2746
2747 $self->SUPER::update;
2748}
2749
2407sub _draw { 2750sub _draw {
2408 my ($self) = @_; 2751 my ($self) = @_;
2409 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
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2765
2412 # TODO animation
2413 if ($tex) { 2766 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2767 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2769 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 } 2772 }
2773}
2774
2775sub DESTROY {
2776 my ($self) = @_;
2777
2778 $self->{timer}->cancel
2779 if $self->{timer};
2780
2781 $self->SUPER::DESTROY;
2423} 2782}
2424 2783
2425############################################################################# 2784#############################################################################
2426 2785
2427package CFClient::UI::Menu; 2786package CFClient::UI::Menu;
… …
2462 2821
2463# popup given the event (must be a mouse button down event currently) 2822# popup given the event (must be a mouse button down event currently)
2464sub popup { 2823sub popup {
2465 my ($self, $ev) = @_; 2824 my ($self, $ev) = @_;
2466 2825
2467 $self->emit ("popdown"); 2826 $self->_emit ("popdown");
2468 2827
2469 # maybe save $GRAB? must be careful about events... 2828 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self; 2829 $GRAB = $self;
2471 $self->{button} = $ev->{button}; 2830 $self->{button} = $ev->{button};
2472 2831
2473 $self->show; 2832 $self->show;
2474 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2475} 2834}
2476 2835
2477sub mouse_motion { 2836sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2837 my ($self, $ev, $x, $y) = @_;
2479 2838
2480 # TODO: should use vbox->fdind_widget or so 2839 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2841 $self->{hover} = $self->{item}{$HOVER};
2483} 2842}
2484 2843
2485sub button_up { 2844sub button_up {
… …
2487 2846
2488 if ($ev->{button} == $self->{button}) { 2847 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB; 2848 undef $GRAB;
2490 $self->hide; 2849 $self->hide;
2491 2850
2492 $self->emit ("popdown"); 2851 $self->_emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover}; 2852 $self->{hover}[1]->() if $self->{hover};
2494 } 2853 }
2495} 2854}
2496 2855
2497############################################################################# 2856#############################################################################
2498 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
2499package CFClient::UI::Root; 3259package CFClient::UI::Root;
2500 3260
2501our @ISA = CFClient::UI::Container::; 3261our @ISA = CFClient::UI::Container::;
2502 3262
2503use CFClient::OpenGL; 3263use CFClient::OpenGL;
2504 3264
2505sub check_size { 3265sub new {
2506 my ($self) = @_; 3266 my $class = shift;
2507 3267
2508 $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
2509} 3276}
2510 3277
2511sub size_request { 3278sub size_request {
2512 ($::WIDTH, $::HEIGHT) 3279 my ($self) = @_;
2513}
2514 3280
2515sub 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 {
2516 my ($self, $x, $y, $w, $h) = @_; 3299 my ($self, $w, $h) = @_;
2517 3300
2518 $self->SUPER::configure ($x, $y, $w, $h);
2519
2520 for my $child (@{$self->{children}}) { 3301 for my $child ($self->children) {
2521 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)};
2522 3303
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3304 $X = $child->{force_x} if exists $child->{force_x};
2524 $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
2525 $child->configure ($X, $Y, $W,$H); 3310 $child->configure ($X, $Y, $W, $H);
2526 } 3311 }
2527} 3312}
2528 3313
2529sub _topleft { 3314sub coord2local {
2530 my ($self, $x, $y) = @_; 3315 my ($self, $x, $y) = @_;
2531 3316
2532 ($x, $y) 3317 ($x, $y)
2533} 3318}
2534 3319
3320sub coord2global {
3321 my ($self, $x, $y) = @_;
3322
3323 ($x, $y)
3324}
3325
2535sub update { 3326sub update {
2536 my ($self) = @_; 3327 my ($self) = @_;
2537 3328
2538 $self->check_size; 3329 $::WANT_REFRESH++;
2539 ::refresh ();
2540} 3330}
2541 3331
2542sub add { 3332sub add {
2543 my ($self, $child) = @_; 3333 my ($self, @children) = @_;
2544 3334
2545 # integerize window positions 3335 $_->{is_toplevel} = 1
2546 $child->{x} = int $child->{x}; 3336 for @children;
2547 $child->{y} = int $child->{y};
2548 3337
2549 $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 }
2550} 3354}
2551 3355
2552sub on_refresh { 3356sub on_refresh {
2553 my ($self, $id, $cb) = @_; 3357 my ($self, $id, $cb) = @_;
2554 3358
2555 $self->{refresh_hook}{$id} = $cb; 3359 $self->{refresh_hook}{$id} = $cb;
2556} 3360}
2557 3361
3362sub on_post_alloc {
3363 my ($self, $id, $cb) = @_;
3364
3365 $self->{post_alloc_hook}{$id} = $cb;
3366}
3367
2558sub draw { 3368sub draw {
2559 my ($self) = @_; 3369 my ($self) = @_;
2560 3370
2561 while (my $rcb = delete $self->{refresh_hook}) { 3371 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 3372 $_->()
3373 for values %{delete $self->{refresh_hook}};
2563 } 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
2564 3449
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
2568 3453
2569 glMatrixMode GL_PROJECTION; 3454 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 3455 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 3457 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 3458 glLoadIdentity;
2574 3459
2575 $self->_draw; 3460 $self->_draw;
2576} 3461}
2577 3462
2578############################################################################# 3463#############################################################################
2579 3464
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2687package CFClient::UI; 3465package CFClient::UI;
2688 3466
2689$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2691 3469
26921 34701
2693 3471

Diff Legend

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