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.192 by root, Tue May 9 22:49:32 2006 UTC vs.
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC

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

Diff Legend

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