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

Diff Legend

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