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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC

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

Diff Legend

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