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.201 by root, Sat May 13 23:17:49 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 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 57 }
42 58
43 return; 59 return;
44 } 60 }
45 } 61 }
… …
49 delete $TOOLTIP->{owner}; 65 delete $TOOLTIP->{owner};
50} 66}
51 67
52# class methods for events 68# class methods for events
53sub feed_sdl_key_down_event { 69sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 70 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 71 if $FOCUS;
56} 72}
57 73
58sub feed_sdl_key_up_event { 74sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 75 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 76 if $FOCUS;
61} 77}
62 78
63sub feed_sdl_button_down_event { 79sub feed_sdl_button_down_event {
64 my ($ev) = @_; 80 my ($ev) = @_;
… …
73 check_tooltip; 89 check_tooltip;
74 } 90 }
75 91
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 92 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 93
78 if ($GRAB) { 94 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79 ($x, $y) = $GRAB->coord2local ($x, $y); 95 if $GRAB;
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
82} 96}
83 97
84sub feed_sdl_button_up_event { 98sub feed_sdl_button_up_event {
85 my ($ev) = @_; 99 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
87 101
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 102 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89 103
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 104 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 105
92 if ($GRAB) { 106 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 ($x, $y) = $GRAB->coord2local ($x, $y); 107 if $GRAB;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 108
97 if (!$BUTTON_STATE) { 109 if (!$BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 110 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 111 $grab->update if $grab;
100 $GRAB->update if $GRAB; 112 $GRAB->update if $GRAB;
… …
116 $HOVER->update if $HOVER && $HOVER->{can_hover}; 128 $HOVER->update if $HOVER && $HOVER->{can_hover};
117 129
118 check_tooltip; 130 check_tooltip;
119 } 131 }
120 132
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 133 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124 } 134 if $HOVER;
125} 135}
126 136
127# convert position array to integers 137# convert position array to integers
128sub harmonize { 138sub harmonize {
129 my ($vals) = @_; 139 my ($vals) = @_;
… …
135 $rem += $_ - $i; 145 $rem += $_ - $i;
136 $_ = $i; 146 $_ = $i;
137 } 147 }
138} 148}
139 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
140############################################################################# 191#############################################################################
141 192
142package CFClient::UI::Base; 193package CFClient::UI::Base;
143 194
144use strict; 195use strict;
… …
147 198
148sub new { 199sub new {
149 my $class = shift; 200 my $class = shift;
150 201
151 my $self = bless { 202 my $self = bless {
152 x => 0, 203 x => "center",
153 y => 0, 204 y => "center",
154 z => 0, 205 z => 0,
206 w => undef,
207 h => undef,
155 can_events => 1, 208 can_events => 1,
156 @_ 209 @_
157 }, $class; 210 }, $class;
158 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
159 for (keys %$self) { 224 for (keys %$self) {
160 if (/^connect_(.*)$/) { 225 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 226 $self->connect ($1 => delete $self->{$_});
162 } 227 }
163 } 228 }
164 229
165 $self 230 $self
… …
178 return if $self->{parent}; 243 return if $self->{parent};
179 244
180 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
181} 246}
182 247
183sub hide { 248sub set_visible {
184 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};
185 272
186 undef $GRAB if $GRAB == $self; 273 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 274 undef $HOVER if $HOVER == $self;
188 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
189 $self->{parent}->remove ($self) 306 $self->{parent}->remove ($self)
190 if $self->{parent}; 307 if $self->{parent};
191} 308}
192 309
193sub move { 310sub move_abs {
194 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
195 312
196 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
197 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
198 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
199 316
200 $self->update; 317 $self->update;
201} 318}
202 319
203sub set_size { 320sub set_size {
204 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
205 322
206 $self->{user_w} = $w; 323 $self->{force_w} = $w;
207 $self->{user_h} = $h; 324 $self->{force_h} = $h;
208 325
209 $self->check_size; 326 $self->realloc;
210} 327}
211 328
212sub size_request { 329sub size_request {
213 require Carp; 330 require Carp;
214 Carp::confess "size_request is abstract"; 331 Carp::confess "size_request is abstract";
… …
216 333
217sub configure { 334sub configure {
218 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
219 336
220 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
221 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
223 342
224 # use alignment to adjust x, y 343 # use alignment to adjust x, y
225 344
226 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
227 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
228
229 ($w, $h) = ($w2, $h2);
230 } 347 }
231 348
232 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
233 $self->{x} = $x; 350 $self->{x} = $x;
234 $self->{y} = $y; 351 $self->{y} = $y;
235 $self->update; 352 $self->update;
236 } 353 }
237 354
238 if ($self->{w} != $w || $self->{h} != $h) { 355 if ($self->{w} != $w || $self->{h} != $h) {
356 return unless $self->{visible};
357
239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
240 } 359 }
241} 360}
242 361
243sub size_allocate { 362sub size_allocate {
244 # nothing to be done 363 # nothing to be done
245} 364}
246 365
247sub children { 366sub children {
248} 367}
249 368
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259}
260
261sub set_max_size { 369sub set_max_size {
262 my ($self, $w, $h) = @_; 370 my ($self, $w, $h) = @_;
263 371
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 372 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 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 }
266} 390}
267 391
268# translate global coordinates to local coordinate system 392# translate global coordinates to local coordinate system
269sub coord2local { 393sub coord2local {
270 my ($self, $x, $y) = @_; 394 my ($self, $x, $y) = @_;
… …
285 return if $FOCUS == $self; 409 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 410 return unless $self->{can_focus};
287 411
288 my $focus = $FOCUS; $FOCUS = $self; 412 my $focus = $FOCUS; $FOCUS = $self;
289 413
290 $self->emit (focus_in => $focus); 414 $self->_emit (focus_in => $focus);
291 415
292 $focus->update if $focus; 416 $focus->update if $focus;
293 $FOCUS->update; 417 $FOCUS->update;
294} 418}
295 419
… …
298 422
299 return unless $FOCUS == $self; 423 return unless $FOCUS == $self;
300 424
301 my $focus = $FOCUS; undef $FOCUS; 425 my $focus = $FOCUS; undef $FOCUS;
302 426
303 $self->emit (focus_out => $focus); 427 $self->_emit (focus_out => $focus);
304 428
305 $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;
306} 433}
307 434
308sub mouse_motion { } 435sub mouse_motion { }
309sub button_up { } 436sub button_up { }
310sub key_down { } 437sub key_down { }
311sub key_up { } 438sub key_up { }
312 439
313sub button_down { 440sub button_down {
314 my ($self, $ev, $x, $y) = @_; 441 my ($self, $ev, $x, $y) = @_;
315 442
316 $self->focus_in; 443 $self->focus_in;
… …
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
323sub 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}
324 521
325sub draw { 522sub draw {
326 my ($self) = @_; 523 my ($self) = @_;
327 524
328 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
345 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
346 glEnd; 543 glEnd;
347 glDisable GL_BLEND; 544 glDisable GL_BLEND;
348 } 545 }
349 546
350 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
351 glPushMatrix; 548 glPushMatrix;
352 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 552 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 553 glVertex $self->{w} - 1, 0;
357 glVertex $self->{w}, $self->{h}; 554 glVertex $self->{w} - 1, $self->{h} - 1;
358 glVertex 0 , $self->{h}; 555 glVertex 0 , $self->{h} - 1;
359 glEnd; 556 glEnd;
360 glPopMatrix; 557 glPopMatrix;
361 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;
362 } 559 }
363} 560}
364 561
365sub _draw { 562sub _draw {
366 my ($self) = @_; 563 my ($self) = @_;
367 564
368 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
369} 566}
370 567
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
391}
392
393sub check_size {
394 my ($self, $forced) = @_;
395
396 $self->{force_alloc} = 1 if $forced;
397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
398}
399
400sub update {
401 my ($self) = @_;
402
403 $self->{parent}->update
404 if $self->{parent};
405}
406
407sub connect {
408 my ($self, $signal, $cb) = @_;
409
410 push @{ $self->{signal_cb}{$signal} }, $cb;
411}
412
413sub emit {
414 my ($self, $signal, @args) = @_;
415
416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
417}
418
419sub DESTROY { 568sub DESTROY {
420 my ($self) = @_; 569 my ($self) = @_;
421 570
571 delete $WIDGET{$self+0};
422 #$self->deactivate; 572 #$self->deactivate;
423} 573}
424 574
425############################################################################# 575#############################################################################
426 576
… …
435 my $class = shift; 585 my $class = shift;
436 586
437 # range [value, low, high, page] 587 # range [value, low, high, page]
438 588
439 $class->SUPER::new ( 589 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 590 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 591 #active_bg => [1, 1, 1, 0.5],
442 @_ 592 @_
443 ) 593 )
444} 594}
445 595
446sub _draw { 596sub _draw {
447 my ($self) = @_; 597 my ($self) = @_;
448 598
599 my $color = $FOCUS == $self && $self->{active_bg}
600 ? $self->{active_bg}
601 : $self->{bg};
602
603 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 604 my ($w, $h) = @$self{qw(w h)};
450 605
451 glEnable GL_BLEND; 606 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 608 glColor @$color;
454 609
455 glBegin GL_QUADS; 610 glBegin GL_QUADS;
456 glVertex 0 , 0; 611 glVertex 0 , 0;
457 glVertex 0 , $h; 612 glVertex 0 , $h;
458 glVertex $w, $h; 613 glVertex $w, $h;
459 glVertex $w, 0; 614 glVertex $w, 0;
460 glEnd; 615 glEnd;
461 616
462 glDisable GL_BLEND; 617 glDisable GL_BLEND;
618 }
463} 619}
464 620
465############################################################################# 621#############################################################################
466 622
467package CFClient::UI::Empty; 623package CFClient::UI::Empty;
… …
472 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
474} 630}
475 631
476sub size_request { 632sub size_request {
477 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
478} 636}
479 637
480sub draw { } 638sub draw { }
481 639
482############################################################################# 640#############################################################################
… …
511 $self->{children} = [ 669 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 671 @{$self->{children}}, @widgets
514 ]; 672 ];
515 673
516 $self->check_size (1); 674 $self->realloc;
517 $self->update;
518} 675}
519 676
520sub children { 677sub children {
521 @{ $_[0]{children} } 678 @{ $_[0]{children} }
522} 679}
… …
527 delete $child->{parent}; 684 delete $child->{parent};
528 $child->hide; 685 $child->hide;
529 686
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531 688
532 $self->check_size; 689 $self->realloc;
533 $self->update;
534} 690}
535 691
536sub clear { 692sub clear {
537 my ($self) = @_; 693 my ($self) = @_;
538 694
… …
542 for (@$children) { 698 for (@$children) {
543 delete $_->{parent}; 699 delete $_->{parent};
544 $_->hide; 700 $_->hide;
545 } 701 }
546 702
547 $self->check_size; 703 $self->realloc;
548 $self->update;
549} 704}
550 705
551sub find_widget { 706sub find_widget {
552 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
553 708
… …
606sub size_request { 761sub size_request {
607 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
608} 763}
609 764
610sub size_allocate { 765sub size_allocate {
611 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
612 767
613 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
614} 769}
615 770
616############################################################################# 771#############################################################################
… …
633 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 789 $self->SUPER::update;
635} 790}
636 791
637sub size_allocate { 792sub size_allocate {
638 my ($self, $w, $h) = @_; 793 my ($self, $w, $h, $changed) = @_;
639 794
640 $self->SUPER::size_allocate ($w, $h); 795 $self->SUPER::size_allocate ($w, $h, $changed);
641 $self->update; 796 $self->update
797 if $changed;
642} 798}
643 799
644sub _render { 800sub _render {
645 $_[0]{children}[0]->draw; 801 $_[0]{children}[0]->draw;
646} 802}
… …
651 $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 {
652 glClearColor 0, 0, 0, 0; 808 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 809 glClear GL_COLOR_BUFFER_BIT;
654 810
655 $self->_render; 811 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 812 };
664} 813}
665 814
666sub _draw { 815sub _draw {
667 my ($self) = @_; 816 my ($self) = @_;
… …
671 my $tex = $self->{texture} 820 my $tex = $self->{texture}
672 or return; 821 or return;
673 822
674 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 825 glColor 1, 1, 1, 1;
677 826
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 828
680 glDisable GL_TEXTURE_2D; 829 glDisable GL_TEXTURE_2D;
681} 830}
… …
684 833
685package CFClient::UI::ViewPort; 834package CFClient::UI::ViewPort;
686 835
687our @ISA = CFClient::UI::Window::; 836our @ISA = CFClient::UI::Window::;
688 837
838sub new {
839 my $class = shift;
840
841 $class->SUPER::new (
842 scroll_x => 0,
843 scroll_y => 1,
844 @_,
845 )
846}
847
689sub size_request { 848sub size_request {
690 my ($self) = @_; 849 my ($self) = @_;
691 850
692 @$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)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 852
695 @$self{qw(child_w child_h)} 853 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y};
855
856 ($w, $h)
696} 857}
697 858
698sub size_allocate { 859sub size_allocate {
699 my ($self, $w, $h) = @_; 860 my ($self, $w, $h, $changed) = @_;
700 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);
701 $self->update; 866 $self->update;
702} 867}
703 868
704sub set_offset { 869sub set_offset {
705 my ($self, $x, $y) = @_; 870 my ($self, $x, $y) = @_;
… …
756 my $class = shift; 921 my $class = shift;
757 922
758 my $self; 923 my $self;
759 924
760 my $slider = new CFClient::UI::Slider 925 my $slider = new CFClient::UI::Slider
761 vertical => 1, 926 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 927 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 928 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 929 $self->{vp}->set_offset (0, $_[1]);
765 }, 930 },
766 ; 931 ;
767 932
768 $self = $class->SUPER::new ( 933 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 934 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 935 slider => $slider,
771 @_, 936 @_,
772 ); 937 );
773 938
774 $self->{vp}->add ($self->{scrolled}); 939 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp}); 940 $self->add ($self->{vp});
776 $self->add ($self->{slider}); 941 $self->add ($self->{slider});
777 942
778 $self 943 $self
944}
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]);
779} 963}
780 964
781#TODO# update range on size_allocate depending on child 965#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 966# update viewport offset on scroll
783 967
… …
827 1011
828our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
829 1013
830use CFClient::OpenGL; 1014use CFClient::OpenGL;
831 1015
832my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
834 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);
835 1023
836sub new { 1024sub new {
837 my $class = shift; 1025 my $class = shift;
838 1026
839 # TODO: user_x, user_y, overwrite moveto?
840
841 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
842 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
843 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
844 border => 0.6, 1030 border => 0.6,
845 can_events => 1, 1031 can_events => 1,
846 @_ 1032 @_
847 ); 1033 );
848 1034
849 $self->{title} &&= new CFClient::UI::Label 1035 $self->{title} &&= new CFClient::UI::Label
850 align => 0, 1036 align => 0,
… …
869 $h + $self->border * 2, 1055 $h + $self->border * 2,
870 ) 1056 )
871} 1057}
872 1058
873sub size_allocate { 1059sub size_allocate {
874 my ($self, $w, $h) = @_; 1060 my ($self, $w, $h, $changed) = @_;
1061
1062 return unless $changed;
875 1063
876 $h -= List::Util::max 0, $self->border * 2; 1064 $h -= List::Util::max 0, $self->border * 2;
877 $w -= List::Util::max 0, $self->border * 2; 1065 $w -= List::Util::max 0, $self->border * 2;
878 1066
879 $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)
880 if $self->{title}; 1068 if $self->{title};
881 1069
882 $self->child->configure ($self->border, $self->border, $w, $h); 1070 $self->child->configure ($self->border, $self->border, $w, $h);
883} 1071}
884 1072
… …
903 my ($ev, $x, $y) = @_; 1091 my ($ev, $x, $y) = @_;
904 1092
905 my $dx = $ev->{x} - $ox; 1093 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy; 1094 my $dy = $ev->{y} - $oy;
907 1095
908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1098
1099 $self->realloc;
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
911 $self->check_size;
912 }; 1101 };
913 1102
914 } elsif ($lr ^ $td) { 1103 } elsif ($lr ^ $td) {
915 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1104 my ($ox, $oy) = ($ev->{x}, $ev->{y});
916 my ($bx, $by) = ($self->{x}, $self->{y}); 1105 my ($bx, $by) = ($self->{x}, $self->{y});
… …
918 $self->{motion} = sub { 1107 $self->{motion} = sub {
919 my ($ev, $x, $y) = @_; 1108 my ($ev, $x, $y) = @_;
920 1109
921 ($x, $y) = ($ev->{x}, $ev->{y}); 1110 ($x, $y) = ($ev->{x}, $ev->{y});
922 1111
923 $self->move ($bx + $x - $ox, $by + $y - $oy); 1112 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
924 $self->update;
925 }; 1113 };
926 } 1114 }
927} 1115}
928 1116
929sub button_up { 1117sub button_up {
… …
948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
949 1137
950 my $border = $self->border; 1138 my $border = $self->border;
951 1139
952 glColor @{ $self->{border_bg} }; 1140 glColor @{ $self->{border_bg} };
953 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1141 $border[0]->draw_quad_alpha (0, 0, $w, $border);
954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1142 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1143 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1144 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
957 1145
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1146 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
959 my $bg = $tex[0]; 1147 glColor @{ $self->{bg} };
960 1148
961 # TODO: repeat texture not scale 1149 # TODO: repeat texture not scale
1150 # solve this better(?)
962 my $rep_x = $cw / $bg->{w}; 1151 $bg->{s} = $cw / $bg->{w};
963 my $rep_y = $ch / $bg->{h}; 1152 $bg->{t} = $ch / $bg->{h};
964
965 glColor @{ $self->{bg} };
966
967 $bg->{s} = $rep_x;
968 $bg->{t} = $rep_y;
969 $bg->{wrap_mode} = 1;
970 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 } 1154 }
972 1155
973 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
974 1157
… …
990sub new { 1173sub new {
991 my $class = shift; 1174 my $class = shift;
992 1175
993 $class->SUPER::new ( 1176 $class->SUPER::new (
994 col_expand => [], 1177 col_expand => [],
995 @_ 1178 @_,
996 ) 1179 )
1180}
1181
1182sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} }
997} 1184}
998 1185
999sub add { 1186sub add {
1000 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
1001 1188
1002 $child->set_parent ($self); 1189 $child->set_parent ($self);
1003 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
1004 1191
1005 $child->check_size; 1192 $self->realloc;
1006} 1193}
1007 1194
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010}
1011
1012# 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?
1013sub clear { 1196sub clear {
1014 my ($self) = @_; 1197 my ($self) = @_;
1015 1198
1016 my @children = $self->children; 1199 my @children = $self->children;
1017 delete $self->{children}; 1200 delete $self->{children};
… …
1019 for (@children) { 1202 for (@children) {
1020 delete $_->{parent}; 1203 delete $_->{parent};
1021 $_->hide; 1204 $_->hide;
1022 } 1205 }
1023 1206
1024 $self->update; 1207 $self->realloc;
1025} 1208}
1026 1209
1027sub get_wh { 1210sub get_wh {
1028 my ($self) = @_; 1211 my ($self) = @_;
1029 1212
… …
1056 (sum @$hs), 1239 (sum @$hs),
1057 ) 1240 )
1058} 1241}
1059 1242
1060sub size_allocate { 1243sub size_allocate {
1061 my ($self, $w, $h) = @_; 1244 my ($self, $w, $h, $changed) = @_;
1062 1245
1063 my ($ws, $hs) = $self->get_wh; 1246 my ($ws, $hs) = $self->get_wh;
1064 1247
1065 my $req_w = sum @$ws; 1248 my $req_w = (sum @$ws) || 1;
1066 my $req_h = sum @$hs; 1249 my $req_h = (sum @$hs) || 1;
1067 1250
1068 # TODO: nicer code && do row_expand 1251 # TODO: nicer code && do row_expand
1069 my @col_expand = @{$self->{col_expand}}; 1252 my @col_expand = @{$self->{col_expand}};
1070 @col_expand = (1) x @$ws unless @col_expand; 1253 @col_expand = (1) x @$ws unless @col_expand;
1071 my $col_expand = (sum @col_expand) || 1; 1254 my $col_expand = (sum @col_expand) || 1;
… …
1125 } 1308 }
1126} 1309}
1127 1310
1128############################################################################# 1311#############################################################################
1129 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
1130package CFClient::UI::HBox; 1373package CFClient::UI::HBox;
1131 1374
1132# TODO: wrap into common Box base class
1133
1134our @ISA = CFClient::UI::Container::; 1375our @ISA = CFClient::UI::Box::;
1135 1376
1136sub size_request { 1377sub new {
1137 my ($self) = @_; 1378 my $class = shift;
1138 1379
1139 my @alloc = map [$_->size_request], @{$self->{children}}; 1380 $class->SUPER::new (
1140 1381 vertical => 0,
1141 ( 1382 @_,
1142 (List::Util::sum map $_->[0], @alloc),
1143 (List::Util::max map $_->[1], @alloc),
1144 ) 1383 )
1145} 1384}
1146 1385
1147sub size_allocate {
1148 my ($self, $w, $h) = @_;
1149
1150 ($h, $w) = ($w, $h);
1151
1152 my $children = $self->{children};
1153
1154 my @h = map $_->{req_w}, @$children;
1155
1156 my $req_h = List::Util::sum @h;
1157
1158 if ($req_h > $h) {
1159 # ah well, not enough space
1160 $_ *= $h / $req_h for @h;
1161 } else {
1162 my $exp = List::Util::sum map $_->{expand}, @$children;
1163 $exp ||= 1;
1164
1165 for (0 .. $#$children) {
1166 my $child = $children->[$_];
1167
1168 my $alloc_h = $h[$_];
1169 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1170 $h[$_] = $alloc_h;
1171 }
1172 }
1173
1174 CFClient::UI::harmonize \@h;
1175
1176 my $y = 0;
1177 for (0 .. $#$children) {
1178 my $child = $children->[$_];
1179 my $h = $h[$_];
1180 $child->configure ($y, 0, $h, $w);
1181
1182 $y += $h;
1183 }
1184
1185 1
1186}
1187
1188############################################################################# 1386#############################################################################
1189 1387
1190package CFClient::UI::VBox; 1388package CFClient::UI::VBox;
1191 1389
1192# TODO: wrap into common Box base class
1193
1194our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Box::;
1195 1391
1196sub size_request { 1392sub new {
1197 my ($self) = @_; 1393 my $class = shift;
1198 1394
1199 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $class->SUPER::new (
1200 1396 vertical => 1,
1201 ( 1397 @_,
1202 (List::Util::max map $_->[0], @alloc),
1203 (List::Util::sum map $_->[1], @alloc),
1204 ) 1398 )
1205} 1399}
1206 1400
1207sub size_allocate {
1208 my ($self, $w, $h) = @_;
1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1212 my $children = $self->{children};
1213
1214 my @h = map $_->{req_h}, @$children;
1215
1216 my $req_h = List::Util::sum @h;
1217
1218 if ($req_h > $h) {
1219 # ah well, not enough space
1220 $_ *= $h / $req_h for @h;
1221 } else {
1222 my $exp = List::Util::sum map $_->{expand}, @$children;
1223 $exp ||= 1;
1224
1225 for (0 .. $#$children) {
1226 my $child = $children->[$_];
1227
1228 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1229 }
1230 }
1231
1232 CFClient::UI::harmonize \@h;
1233
1234 my $y = 0;
1235 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_];
1238 $child->configure (0, $y, $w, $h);
1239
1240 $y += $h;
1241 }
1242
1243 1
1244}
1245
1246############################################################################# 1401#############################################################################
1247 1402
1248package CFClient::UI::Label; 1403package CFClient::UI::Label;
1249 1404
1250our @ISA = CFClient::UI::Base::; 1405our @ISA = CFClient::UI::DrawBG::;
1251 1406
1252use CFClient::OpenGL; 1407use CFClient::OpenGL;
1253 1408
1254sub new { 1409sub new {
1255 my ($class, %arg) = @_; 1410 my ($class, %arg) = @_;
1256 1411
1257 my $self = $class->SUPER::new ( 1412 my $self = $class->SUPER::new (
1258 fg => [1, 1, 1], 1413 fg => [1, 1, 1],
1414 #bg => none
1415 #active_bg => none
1259 #font => default_font 1416 #font => default_font
1260 #text => initial text 1417 #text => initial text
1261 #markup => initial narkup 1418 #markup => initial narkup
1419 #max_w => maximum pixel width
1420 ellipsise => 3, # end
1262 layout => (new CFClient::Layout), 1421 layout => (new CFClient::Layout),
1263 fontsize => 1, 1422 fontsize => 1,
1264 align => -1, 1423 align => -1,
1265 valign => -1, 1424 valign => -1,
1266 padding => 2, 1425 padding => 2,
… …
1281 } 1440 }
1282 1441
1283 $self 1442 $self
1284} 1443}
1285 1444
1286sub escape { 1445sub escape($) {
1287 local $_ = $_[1]; 1446 local $_ = $_[0];
1288 1447
1289 s/&/&amp;/g; 1448 s/&/&amp;/g;
1290 s/>/&gt;/g; 1449 s/>/&gt;/g;
1291 s/</&lt;/g; 1450 s/</&lt;/g;
1292 1451
1293 $_[1] 1452 $_
1294} 1453}
1295 1454
1296sub update { 1455sub update {
1297 my ($self) = @_; 1456 my ($self) = @_;
1298 1457
… …
1307 $self->{text} = "T$text"; 1466 $self->{text} = "T$text";
1308 1467
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1468 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1310 $self->{layout}->set_text ($text); 1469 $self->{layout}->set_text ($text);
1311 1470
1471 $self->realloc;
1312 $self->update; 1472 $self->update;
1313 $self->check_size;
1314} 1473}
1315 1474
1316sub set_markup { 1475sub set_markup {
1317 my ($self, $markup) = @_; 1476 my ($self, $markup) = @_;
1318 1477
… …
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1481 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323 1482
1324 $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;
1325 $self->{layout}->set_markup ($markup); 1484 $self->{layout}->set_markup ($markup);
1326 1485
1486 $self->realloc;
1327 $self->update; 1487 $self->update;
1328 $self->check_size;
1329} 1488}
1330 1489
1331sub size_request { 1490sub size_request {
1332 my ($self) = @_; 1491 my ($self) = @_;
1333 1492
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1493 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $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});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1498
1338 my ($w, $h) = $self->{layout}->size; 1499 my ($w, $h) = $self->{layout}->size;
1339 1500
1340 if (exists $self->{template}) { 1501 if (exists $self->{template}) {
… …
1352 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1353 ) 1514 )
1354} 1515}
1355 1516
1356sub size_allocate { 1517sub size_allocate {
1357 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1358 1519
1359 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1360} 1522}
1361 1523
1362sub set_fontsize { 1524sub set_fontsize {
1363 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1364 1526
1365 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1366 delete $self->{texture}; 1528 delete $self->{texture};
1367 1529
1368 $self->update; 1530 $self->realloc;
1369 $self->check_size;
1370} 1531}
1371 1532
1372sub _draw { 1533sub _draw {
1373 my ($self) = @_; 1534 my ($self) = @_;
1535
1536 $self->SUPER::_draw; # draw background, if applicable
1374 1537
1375 my $tex = $self->{texture} ||= do { 1538 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 1539 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1540 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $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});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 1545
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1546 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382 1547
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5; 1550 : ($self->{w} - $tex->{w}) * 0.5);
1386 1551
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5; 1554 : ($self->{h} - $tex->{h}) * 0.5);
1390 1555
1391 $tex 1556 $tex
1392 }; 1557 };
1393 1558
1394 glEnable GL_TEXTURE_2D; 1559 glEnable GL_TEXTURE_2D;
… …
1422 active_fg => [0, 0, 0], 1587 active_fg => [0, 0, 0],
1423 can_hover => 1, 1588 can_hover => 1,
1424 can_focus => 1, 1589 can_focus => 1,
1425 valign => 0, 1590 valign => 0,
1426 can_events => 1, 1591 can_events => 1,
1592 #text => ...
1427 @_ 1593 @_
1428 ) 1594 )
1429} 1595}
1430 1596
1431sub _set_text { 1597sub _set_text {
… …
1441 $self->{text} = $text; 1607 $self->{text} = $text;
1442 1608
1443 $text =~ s/./*/g if $self->{hidden}; 1609 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1610 $self->{layout}->set_text ("$text ");
1445 1611
1446 $self->emit (changed => $self->{text}); 1612 $self->_emit (changed => $self->{text});
1447} 1613}
1448 1614
1449sub set_text { 1615sub set_text {
1450 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1451 1617
1452 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 1619 $self->_set_text ($text);
1454 $self->check_size; 1620
1455 $self->update; 1621 $self->realloc;
1456} 1622}
1457 1623
1458sub get_text { 1624sub get_text {
1459 $_[0]{text} 1625 $_[0]{text}
1460} 1626}
… …
1463 my ($self) = @_; 1629 my ($self) = @_;
1464 1630
1465 my ($w, $h) = $self->SUPER::size_request; 1631 my ($w, $h) = $self->SUPER::size_request;
1466 1632
1467 ($w + 1, $h) # add 1 for cursor 1633 ($w + 1, $h) # add 1 for cursor
1468}
1469
1470sub size_allocate {
1471 my ($self, $w, $h) = @_;
1472
1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474} 1634}
1475 1635
1476sub key_down { 1636sub key_down {
1477 my ($self, $ev) = @_; 1637 my ($self, $ev) = @_;
1478 1638
… …
1493 } elsif ($sym == CFClient::SDLK_HOME) { 1653 } elsif ($sym == CFClient::SDLK_HOME) {
1494 $self->{cursor} = 0; 1654 $self->{cursor} = 0;
1495 } elsif ($sym == CFClient::SDLK_END) { 1655 } elsif ($sym == CFClient::SDLK_END) {
1496 $self->{cursor} = length $text; 1656 $self->{cursor} = length $text;
1497 } elsif ($uni == 27) { 1657 } elsif ($uni == 27) {
1498 $self->emit ('escape'); 1658 $self->_emit ('escape');
1499 } elsif ($uni) { 1659 } elsif ($uni) {
1500 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1501 } 1661 }
1502 1662
1503 $self->_set_text ($text); 1663 $self->_set_text ($text);
1504 $self->update; 1664
1665 $self->realloc;
1505} 1666}
1506 1667
1507sub focus_in { 1668sub focus_in {
1508 my ($self) = @_; 1669 my ($self) = @_;
1509 1670
… …
1589 if ($sym == 13) { 1750 if ($sym == 13) {
1590 unshift @{$self->{history}}, 1751 unshift @{$self->{history}},
1591 my $txt = $self->get_text; 1752 my $txt = $self->get_text;
1592 $self->{history_pointer} = -1; 1753 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = ''; 1754 $self->{history_saveback} = '';
1594 $self->emit (activate => $txt); 1755 $self->_emit (activate => $txt);
1595 $self->update; 1756 $self->update;
1596 1757
1597 } elsif ($sym == CFClient::SDLK_UP) { 1758 } elsif ($sym == CFClient::SDLK_UP) {
1598 if ($self->{history_pointer} < 0) { 1759 if ($self->{history_pointer} < 0) {
1599 $self->{history_saveback} = $self->get_text; 1760 $self->{history_saveback} = $self->get_text;
… …
1638 my $class = shift; 1799 my $class = shift;
1639 1800
1640 $class->SUPER::new ( 1801 $class->SUPER::new (
1641 padding => 4, 1802 padding => 4,
1642 fg => [1, 1, 1], 1803 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 1804 active_fg => [0, 0, 1],
1645 can_hover => 1, 1805 can_hover => 1,
1646 align => 0, 1806 align => 0,
1647 valign => 0, 1807 valign => 0,
1648 can_events => 1, 1808 can_events => 1,
1649 @_ 1809 @_
1650 ) 1810 )
1651} 1811}
1652 1812
1813sub activate { }
1814
1653sub button_up { 1815sub button_up {
1654 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1655 1817
1818 $self->emit ("activate")
1656 if ($x >= 0 && $x < $self->{w} 1819 if $x >= 0 && $x < $self->{w}
1657 && $y >= 0 && $y < $self->{h}) { 1820 && $y >= 0 && $y < $self->{h};
1658 $self->emit ("activate");
1659 }
1660} 1821}
1661 1822
1662sub _draw { 1823sub _draw {
1663 my ($self) = @_; 1824 my ($self) = @_;
1664 1825
… …
1696 1857
1697 $class->SUPER::new ( 1858 $class->SUPER::new (
1698 padding => 2, 1859 padding => 2,
1699 fg => [1, 1, 1], 1860 fg => [1, 1, 1],
1700 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],
1701 state => 0, 1864 state => 0,
1702 can_hover => 1, 1865 can_hover => 1,
1703 @_ 1866 @_
1704 ) 1867 )
1705} 1868}
… …
1714 my ($self, $ev, $x, $y) = @_; 1877 my ($self, $ev, $x, $y) = @_;
1715 1878
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718 $self->{state} = !$self->{state}; 1881 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 1882 $self->_emit (changed => $self->{state});
1720 } 1883 }
1721} 1884}
1722 1885
1723sub _draw { 1886sub _draw {
1724 my ($self) = @_; 1887 my ($self) = @_;
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2152 qw(s1_slider.png s1_slider_bg.png);
1990 2153
1991sub new { 2154sub new {
1992 my $class = shift; 2155 my $class = shift;
1993 2156
1994 # range [value, low, high, page] 2157 # range [value, low, high, page, unit]
1995 2158
1996 # TODO: 0-width page 2159 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2160 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2161 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2162 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 2163 fg => [1, 1, 1],
2001 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],
2002 range => [0, 0, 100, 10], 2167 range => [0, 0, 100, 10, 0],
2003 req_w => $::WIDTH / 80, 2168 min_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2169 min_h => $::WIDTH / 80,
2005 vertical => 0, 2170 vertical => 0,
2006 can_hover => 1, 2171 can_hover => 1,
2007 inner_pad => 5, 2172 inner_pad => 0.02,
2008 @_ 2173 @_
2009 ); 2174 );
2010 2175
2176 $self->set_value ($self->{range}[0]);
2177 $self->update;
2178
2011 $self 2179 $self
2012} 2180}
2013 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
2014sub size_request { 2216sub size_request {
2015 my ($self) = @_; 2217 my ($self) = @_;
2016 2218
2017 my $w = $self->{req_w}; 2219 ($self->{req_w}, $self->{req_h})
2018 my $h = $self->{req_h};
2019
2020 $self->{vertical} ? ($h, $w) : ($w, $h)
2021} 2220}
2022 2221
2023sub button_down { 2222sub button_down {
2024 my ($self, $ev, $x, $y) = @_; 2223 my ($self, $ev, $x, $y) = @_;
2025 2224
2026 $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
2027 $self->mouse_motion ($ev, $x, $y); 2229 $self->mouse_motion ($ev, $x, $y);
2028} 2230}
2029 2231
2030sub mouse_motion { 2232sub mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2032 2234
2033 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
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2252 my ($value, $lo, $hi, $page) = @{$self->{range}};
2253 my $range = ($hi - $page - $lo) || 1e-100;
2035 2254
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2255 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037 2256
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2257 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2258 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040 2259
2041 $x -= $inner_pad_px; # substract the padding 2260 $value = ($value - $lo) / $range;
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2261 $value = $value * $self->{scale} + $self->{offset};
2043 $x = $lo if $x < $lo;
2044 $x = $hi - $page if $x > $hi - $page;
2045 $self->{range}[0] = $x;
2046 2262
2047 $self->emit (changed => $x); 2263 $self->{knob_x} = $value - $knob_w * 0.5;
2048 $self->update; 2264 $self->{knob_w} = $knob_w;
2049 } 2265 });
2050}
2051 2266
2052# the inner_* stuff is for generating a padding for the slider handle, 2267 $self->SUPER::update;
2053# so that the handle doesn't leave the texture. This calculation isn't 100%
2054# correct propably, but it does the job for now
2055sub _calc_inner_pad_px {
2056 my ($self, $w) = @_;
2057 ($w / 100) * $self->{inner_pad} # % to pixels
2058} 2268}
2059 2269
2060sub _draw { 2270sub _draw {
2061 my ($self) = @_; 2271 my ($self) = @_;
2062 2272
2063 $self->SUPER::_draw (); 2273 $self->SUPER::_draw ();
2064 2274
2065 my ($w, $h) = @$self{qw(w h)}; 2275 glScale $self->{w}, $self->{h};
2066 2276
2067 if ($self->{vertical}) { 2277 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2278 # draw a vertical slider like a rotated horizontal slider
2069 2279
2280 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 2281 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2282 }
2075 2283
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2284 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2285 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2286
2079 my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081 $hi = $value + 1 if $lo == $hi;
2082
2083 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086 $page = int $page * $inner_w / ($hi - $lo);
2087 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089 $w -= $page;
2090 $page &= ~1;
2091 glTranslate $page * 0.5, 0, 0;
2092 $page ||= 2;
2093
2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097 glEnable GL_TEXTURE_2D; 2287 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2288 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2289
2100 # draw background 2290 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2291 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2292
2103 # draw handle 2293 # draw handle
2104 $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);
2105 2295
2106 glDisable GL_TEXTURE_2D; 2296 glDisable GL_TEXTURE_2D;
2107} 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 (@_) }
2108 2339
2109############################################################################# 2340#############################################################################
2110 2341
2111package CFClient::UI::TextView; 2342package CFClient::UI::TextView;
2112 2343
… …
2142 2373
2143 $self->{fontsize} = $fontsize; 2374 $self->{fontsize} = $fontsize;
2144 $self->reflow; 2375 $self->reflow;
2145} 2376}
2146 2377
2147sub text_height {
2148 my ($self, $text) = @_;
2149
2150 my $layout = $self->{layout};
2151
2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153 $layout->set_width ($self->{children}[0]{w});
2154 $layout->set_markup ($text);
2155
2156 ($layout->size)[1]
2157}
2158
2159sub reflow {
2160 my ($self) = @_;
2161
2162 $self->{need_reflow}++;
2163 $self->update;
2164}
2165
2166sub size_allocate { 2378sub size_allocate {
2167 my ($self, $w, $h) = @_; 2379 my ($self, $w, $h, $changed) = @_;
2168 2380
2169 $self->SUPER::size_allocate ($w, $h); 2381 $self->SUPER::size_allocate ($w, $h, $changed);
2382
2383 return unless $changed;
2170 2384
2171 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2385 $self->{layout}->set_font ($self->{font}) if $self->{font};
2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $self->{layout}->set_width ($self->{children}[0]{w}); 2387 $self->{layout}->set_width ($self->{children}[0]{w});
2174 2388
2175 $self->reflow; 2389 $self->reflow;
2176} 2390}
2177 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
2178sub add_paragraph { 2426sub add_paragraph {
2179 my ($self, $color, $text) = @_; 2427 my ($self, $color, $text, $indent) = @_;
2180 2428
2181 #TODO: intelligently "reformat" paragraph 2429 for my $line (split /\n/, $text) {
2182 2430 my ($w, $h) = $self->text_size ($line);
2183 my $height = $self->text_height ($text);
2184
2185 $self->{height} += $height; 2431 $self->{height} += $h;
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2433 }
2186 2434
2187 push @{$self->{par}}, [$height, $color, $text];
2188
2189 $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]);
2190 $self->{children}[1]->update;
2191} 2436}
2192 2437
2193sub update { 2438sub update {
2194 my ($self) = @_; 2439 my ($self) = @_;
2195 2440
… …
2198 return unless $self->{h} > 0; 2443 return unless $self->{h} > 0;
2199 2444
2200 delete $self->{texture}; 2445 delete $self->{texture};
2201 2446
2202 $ROOT->on_post_alloc ($self, sub { 2447 $ROOT->on_post_alloc ($self, sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449
2203 if (delete $self->{need_reflow}) { 2450 if (delete $self->{need_reflow}) {
2204 my $height = 0; 2451 my $height = 0;
2205 2452
2206 $height += $_->[0] = $self->text_height ($_->[2]) 2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2207 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 }
2208 2468
2209 $self->{height} = $height; 2469 $self->{height} = $height;
2210 2470
2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212 2472
2213 delete $self->{texture}; 2473 delete $self->{texture};
2214 } 2474 }
2215 2475
2216 $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 {
2217 glClearColor 0, 0, 0, 0; 2477 glClearColor 0.5, 0.5, 0.5, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 2478 glClear GL_COLOR_BUFFER_BIT;
2219 2479
2220 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223 my $top = int $self->{children}[1]{range}[0]; 2480 my $top = int $self->{children}[1]{range}[0];
2224 2481
2225 my $y0 = $top; 2482 my $y0 = $top;
2226 my $y1 = $top + $self->{h}; 2483 my $y1 = $top + $H;
2227 2484
2228 my $y = 0; 2485 my $y = 0;
2229 2486
2230 my $layout = $self->{layout}; 2487 my $layout = $self->{layout};
2231 2488
2232 $layout->set_font ($self->{font}) if $self->{font}; 2489 $layout->set_font ($self->{font}) if $self->{font};
2233 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
2234 for my $par (@{$self->{par}}) { 2495 for my $par (@{$self->{par}}) {
2235 my $h = $par->[0]; 2496 my $h = $par->[1];
2236 2497
2237 if ($y0 < $y + $h && $y < $y1) { 2498 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] }); 2499 $layout->set_foreground (@{ $par->[2] });
2500 $layout->set_width ($W - $par->[3]);
2239 $layout->set_markup ($par->[2]); 2501 $layout->set_markup ($par->[4]);
2240 2502
2241 my ($W, $H) = $layout->size; 2503 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242 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;
2243 } 2507 }
2244 2508
2245 $y += $h; 2509 $y += $h;
2246 } 2510 }
2247 2511
2248 glDisable GL_TEXTURE_2D; 2512 glDisable GL_BLEND;
2249 }; 2513 };
2250 }); 2514 });
2251} 2515}
2252 2516
2253sub _draw { 2517sub _draw {
2254 my ($self) = @_; 2518 my ($self) = @_;
2255 2519
2256 glEnable GL_TEXTURE_2D; 2520 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 2522 glColor 1, 1, 1, 1;
2259 $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});
2260 glDisable GL_TEXTURE_2D; 2524 glDisable GL_TEXTURE_2D;
2261 2525
2262 $self->{children}[1]->draw; 2526 $self->{children}[1]->draw;
2263 2527
2264} 2528}
… …
2313 2577
2314sub new { 2578sub new {
2315 my $class = shift; 2579 my $class = shift;
2316 2580
2317 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2318 state => 0, 2582 state => 0,
2319 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2320 @_ 2584 @_
2321 ); 2585 );
2322 2586
2323 if ($self->{state}) {
2324 $self->{state} = 0;
2325 $self->toggle_flopper;
2326 }
2327
2328 $self 2587 $self
2329} 2588}
2330 2589
2331sub toggle_flopper { 2590sub toggle_flopper {
2332 my ($self) = @_; 2591 my ($self) = @_;
2333 2592
2334 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2335 if ($self->{state} = !$self->{state}) {
2336 $CFClient::UI::ROOT->add ($self->{other});
2337 $self->{other}->move ($self->coord2global (0, $self->{h}));
2338 $self->emit ("open");
2339 } else {
2340 $CFClient::UI::ROOT->remove ($self->{other});
2341 $self->emit ("close");
2342 }
2343
2344 $self->emit (changed => $self->{state});
2345} 2594}
2346 2595
2347############################################################################# 2596#############################################################################
2348 2597
2349package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2363 2612
2364sub set_tooltip_from { 2613sub set_tooltip_from {
2365 my ($self, $widget) = @_; 2614 my ($self, $widget) = @_;
2366 2615
2367 $self->add (new CFClient::UI::Label 2616 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip}, 2617 markup => $widget->{tooltip},
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 2619 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 2620 fg => [0, 0, 0, 1],
2621 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 2622 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 2623 );
2374} 2624}
2375 2625
2376sub size_request { 2626sub size_request {
2377 my ($self) = @_; 2627 my ($self) = @_;
… …
2380 2630
2381 ($w + 4, $h + 4) 2631 ($w + 4, $h + 4)
2382} 2632}
2383 2633
2384sub size_allocate { 2634sub size_allocate {
2385 my ($self, $w, $h) = @_; 2635 my ($self, $w, $h, $changed) = @_;
2386 2636
2637 return unless $changed;
2638
2387 $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 });
2388} 2658}
2389 2659
2390sub _draw { 2660sub _draw {
2391 my ($self) = @_; 2661 my ($self) = @_;
2392 2662
… …
2409 glVertex $w, $h; 2679 glVertex $w, $h;
2410 glVertex $w, 0; 2680 glVertex $w, 0;
2411 glEnd; 2681 glEnd;
2412 2682
2413 glTranslate 2 - 0.375, 2 - 0.375; 2683 glTranslate 2 - 0.375, 2 - 0.375;
2684
2414 $self->SUPER::_draw; 2685 $self->SUPER::_draw;
2415} 2686}
2416 2687
2417############################################################################# 2688#############################################################################
2418 2689
… …
2423use CFClient::OpenGL; 2694use CFClient::OpenGL;
2424 2695
2425sub new { 2696sub new {
2426 my $class = shift; 2697 my $class = shift;
2427 2698
2428 $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2429 aspect => 1, 2700 aspect => 1,
2701 can_events => 0,
2430 @_, 2702 @_,
2431 ) 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
2432} 2720}
2433 2721
2434sub size_request { 2722sub size_request {
2435 (32, 8) 2723 (32, 8)
2436} 2724}
2437 2725
2726sub update {
2727 my ($self) = @_;
2728
2729 return unless $self->{visible};
2730
2731 $self->SUPER::update;
2732}
2733
2438sub _draw { 2734sub _draw {
2439 my ($self) = @_; 2735 my ($self) = @_;
2440 2736
2441 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
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2748 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443 2749
2444 # TODO animation
2445 if ($tex) { 2750 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 2751 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 2753 glColor 1, 1, 1, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2754 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 2755 glDisable GL_TEXTURE_2D;
2451 } 2756 }
2452} 2757}
2453 2758
2759sub DESTROY {
2760 my ($self) = @_;
2761
2762 $self->{timer}->cancel
2763 if $self->{timer};
2764
2765 $self->SUPER::DESTROY;
2766}
2767
2454############################################################################# 2768#############################################################################
2455 2769
2456package CFClient::UI::InventoryItem; 2770package CFClient::UI::Inventory;
2457 2771
2458our @ISA = CFClient::UI::HBox::; 2772our @ISA = CFClient::UI::ScrolledWindow::;
2459 2773
2460sub new { 2774sub new {
2461 my $class = shift; 2775 my $class = shift;
2462 2776
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
2473 can_hover => 1, 2778 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_, 2779 @_,
2532 ); 2780 );
2533 2781
2534 $self 2782 $self
2535} 2783}
… …
2545 or ($a->{name} cmp $b->{name}) 2793 or ($a->{name} cmp $b->{name})
2546 } @$items; 2794 } @$items;
2547 2795
2548 $self->{real_items} = \@items; 2796 $self->{real_items} = \@items;
2549 2797
2798 my $row = 0;
2550 for my $item (@items) { 2799 for my $item (@items) {
2551 my $desc = $item->{nrof} < 2 2800 CFClient::Item::update_widgets $item;
2552 ? $item->{name}
2553 : "$item->{nrof} $item->{name_pl}";
2554 2801
2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2802 $self->{scrolled}->add (0, $row, $item->{face_widget});
2556 } 2803 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2804 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2557 2805
2558 $self->{scrolled}->add (@items); 2806 $row++;
2559 2807 }
2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561}
2562
2563sub size_request {
2564 my ($self) = @_;
2565 ($self->{req_w}, $self->{req_h});
2566} 2808}
2567 2809
2568############################################################################# 2810#############################################################################
2569 2811
2570package CFClient::UI::Menu; 2812package CFClient::UI::Menu;
… …
2605 2847
2606# 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)
2607sub popup { 2849sub popup {
2608 my ($self, $ev) = @_; 2850 my ($self, $ev) = @_;
2609 2851
2610 $self->emit ("popdown"); 2852 $self->_emit ("popdown");
2611 2853
2612 # maybe save $GRAB? must be careful about events... 2854 # maybe save $GRAB? must be careful about events...
2613 $GRAB = $self; 2855 $GRAB = $self;
2614 $self->{button} = $ev->{button}; 2856 $self->{button} = $ev->{button};
2615 2857
… …
2630 2872
2631 if ($ev->{button} == $self->{button}) { 2873 if ($ev->{button} == $self->{button}) {
2632 undef $GRAB; 2874 undef $GRAB;
2633 $self->hide; 2875 $self->hide;
2634 2876
2635 $self->emit ("popdown"); 2877 $self->_emit ("popdown");
2636 $self->{hover}[1]->() if $self->{hover}; 2878 $self->{hover}[1]->() if $self->{hover};
2637 } 2879 }
2638} 2880}
2639 2881
2640############################################################################# 2882#############################################################################
2641 2883
2642package CFClient::UI::Statusbox; 2884package CFClient::UI::Statusbox;
2643 2885
2644our @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}
2645 2896
2646sub reorder { 2897sub reorder {
2647 my ($self) = @_; 2898 my ($self) = @_;
2648 my $NOW = time; 2899 my $NOW = time;
2649 2900
… …
2668 ? "<b>$item->{count} ×</b> $item->{text}" 2919 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text}; 2920 : $item->{text};
2670 2921
2671 for ($short) { 2922 for ($short) {
2672 s/^\s+//; 2923 s/^\s+//;
2673 s/\012.*/…/s; 2924 s/\s+/ /g;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 } 2925 }
2677 2926
2678 new CFClient::UI::Label 2927 new CFClient::UI::Label
2679 markup => $short, 2928 markup => $short,
2680 tooltip => $item->{tooltip}, 2929 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP, 2930 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67, 2931 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize}, 2932 fontsize => $item->{fontsize} || $self->{fontsize},
2933 max_w => $::WIDTH * 0.44,
2684 color => $item->{color}, 2934 fg => $item->{fg},
2685 can_events => 1, 2935 can_events => 1,
2686 can_hover => 1 2936 can_hover => 1
2687 }; 2937 };
2688 } 2938 }
2689 2939
… …
2694sub add { 2944sub add {
2695 my ($self, $text, %arg) = @_; 2945 my ($self, $text, %arg) = @_;
2696 2946
2697 $text =~ s/^\s+//; 2947 $text =~ s/^\s+//;
2698 $text =~ s/\s+$//; 2948 $text =~ s/\s+$//;
2949
2950 return unless $text;
2699 2951
2700 my $timeout = time + ((delete $arg{timeout}) || 60); 2952 my $timeout = time + ((delete $arg{timeout}) || 60);
2701 2953
2702 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2954 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703 2955
… …
2715 $self->{item}{$group} = { 2967 $self->{item}{$group} = {
2716 id => ++$self->{id}, 2968 id => ++$self->{id},
2717 text => $text, 2969 text => $text,
2718 timeout => $timeout, 2970 timeout => $timeout,
2719 tooltip => $text, 2971 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8], 2972 fg => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0, 2973 pri => 0,
2723 count => 1, 2974 count => 1,
2724 %arg, 2975 %arg,
2725 }; 2976 };
2726 } 2977 }
2727 2978
2728 $self->reorder; 2979 $self->reorder;
2729} 2980}
2730 2981
2982sub reconfigure {
2983 my ($self) = @_;
2984
2985 delete $_->{label}
2986 for values %{ $self->{item} || {} };
2987
2988 $self->reorder;
2989 $self->SUPER::reconfigure;
2990}
2991
2731############################################################################# 2992#############################################################################
2732 2993
2733package CFClient::UI::Root; 2994package CFClient::UI::Root;
2734 2995
2735our @ISA = CFClient::UI::Container::; 2996our @ISA = CFClient::UI::Container::;
… …
2737use CFClient::OpenGL; 2998use CFClient::OpenGL;
2738 2999
2739sub new { 3000sub new {
2740 my $class = shift; 3001 my $class = shift;
2741 3002
2742 $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
3004 visible => 1,
2743 @_, 3005 @_,
2744 ) 3006 );
3007
3008 Scalar::Util::weaken ($self->{root} = $self);
3009
3010 $self
2745} 3011}
2746 3012
2747sub configure { 3013sub configure {
2748 my ($self, $x, $y, $w, $h) = @_; 3014 my ($self, $x, $y, $w, $h) = @_;
2749 3015
2750 $self->{w} = $w; 3016 $self->{w} = $w;
2751 $self->{h} = $h; 3017 $self->{h} = $h;
2752} 3018}
2753 3019
2754sub check_size { 3020sub reconfigure {
2755 my ($self) = @_; 3021 my ($self) = @_;
2756 3022
3023 $self->SUPER::reconfigure;
3024
2757 $self->size_allocate ($self->{w}, $self->{h}) 3025 $self->size_allocate ($self->{w}, $self->{h}, 1)
2758 if $self->{w}; 3026 if $self->{w};
2759} 3027}
2760 3028
2761sub size_request { 3029sub size_request {
2762 my ($self) = @_; 3030 my ($self) = @_;
2763 3031
2764 ($self->{w}, $self->{h}) 3032 ($self->{w}, $self->{h})
2765} 3033}
2766 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
2767sub size_allocate { 3049sub size_allocate {
2768 my ($self, $w, $h) = @_; 3050 my ($self, $w, $h, $changed) = @_;
2769
2770 my $old_w = $self->{old_w};
2771 my $old_h = $self->{old_h};
2772
2773 if ($old_w && $old_h) {
2774 for my $child ($self->children) {
2775 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783 }
2784 }
2785 3051
2786 for my $child ($self->children) { 3052 for my $child ($self->children) {
2787 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)};
2788 3054
2789 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3055 $X = $child->{force_x} if exists $child->{force_x};
2790 $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
2791 $child->configure ($X, $Y, $W, $H); 3061 $child->configure ($X, $Y, $W, $H);
2792 } 3062 }
2793
2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796} 3063}
2797 3064
2798sub coord2local { 3065sub coord2local {
2799 my ($self, $x, $y) = @_; 3066 my ($self, $x, $y) = @_;
2800 3067
… …
2808} 3075}
2809 3076
2810sub update { 3077sub update {
2811 my ($self) = @_; 3078 my ($self) = @_;
2812 3079
2813 $self->check_size;
2814 $::WANT_REFRESH++; 3080 $::WANT_REFRESH++;
2815} 3081}
2816 3082
2817sub add { 3083sub add {
2818 my ($self, $child) = @_; 3084 my ($self, @children) = @_;
2819 3085
2820 # integerise window positions 3086 $_->{is_toplevel} = 1
2821 $child->{x} = int $child->{x}; 3087 for @children;
2822 $child->{y} = int $child->{y};
2823 3088
2824 $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 }
2825} 3105}
2826 3106
2827sub on_refresh { 3107sub on_refresh {
2828 my ($self, $id, $cb) = @_; 3108 my ($self, $id, $cb) = @_;
2829 3109
… …
2842 while ($self->{refresh_hook}) { 3122 while ($self->{refresh_hook}) {
2843 $_->() 3123 $_->()
2844 for values %{delete $self->{refresh_hook}}; 3124 for values %{delete $self->{refresh_hook}};
2845 } 3125 }
2846 3126
2847 if ($self->{check_size}) { 3127 if ($self->{realloc}) {
2848 my @queue = ([], []); 3128 my @queue;
2849 3129
2850 for (;;) { 3130 while () {
2851 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
2852 # heuristic: check containers last 3132 #TODO use array-of-depth approach
2853 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3133
2854 for values %{delete $self->{check_size}} 3134 @queue = sort { $a->{visible} <=> $b->{visible} }
3135 @queue, values %{delete $self->{realloc}};
2855 } 3136 }
2856 3137
2857 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3138 my $widget = pop @queue || last;
2858 3139
2859 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3140 $widget->{visible} or last; # do not resize invisible widgets
2860 ? @$widget{qw(user_w user_h)} 3141
2861 : $widget->size_request; 3142 my ($w, $h) = $widget->size_request;
2862 3143
2863 if (delete $widget->{force_alloc} 3144 my $min_size = $widget->{is_toplevel} ? 16 : 0;
2864 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3145
2865 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3146 $w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;
2866 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
2867 $widget->{req_w} = $w; 3152 $widget->{req_w} = $w;
2868 $widget->{req_h} = $h; 3153 $widget->{req_h} = $h;
2869 3154
2870 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3155 $self->{size_alloc}{$widget} = [$widget, undef, undef];
2871 3156
2872 $widget->{parent}->check_size 3157 push @queue, $widget->{parent}
2873 if $widget->{parent}; 3158 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
2874 }
2875 } 3159 }
2876 } 3160 }
2877 3161
2878 while ($self->{size_alloc}) { 3162 while (my $size_alloc = delete $self->{size_alloc}) {
2879 for (values %{delete $self->{size_alloc}}) { 3163 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2880 my ($widget, $w, $h) = @$_; 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;
2881 3171
2882 $w = 0 if $w < 0; 3172 $w = 0 if $w < 0;
2883 $h = 0 if $h < 0; 3173 $h = 0 if $h < 0;
2884 3174
3175 $w = int $w + 0.5;
3176 $h = int $h + 0.5;
3177
3178 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3179
2885 $widget->{w} = $w; 3180 $widget->{w} = $w;
2886 $widget->{h} = $h; 3181 $widget->{h} = $h;
2887 $widget->size_allocate ($w, $h); 3182
2888 $widget->emit (size_allocate => $w, $h); 3183 $widget->emit (size_allocate => $w, $h, $changed);
2889 } 3184 }
2890 } 3185 }
2891 3186
2892 while ($self->{post_alloc_hook}) { 3187 while ($self->{post_alloc_hook}) {
2893 $_->() 3188 $_->()
… …
2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2899 glClear GL_COLOR_BUFFER_BIT; 3194 glClear GL_COLOR_BUFFER_BIT;
2900 3195
2901 glMatrixMode GL_PROJECTION; 3196 glMatrixMode GL_PROJECTION;
2902 glLoadIdentity; 3197 glLoadIdentity;
2903 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2904 glMatrixMode GL_MODELVIEW; 3199 glMatrixMode GL_MODELVIEW;
2905 glLoadIdentity; 3200 glLoadIdentity;
2906 3201
2907 $self->_draw; 3202 $self->_draw;
2908} 3203}
… …
2910############################################################################# 3205#############################################################################
2911 3206
2912package CFClient::UI; 3207package CFClient::UI;
2913 3208
2914$ROOT = new CFClient::UI::Root; 3209$ROOT = new CFClient::UI::Root;
2915$TOOLTIP = new CFClient::UI::Tooltip; 3210$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2916 3211
29171 32121
2918 3213

Diff Legend

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