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

Diff Legend

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