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

Diff Legend

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