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.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.256 by root, Tue May 30 01:42:16 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 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
389}
390
391sub check_size {
392 my ($self) = @_;
393
394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395}
396
397sub update {
398 my ($self) = @_;
399
400 $self->{parent}->update
401 if $self->{parent};
402}
403
404sub connect {
405 my ($self, $signal, $cb) = @_;
406
407 push @{ $self->{signal_cb}{$signal} }, $cb;
408}
409
410sub emit {
411 my ($self, $signal, @args) = @_;
412
413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
414}
415
416sub DESTROY { 568sub DESTROY {
417 my ($self) = @_; 569 my ($self) = @_;
418 570
571 delete $WIDGET{$self+0};
419 #$self->deactivate; 572 #$self->deactivate;
420} 573}
421 574
422############################################################################# 575#############################################################################
423 576
… …
432 my $class = shift; 585 my $class = shift;
433 586
434 # range [value, low, high, page] 587 # range [value, low, high, page]
435 588
436 $class->SUPER::new ( 589 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 590 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 591 #active_bg => [1, 1, 1, 0.5],
439 @_ 592 @_
440 ) 593 )
441} 594}
442 595
443sub _draw { 596sub _draw {
444 my ($self) = @_; 597 my ($self) = @_;
445 598
599 my $color = $FOCUS == $self && $self->{active_bg}
600 ? $self->{active_bg}
601 : $self->{bg};
602
603 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 604 my ($w, $h) = @$self{qw(w h)};
447 605
448 glEnable GL_BLEND; 606 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 608 glColor @$color;
451 609
452 glBegin GL_QUADS; 610 glBegin GL_QUADS;
453 glVertex 0 , 0; 611 glVertex 0 , 0;
454 glVertex 0 , $h; 612 glVertex 0 , $h;
455 glVertex $w, $h; 613 glVertex $w, $h;
456 glVertex $w, 0; 614 glVertex $w, 0;
457 glEnd; 615 glEnd;
458 616
459 glDisable GL_BLEND; 617 glDisable GL_BLEND;
618 }
460} 619}
461 620
462############################################################################# 621#############################################################################
463 622
464package CFClient::UI::Empty; 623package CFClient::UI::Empty;
… …
469 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
470 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
471} 630}
472 631
473sub size_request { 632sub size_request {
474 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
475} 636}
476 637
477sub draw { } 638sub draw { }
478 639
479############################################################################# 640#############################################################################
… …
508 $self->{children} = [ 669 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 671 @{$self->{children}}, @widgets
511 ]; 672 ];
512 673
513 $self->check_size; 674 $self->realloc;
514 $self->update;
515} 675}
516 676
517sub children { 677sub children {
518 @{ $_[0]{children} } 678 @{ $_[0]{children} }
519} 679}
… …
524 delete $child->{parent}; 684 delete $child->{parent};
525 $child->hide; 685 $child->hide;
526 686
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 688
529 $self->check_size; 689 $self->realloc;
530 $self->update;
531} 690}
532 691
533sub clear { 692sub clear {
534 my ($self) = @_; 693 my ($self) = @_;
535 694
… …
539 for (@$children) { 698 for (@$children) {
540 delete $_->{parent}; 699 delete $_->{parent};
541 $_->hide; 700 $_->hide;
542 } 701 }
543 702
544 $self->check_size; 703 $self->realloc;
545 $self->update;
546} 704}
547 705
548sub find_widget { 706sub find_widget {
549 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
550 708
… …
603sub size_request { 761sub size_request {
604 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
605} 763}
606 764
607sub size_allocate { 765sub size_allocate {
608 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
609 767
610 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
611} 769}
612 770
613############################################################################# 771#############################################################################
… …
625} 783}
626 784
627sub update { 785sub update {
628 my ($self) = @_; 786 my ($self) = @_;
629 787
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 789 $self->SUPER::update;
632} 790}
633 791
634sub size_allocate { 792sub size_allocate {
635 my ($self, $w, $h) = @_; 793 my ($self, $w, $h, $changed) = @_;
636 794
637 $self->SUPER::size_allocate ($w, $h); 795 $self->SUPER::size_allocate ($w, $h, $changed);
638 $self->update; 796 $self->update
797 if $changed;
639} 798}
640 799
641sub _render { 800sub _render {
642 $_[0]{children}[0]->draw; 801 $_[0]{children}[0]->draw;
643} 802}
… …
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 807 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 808 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 809 glClear GL_COLOR_BUFFER_BIT;
651 810
652 $self->_render; 811 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 812 };
661} 813}
662 814
663sub _draw { 815sub _draw {
664 my ($self) = @_; 816 my ($self) = @_;
… …
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,
1031 is_toplevel => 1,
850 can_events => 1, 1032 can_events => 1,
851 @_ 1033 @_
852 ); 1034 );
853 1035
854 $self->{title} &&= new CFClient::UI::Label 1036 $self->{title} &&= new CFClient::UI::Label
855 align => 0, 1037 align => 0,
… …
874 $h + $self->border * 2, 1056 $h + $self->border * 2,
875 ) 1057 )
876} 1058}
877 1059
878sub size_allocate { 1060sub size_allocate {
879 my ($self, $w, $h) = @_; 1061 my ($self, $w, $h, $changed) = @_;
1062
1063 return unless $changed;
880 1064
881 $h -= List::Util::max 0, $self->border * 2; 1065 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 1066 $w -= List::Util::max 0, $self->border * 2;
883 1067
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1068 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885 if $self->{title}; 1069 if $self->{title};
886 1070
887 $self->child->configure ($self->border, $self->border, $w, $h); 1071 $self->child->configure ($self->border, $self->border, $w, $h);
888} 1072}
889 1073
… …
908 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
909 1093
910 my $dx = $ev->{x} - $ox; 1094 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy; 1095 my $dy = $ev->{y} - $oy;
912 1096
913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1099
1100 $self->realloc;
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
916 $self->check_size;
917 }; 1102 };
918 1103
919 } elsif ($lr ^ $td) { 1104 } elsif ($lr ^ $td) {
920 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1105 my ($ox, $oy) = ($ev->{x}, $ev->{y});
921 my ($bx, $by) = ($self->{x}, $self->{y}); 1106 my ($bx, $by) = ($self->{x}, $self->{y});
… …
923 $self->{motion} = sub { 1108 $self->{motion} = sub {
924 my ($ev, $x, $y) = @_; 1109 my ($ev, $x, $y) = @_;
925 1110
926 ($x, $y) = ($ev->{x}, $ev->{y}); 1111 ($x, $y) = ($ev->{x}, $ev->{y});
927 1112
928 $self->move ($bx + $x - $ox, $by + $y - $oy); 1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
929 $self->update;
930 }; 1114 };
931 } 1115 }
932} 1116}
933 1117
934sub button_up { 1118sub button_up {
… …
947 my ($self) = @_; 1131 my ($self) = @_;
948 1132
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1133 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1134 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 1135
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1136 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1138
957 my $border = $self->border; 1139 my $border = $self->border;
958 1140
959 glColor @{ $self->{border_bg} }; 1141 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1142 $border[0]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1143 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1144 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1145 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1146
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1147 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1148 glColor @{ $self->{bg} };
967 1149
968 # TODO: repeat texture not scale 1150 # TODO: repeat texture not scale
1151 # solve this better(?)
969 my $rep_x = $cw / $bg->{w}; 1152 $bg->{s} = $cw / $bg->{w};
970 my $rep_y = $ch / $bg->{h}; 1153 $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); 1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 }
978 1156
979 glDisable GL_TEXTURE_2D; 1157 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1158
983 $self->{title}->draw if $self->{title}; 1159 $self->{title}->draw if $self->{title};
984 1160
985 $self->child->draw; 1161 $self->child->draw;
986} 1162}
… …
998sub new { 1174sub new {
999 my $class = shift; 1175 my $class = shift;
1000 1176
1001 $class->SUPER::new ( 1177 $class->SUPER::new (
1002 col_expand => [], 1178 col_expand => [],
1003 @_ 1179 @_,
1004 ) 1180 )
1181}
1182
1183sub children {
1184 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1185}
1006 1186
1007sub add { 1187sub add {
1008 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1009 1189
1010 $child->set_parent ($self); 1190 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1012 1192
1013 $child->check_size; 1193 $self->realloc;
1014} 1194}
1015 1195
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
1020# TODO: move to container class maybe? send childs a signal on removal? 1196# TODO: move to container class maybe? send children a signal on removal?
1021sub clear { 1197sub clear {
1022 my ($self) = @_; 1198 my ($self) = @_;
1023 1199
1024 my @children = $self->children; 1200 my @children = $self->children;
1025 delete $self->{children}; 1201 delete $self->{children};
… …
1027 for (@children) { 1203 for (@children) {
1028 delete $_->{parent}; 1204 delete $_->{parent};
1029 $_->hide; 1205 $_->hide;
1030 } 1206 }
1031 1207
1032 $self->update; 1208 $self->realloc;
1033} 1209}
1034 1210
1035sub get_wh { 1211sub get_wh {
1036 my ($self) = @_; 1212 my ($self) = @_;
1037 1213
… …
1064 (sum @$hs), 1240 (sum @$hs),
1065 ) 1241 )
1066} 1242}
1067 1243
1068sub size_allocate { 1244sub size_allocate {
1069 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1070 1246
1071 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1072 1248
1073 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
1075 1251
1076 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1133 } 1309 }
1134} 1310}
1135 1311
1136############################################################################# 1312#############################################################################
1137 1313
1314package CFClient::UI::Box;
1315
1316our @ISA = CFClient::UI::Container::;
1317
1318sub size_request {
1319 my ($self) = @_;
1320
1321 $self->{vertical}
1322 ? (
1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1325 )
1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1330}
1331
1332sub size_allocate {
1333 my ($self, $w, $h, $changed) = @_;
1334
1335 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children};
1337
1338 my @req;
1339
1340 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children;
1342 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1344 my $req = List::Util::sum @req;
1345
1346 if ($req > $space) {
1347 # ah well, not enough space
1348 $_ *= $space / $req for @req;
1349 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1355 for 0 .. $#$children;
1356 }
1357 }
1358
1359 CFClient::UI::harmonize \@req;
1360
1361 my $pos = 0;
1362 for (0 .. $#$children) {
1363 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365
1366 $pos += $alloc;
1367 }
1368
1369 1
1370}
1371
1372#############################################################################
1373
1138package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1139 1375
1140# TODO: wrap into common Box base class
1141
1142our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1143 1377
1144sub size_request { 1378sub new {
1145 my ($self) = @_; 1379 my $class = shift;
1146 1380
1147 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1148 1382 vertical => 0,
1149 ( 1383 @_,
1150 (List::Util::sum map $_->[0], @alloc),
1151 (List::Util::max map $_->[1], @alloc),
1152 ) 1384 )
1153} 1385}
1154 1386
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############################################################################# 1387#############################################################################
1197 1388
1198package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1199 1390
1200# TODO: wrap into common Box base class
1201
1202our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1203 1392
1204sub size_request { 1393sub new {
1205 my ($self) = @_; 1394 my $class = shift;
1206 1395
1207 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1208 1397 vertical => 1,
1209 ( 1398 @_,
1210 (List::Util::max map $_->[0], @alloc),
1211 (List::Util::sum map $_->[1], @alloc),
1212 ) 1399 )
1213} 1400}
1214 1401
1215sub size_allocate {
1216 my ($self, $w, $h) = @_;
1217
1218 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1219
1220 my $children = $self->{children};
1221
1222 my @h = map $_->{req_h}, @$children;
1223
1224 my $req_h = List::Util::sum @h;
1225
1226 if ($req_h > $h) {
1227 # ah well, not enough space
1228 $_ *= $h / $req_h for @h;
1229 } else {
1230 my $exp = List::Util::sum map $_->{expand}, @$children;
1231 $exp ||= 1;
1232
1233 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235
1236 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1237 }
1238 }
1239
1240 CFClient::UI::harmonize \@h;
1241
1242 my $y = 0;
1243 for (0 .. $#$children) {
1244 my $child = $children->[$_];
1245 my $h = $h[$_];
1246 $child->configure (0, $y, $w, $h);
1247
1248 $y += $h;
1249 }
1250
1251 1
1252}
1253
1254############################################################################# 1402#############################################################################
1255 1403
1256package CFClient::UI::Label; 1404package CFClient::UI::Label;
1257 1405
1258our @ISA = CFClient::UI::Base::; 1406our @ISA = CFClient::UI::DrawBG::;
1259 1407
1260use CFClient::OpenGL; 1408use CFClient::OpenGL;
1261 1409
1262sub new { 1410sub new {
1263 my ($class, %arg) = @_; 1411 my ($class, %arg) = @_;
1264 1412
1265 my $self = $class->SUPER::new ( 1413 my $self = $class->SUPER::new (
1266 fg => [1, 1, 1], 1414 fg => [1, 1, 1],
1415 #bg => none
1416 #active_bg => none
1267 #font => default_font 1417 #font => default_font
1418 #text => initial text
1419 #markup => initial narkup
1420 #max_w => maximum pixel width
1421 ellipsise => 3, # end
1422 layout => (new CFClient::Layout),
1268 fontsize => 1, 1423 fontsize => 1,
1269 text => "",
1270 align => -1, 1424 align => -1,
1271 valign => -1, 1425 valign => -1,
1272 padding => 2, 1426 padding => 2,
1273 layout => new CFClient::Layout,
1274 can_events => 0, 1427 can_events => 0,
1275 %arg 1428 %arg
1276 ); 1429 );
1277 1430
1278 if (exists $self->{template}) { 1431 if (exists $self->{template}) {
1279 my $layout = new CFClient::Layout; 1432 my $layout = new CFClient::Layout;
1280 $layout->set_text (delete $self->{template}); 1433 $layout->set_text (delete $self->{template});
1281 $self->{template} = $layout; 1434 $self->{template} = $layout;
1282 } 1435 }
1283 1436
1284 $self->set_text (delete $self->{text}) if exists $self->{text}; 1437 if (exists $self->{markup}) {
1285 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1438 $self->set_markup (delete $self->{markup});
1439 } else {
1440 $self->set_text (delete $self->{text});
1441 }
1286 1442
1287 $self 1443 $self
1288} 1444}
1289 1445
1290sub escape { 1446sub escape($) {
1291 local $_ = $_[1]; 1447 local $_ = $_[0];
1292 1448
1293 s/&/&amp;/g; 1449 s/&/&amp;/g;
1294 s/>/&gt;/g; 1450 s/>/&gt;/g;
1295 s/</&lt;/g; 1451 s/</&lt;/g;
1296 1452
1297 $_[1] 1453 $_
1298} 1454}
1299 1455
1300sub update { 1456sub update {
1301 my ($self) = @_; 1457 my ($self) = @_;
1302 1458
… …
1308 my ($self, $text) = @_; 1464 my ($self, $text) = @_;
1309 1465
1310 return if $self->{text} eq "T$text"; 1466 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1312 1468
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1314 1471
1472 $self->realloc;
1315 $self->update; 1473 $self->update;
1316 $self->check_size;
1317} 1474}
1318 1475
1319sub set_markup { 1476sub set_markup {
1320 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1321 1478
1322 return if $self->{text} eq "M$markup"; 1479 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup"; 1480 $self->{text} = "M$markup";
1324 1481
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1326 1486
1487 $self->realloc;
1327 $self->update; 1488 $self->update;
1328 $self->check_size;
1329} 1489}
1330 1490
1331sub size_request { 1491sub size_request {
1332 my ($self) = @_; 1492 my ($self) = @_;
1333 1493
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1494 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1495 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1499
1338 my ($w, $h) = $self->{layout}->size; 1500 my ($w, $h) = $self->{layout}->size;
1339 1501
1340 if (exists $self->{template}) { 1502 if (exists $self->{template}) {
… …
1352 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1353 ) 1515 )
1354} 1516}
1355 1517
1356sub size_allocate { 1518sub size_allocate {
1357 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1358 1520
1359 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1360} 1523}
1361 1524
1362sub set_fontsize { 1525sub set_fontsize {
1363 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1364 1527
1365 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1366 delete $self->{texture}; 1529 delete $self->{texture};
1367 1530
1368 $self->update; 1531 $self->realloc;
1369 $self->check_size;
1370} 1532}
1371 1533
1372sub _draw { 1534sub _draw {
1373 my ($self) = @_; 1535 my ($self) = @_;
1374 1536
1537 $self->SUPER::_draw; # draw background, if applicable
1538
1375 my $tex = $self->{texture} ||= do { 1539 my $tex = $self->{texture} ||= do {
1540 $self->{layout}->set_foreground (@{$self->{fg}});
1376 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1541 $self->{layout}->set_font ($self->{font}) if $self->{font};
1377 $self->{layout}->set_width ($self->{w}); 1542 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1378 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546
1379 new_from_layout CFClient::Texture $self->{layout} 1547 my $tex = new_from_layout CFClient::Texture $self->{layout};
1548
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1551 : ($self->{w} - $tex->{w}) * 0.5);
1552
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1555 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1380 }; 1558 };
1381 1559
1382 glEnable GL_BLEND;
1383 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384 glEnable GL_TEXTURE_2D; 1560 glEnable GL_TEXTURE_2D;
1385 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386 1562
1563 if ($tex->{format} == GL_ALPHA) {
1387 glColor @{$self->{fg}}; 1564 glColor @{$self->{fg}};
1388
1389 $self->{ox} = int (
1390 $self->{align} < 0 ? $self->{padding}
1391 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1392 : ($self->{w} - $tex->{w}) * 0.5
1393 );
1394
1395 $self->{oy} = int (
1396 $self->{valign} < 0 ? $self->{padding}
1397 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1398 : ($self->{h} - $tex->{h}) * 0.5
1399 );
1400
1401 $tex->draw_quad ($self->{ox}, $self->{oy}); 1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 }
1402 1569
1403 glDisable GL_TEXTURE_2D; 1570 glDisable GL_TEXTURE_2D;
1404 glDisable GL_BLEND;
1405} 1571}
1406 1572
1407############################################################################# 1573#############################################################################
1408 1574
1409package CFClient::UI::EntryBase; 1575package CFClient::UI::EntryBase;
… …
1422 active_fg => [0, 0, 0], 1588 active_fg => [0, 0, 0],
1423 can_hover => 1, 1589 can_hover => 1,
1424 can_focus => 1, 1590 can_focus => 1,
1425 valign => 0, 1591 valign => 0,
1426 can_events => 1, 1592 can_events => 1,
1593 #text => ...
1427 @_ 1594 @_
1428 ) 1595 )
1429} 1596}
1430 1597
1431sub _set_text { 1598sub _set_text {
… …
1441 $self->{text} = $text; 1608 $self->{text} = $text;
1442 1609
1443 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1445 1612
1446 $self->emit (changed => $self->{text}); 1613 $self->_emit (changed => $self->{text});
1614}
1615
1616sub set_text {
1617 my ($self, $text) = @_;
1618
1619 $self->{cursor} = length $text;
1620 $self->_set_text ($text);
1621
1622 $self->realloc;
1447} 1623}
1448 1624
1449sub get_text { 1625sub get_text {
1450 $_[0]{text} 1626 $_[0]{text}
1451} 1627}
… …
1454 my ($self) = @_; 1630 my ($self) = @_;
1455 1631
1456 my ($w, $h) = $self->SUPER::size_request; 1632 my ($w, $h) = $self->SUPER::size_request;
1457 1633
1458 ($w + 1, $h) # add 1 for cursor 1634 ($w + 1, $h) # add 1 for cursor
1459}
1460
1461sub size_allocate {
1462 my ($self, $w, $h) = @_;
1463
1464 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1465}
1466
1467sub set_text {
1468 my ($self, $text) = @_;
1469
1470 $self->{cursor} = length $text;
1471 $self->_set_text ($text);
1472 $self->update;
1473} 1635}
1474 1636
1475sub key_down { 1637sub key_down {
1476 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1477 1639
… …
1479 my $sym = $ev->{sym}; 1641 my $sym = $ev->{sym};
1480 my $uni = $ev->{unicode}; 1642 my $uni = $ev->{unicode};
1481 1643
1482 my $text = $self->get_text; 1644 my $text = $self->get_text;
1483 1645
1484 if ($sym == 8) { 1646 if ($uni == 8) {
1485 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1647 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486 } elsif ($sym == 127) { 1648 } elsif ($uni == 127) {
1487 substr $text, $self->{cursor}, 1, ""; 1649 substr $text, $self->{cursor}, 1, "";
1488 } elsif ($sym == CFClient::SDLK_LEFT) { 1650 } elsif ($sym == CFClient::SDLK_LEFT) {
1489 --$self->{cursor} if $self->{cursor}; 1651 --$self->{cursor} if $self->{cursor};
1490 } elsif ($sym == CFClient::SDLK_RIGHT) { 1652 } elsif ($sym == CFClient::SDLK_RIGHT) {
1491 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1653 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1492 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1493 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1494 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1495 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1496 } elsif ($sym == 27) { 1658 } elsif ($uni == 27) {
1497 $self->emit ('escape'); 1659 $self->_emit ('escape');
1498 } elsif ($uni) { 1660 } elsif ($uni) {
1499 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1500 } 1662 }
1501 1663
1502 $self->_set_text ($text); 1664 $self->_set_text ($text);
1503 $self->update; 1665
1666 $self->realloc;
1504} 1667}
1505 1668
1506sub focus_in { 1669sub focus_in {
1507 my ($self) = @_; 1670 my ($self) = @_;
1508 1671
… …
1588 if ($sym == 13) { 1751 if ($sym == 13) {
1589 unshift @{$self->{history}}, 1752 unshift @{$self->{history}},
1590 my $txt = $self->get_text; 1753 my $txt = $self->get_text;
1591 $self->{history_pointer} = -1; 1754 $self->{history_pointer} = -1;
1592 $self->{history_saveback} = ''; 1755 $self->{history_saveback} = '';
1593 $self->emit (activate => $txt); 1756 $self->_emit (activate => $txt);
1594 $self->update; 1757 $self->update;
1595 1758
1596 } elsif ($sym == CFClient::SDLK_UP) { 1759 } elsif ($sym == CFClient::SDLK_UP) {
1597 if ($self->{history_pointer} < 0) { 1760 if ($self->{history_pointer} < 0) {
1598 $self->{history_saveback} = $self->get_text; 1761 $self->{history_saveback} = $self->get_text;
… …
1637 my $class = shift; 1800 my $class = shift;
1638 1801
1639 $class->SUPER::new ( 1802 $class->SUPER::new (
1640 padding => 4, 1803 padding => 4,
1641 fg => [1, 1, 1], 1804 fg => [1, 1, 1],
1642 bg => [1, 1, 1, 0.2],
1643 active_fg => [0, 0, 1], 1805 active_fg => [0, 0, 1],
1644 can_hover => 1, 1806 can_hover => 1,
1645 align => 0, 1807 align => 0,
1646 valign => 0, 1808 valign => 0,
1647 can_events => 1, 1809 can_events => 1,
1648 @_ 1810 @_
1649 ) 1811 )
1650} 1812}
1651 1813
1814sub activate { }
1815
1652sub button_up { 1816sub button_up {
1653 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1654 1818
1819 $self->emit ("activate")
1655 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1656 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1657 $self->emit ("activate");
1658 }
1659} 1822}
1660 1823
1661sub _draw { 1824sub _draw {
1662 my ($self) = @_; 1825 my ($self) = @_;
1663 1826
… …
1665 1828
1666 if ($GRAB == $self) { 1829 if ($GRAB == $self) {
1667 $self->{fg} = $self->{active_fg}; 1830 $self->{fg} = $self->{active_fg};
1668 } 1831 }
1669 1832
1670 glEnable GL_BLEND;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672 glEnable GL_TEXTURE_2D; 1833 glEnable GL_TEXTURE_2D;
1673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674 glColor 0, 0, 0, 1; 1835 glColor 0, 0, 0, 1;
1675 1836
1676 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1837 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677 1838
1678 glDisable GL_TEXTURE_2D; 1839 glDisable GL_TEXTURE_2D;
1679 glDisable GL_BLEND;
1680 1840
1681 $self->SUPER::_draw; 1841 $self->SUPER::_draw;
1682} 1842}
1683 1843
1684############################################################################# 1844#############################################################################
… …
1698 1858
1699 $class->SUPER::new ( 1859 $class->SUPER::new (
1700 padding => 2, 1860 padding => 2,
1701 fg => [1, 1, 1], 1861 fg => [1, 1, 1],
1702 active_fg => [1, 1, 0], 1862 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5],
1703 state => 0, 1865 state => 0,
1704 can_hover => 1, 1866 can_hover => 1,
1705 @_ 1867 @_
1706 ) 1868 )
1707} 1869}
… …
1716 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1717 1879
1718 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1719 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1720 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1721 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1722 } 1884 }
1723} 1885}
1724 1886
1725sub _draw { 1887sub _draw {
1726 my ($self) = @_; 1888 my ($self) = @_;
… …
1731 1893
1732 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1733 1895
1734 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735 1897
1736 glEnable GL_BLEND; 1898 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899
1737 glEnable GL_TEXTURE_2D; 1900 glEnable GL_TEXTURE_2D;
1738 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1739
1740 my $tex = $self->{state} ? $tex[1] : $tex[0];
1741
1742 $tex->draw_quad (0, 0, $s, $s); 1901 $tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744 glDisable GL_TEXTURE_2D; 1902 glDisable GL_TEXTURE_2D;
1745 glDisable GL_BLEND;
1746} 1903}
1747 1904
1748############################################################################# 1905#############################################################################
1749 1906
1750package CFClient::UI::Image; 1907package CFClient::UI::Image;
… …
1793 glTranslate 0, -$self->{w}, 0; 1950 glTranslate 0, -$self->{w}, 0;
1794 1951
1795 ($w, $h) = ($h, $w); 1952 ($w, $h) = ($h, $w);
1796 } 1953 }
1797 1954
1798 glEnable GL_BLEND;
1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800 glEnable GL_TEXTURE_2D; 1955 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 1957
1803 $tex->draw_quad (0, 0, $w, $h); 1958 $tex->draw_quad_alpha (0, 0, $w, $h);
1804 1959
1805 glDisable GL_BLEND;
1806 glDisable GL_TEXTURE_2D; 1960 glDisable GL_TEXTURE_2D;
1807} 1961}
1808 1962
1809############################################################################# 1963#############################################################################
1810 1964
… …
1999 qw(s1_slider.png s1_slider_bg.png); 2153 qw(s1_slider.png s1_slider_bg.png);
2000 2154
2001sub new { 2155sub new {
2002 my $class = shift; 2156 my $class = shift;
2003 2157
2004 # range [value, low, high, page] 2158 # range [value, low, high, page, unit]
2005 2159
2006 # TODO: 0-width page 2160 # TODO: 0-width page
2007 # TODO: req_w/h are wrong with vertical 2161 # TODO: req_w/h are wrong with vertical
2008 # TODO: calculations are off 2162 # TODO: calculations are off
2009 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
2010 fg => [1, 1, 1], 2164 fg => [1, 1, 1],
2011 active_fg => [0, 0, 0], 2165 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5],
2012 range => [0, 0, 100, 10], 2168 range => [0, 0, 100, 10, 0],
2013 req_w => $::WIDTH / 80, 2169 req_w => $::WIDTH / 80,
2014 req_h => $::WIDTH / 80, 2170 req_h => $::WIDTH / 80,
2015 vertical => 0, 2171 vertical => 0,
2016 can_hover => 1, 2172 can_hover => 1,
2017 inner_pad => 5, 2173 inner_pad => 0.02,
2018 @_ 2174 @_
2019 ); 2175 );
2020 2176
2177 $self->set_value ($self->{range}[0]);
2178 $self->update;
2179
2021 $self 2180 $self
2181}
2182
2183sub changed { }
2184
2185sub set_range {
2186 my ($self, $range) = @_;
2187
2188 ($range, $self->{range}) = ($self->{range}, $range);
2189
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}";
2192}
2193
2194sub set_value {
2195 my ($self, $value) = @_;
2196
2197 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2198
2199 $hi = $lo + 1 if $hi <= $lo;
2200
2201 $page = $hi - $lo if $page > $hi - $lo;
2202
2203 $value = $lo if $value < $lo;
2204 $value = $hi - $page if $value > $hi - $page;
2205
2206 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2207 if $unit;
2208
2209 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2210
2211 if ($value != $old_value) {
2212 $self->_emit (changed => $value);
2213 $self->update;
2214 }
2022} 2215}
2023 2216
2024sub size_request { 2217sub size_request {
2025 my ($self) = @_; 2218 my ($self) = @_;
2026 2219
… …
2032 2225
2033sub button_down { 2226sub button_down {
2034 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
2035 2228
2036 $self->SUPER::button_down ($ev, $x, $y); 2229 $self->SUPER::button_down ($ev, $x, $y);
2230
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232
2037 $self->mouse_motion ($ev, $x, $y); 2233 $self->mouse_motion ($ev, $x, $y);
2038} 2234}
2039 2235
2040sub mouse_motion { 2236sub mouse_motion {
2041 my ($self, $ev, $x, $y) = @_; 2237 my ($self, $ev, $x, $y) = @_;
2042 2238
2043 if ($GRAB == $self) { 2239 if ($GRAB == $self) {
2240 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2241
2242 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245
2246 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2247 }
2248}
2249
2250sub update {
2251 my ($self) = @_;
2252
2253 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2254 $self->set_value ($self->{range}[0]);
2255
2044 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2256 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100;
2045 2258
2046 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2259 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2047 2260
2048 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2261 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2049 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2262 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2050 2263
2051 $x -= $inner_pad_px; # substract the padding 2264 $value = ($value - $lo) / $range;
2052 $x = $x * ($hi - $lo) / $inner_w + $lo; 2265 $value = $value * $self->{scale} + $self->{offset};
2053 $x = $lo if $x < $lo;
2054 $x = $hi - $page if $x > $hi - $page;
2055 $self->{range}[0] = $x;
2056 2266
2057 $self->emit (changed => $x); 2267 $self->{knob_x} = $value - $knob_w * 0.5;
2058 $self->update; 2268 $self->{knob_w} = $knob_w;
2059 } 2269 });
2060}
2061 2270
2062# the inner_* stuff is for generating a padding for the slider handle, 2271 $self->SUPER::update;
2063# so that the handle doesn't leave the texture. This calculation isn't 100%
2064# correct propably, but it does the job for now
2065sub _calc_inner_pad_px {
2066 my ($self, $w) = @_;
2067 ($w / 100) * $self->{inner_pad} # % to pixels
2068} 2272}
2069 2273
2070sub _draw { 2274sub _draw {
2071 my ($self) = @_; 2275 my ($self) = @_;
2072 2276
2073 $self->SUPER::_draw (); 2277 $self->SUPER::_draw ();
2074 2278
2075 my ($w, $h) = @$self{qw(w h)}; 2279 glScale $self->{w}, $self->{h};
2076 2280
2077 if ($self->{vertical}) { 2281 if ($self->{vertical}) {
2078 # draw a vertical slider like a rotated horizontal slider 2282 # draw a vertical slider like a rotated horizontal slider
2079 2283
2284 glTranslate 1, 0, 0;
2080 glRotate 90, 0, 0, 1; 2285 glRotate 90, 0, 0, 1;
2081 glTranslate 0, -$self->{w}, 0;
2082
2083 ($w, $h) = ($h, $w);
2084 } 2286 }
2085 2287
2086 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2288 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2289 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088 2290
2089 my ($value, $lo, $hi, $page) = @{$self->{range}};
2090
2091 $hi = $value + 1 if $lo == $hi;
2092
2093 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2094 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2095
2096 $page = int $page * $inner_w / ($hi - $lo);
2097 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2098
2099 $w -= $page;
2100 $page &= ~1;
2101 glTranslate $page * 0.5, 0, 0;
2102 $page ||= 2;
2103
2104 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2105 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2106
2107 glEnable GL_BLEND;
2108 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2109 glEnable GL_TEXTURE_2D; 2291 glEnable GL_TEXTURE_2D;
2110 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111 2293
2112 # draw background 2294 # draw background
2113 $tex[1]->draw_quad (0, 0, $w, $h); 2295 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114 2296
2115 # draw handle 2297 # draw handle
2116 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2298 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2117 2299
2118 glDisable GL_BLEND;
2119 glDisable GL_TEXTURE_2D; 2300 glDisable GL_TEXTURE_2D;
2120} 2301}
2302
2303#############################################################################
2304
2305package CFClient::UI::ValSlider;
2306
2307our @ISA = CFClient::UI::HBox::;
2308
2309sub new {
2310 my ($class, %arg) = @_;
2311
2312 my $range = delete $arg{range};
2313
2314 my $self = $class->SUPER::new (
2315 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2316 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2317 to_value => sub { shift },
2318 from_value => sub { shift },
2319 %arg,
2320 );
2321
2322 $self->{slider}->connect (changed => sub {
2323 my ($self, $value) = @_;
2324 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2325 $self->{parent}->emit (changed => $value);
2326 });
2327
2328# $self->{entry}->connect (changed => sub {
2329# my ($self, $value) = @_;
2330# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2331# $self->{parent}->emit (changed => $value);
2332# });
2333
2334 $self->add ($self->{slider}, $self->{entry});
2335
2336 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2337
2338 $self
2339}
2340
2341sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) }
2121 2343
2122############################################################################# 2344#############################################################################
2123 2345
2124package CFClient::UI::TextView; 2346package CFClient::UI::TextView;
2125 2347
… …
2134 fontsize => 1, 2356 fontsize => 1,
2135 can_events => 0, 2357 can_events => 0,
2136 #font => default_font 2358 #font => default_font
2137 @_, 2359 @_,
2138 2360
2139 layout => (new CFClient::Layout), 2361 layout => (new CFClient::Layout 1),
2140 par => [], 2362 par => [],
2141 height => 0, 2363 height => 0,
2142 children => [ 2364 children => [
2143 (new CFClient::UI::Empty expand => 1), 2365 (new CFClient::UI::Empty expand => 1),
2144 (new CFClient::UI::Slider vertical => 1), 2366 (new CFClient::UI::Slider vertical => 1),
… …
2155 2377
2156 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2157 $self->reflow; 2379 $self->reflow;
2158} 2380}
2159 2381
2160sub text_height {
2161 my ($self, $text) = @_;
2162
2163 my $layout = $self->{layout};
2164
2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166 $layout->set_width ($self->{children}[0]{w});
2167 $layout->set_text ($text);
2168
2169 ($layout->size)[1]
2170}
2171
2172sub reflow {
2173 my ($self) = @_;
2174
2175 $self->{need_reflow}++;
2176 $self->update;
2177}
2178
2179sub size_allocate { 2382sub size_allocate {
2180 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2181 2384
2182 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2183 2388
2184 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2185 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2186 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2187 2392
2188 $self->reflow; 2393 $self->reflow;
2189} 2394}
2190 2395
2396sub text_size {
2397 my ($self, $text, $indent) = @_;
2398
2399 my $layout = $self->{layout};
2400
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $layout->set_width ($self->{children}[0]{w} - $indent);
2403 $layout->set_markup ($text);
2404
2405 $layout->size
2406}
2407
2408sub reflow {
2409 my ($self) = @_;
2410
2411 $self->{need_reflow}++;
2412 $self->update;
2413}
2414
2415sub set_offset {
2416 my ($self, $offset) = @_;
2417
2418 # todo: base offset on lines or so, not on pixels
2419 $self->{children}[1]->set_value ($offset);
2420}
2421
2422sub clear {
2423 my ($self) = @_;
2424
2425 $self->{par} = [];
2426 $self->{height} = 0;
2427 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2428}
2429
2191sub add_paragraph { 2430sub add_paragraph {
2192 my ($self, $color, $text) = @_; 2431 my ($self, $color, $text, $indent) = @_;
2193 2432
2194 #TODO: intelligently "reformat" paragraph 2433 for my $line (split /\n/, $text) {
2195 2434 my ($w, $h) = $self->text_size ($line);
2196 my $height = $self->text_height ($text);
2197
2198 $self->{height} += $height; 2435 $self->{height} += $h;
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2437 }
2199 2438
2200 push @{$self->{par}}, [$height, $color, $text];
2201
2202 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2439 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2203 $self->{children}[1]->update;
2204} 2440}
2205 2441
2206sub update { 2442sub update {
2207 my ($self) = @_; 2443 my ($self) = @_;
2208 2444
… …
2210 2446
2211 return unless $self->{h} > 0; 2447 return unless $self->{h} > 0;
2212 2448
2213 delete $self->{texture}; 2449 delete $self->{texture};
2214 2450
2215 $ROOT->on_refresh ($self, sub { 2451 $ROOT->on_post_alloc ($self, sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453
2216 if (delete $self->{need_reflow}) { 2454 if (delete $self->{need_reflow}) {
2217 my $height = 0; 2455 my $height = 0;
2218 2456
2219 $height += $_->[0] = $self->text_height ($_->[2]) 2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2220 for @{$self->{par}}; 2461 for (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2463 $layout->set_width ($W - $_->[3]);
2464 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3];
2467 $_->[1] = $h;
2468 }
2469
2470 $height += $_->[1];
2471 }
2221 2472
2222 $self->{height} = $height; 2473 $self->{height} = $height;
2223 2474
2224 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2225 2476
2226 delete $self->{texture}; 2477 delete $self->{texture};
2227 } 2478 }
2228 2479
2229 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2230 glClearColor 0, 0, 0, 0; 2481 glClearColor 0.5, 0.5, 0.5, 0;
2231 glClear GL_COLOR_BUFFER_BIT; 2482 glClear GL_COLOR_BUFFER_BIT;
2232 2483
2484 my $top = int $self->{children}[1]{range}[0];
2485
2486 my $y0 = $top;
2487 my $y1 = $top + $H;
2488
2489 my $y = 0;
2490
2491 my $layout = $self->{layout};
2492
2493 $layout->set_font ($self->{font}) if $self->{font};
2494
2233 glEnable GL_BLEND; 2495 glEnable GL_BLEND;
2496 #TODO# not correct in windows where rgba is forced off
2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2497 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2235 glEnable GL_TEXTURE_2D;
2236 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237
2238 my $top = int $self->{children}[1]{range}[0];
2239
2240 my $y0 = $top;
2241 my $y1 = $top + $self->{h};
2242
2243 my $y = 0;
2244
2245 my $layout = $self->{layout};
2246
2247 $layout->set_font ($self->{font}) if $self->{font};
2248 2498
2249 for my $par (@{$self->{par}}) { 2499 for my $par (@{$self->{par}}) {
2250 my $h = $par->[0]; 2500 my $h = $par->[1];
2251 2501
2252 if ($y0 < $y + $h && $y < $y1) { 2502 if ($y0 < $y + $h && $y < $y1) {
2503 $layout->set_foreground (@{ $par->[2] });
2504 $layout->set_width ($W - $par->[3]);
2253 $layout->set_text ($par->[2]); 2505 $layout->set_markup ($par->[4]);
2254 2506
2255 glColor @{ $par->[1] }; 2507 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2256 my ($W, $H) = $layout->size; 2508
2257 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2509 glRasterPos $par->[3], $y - $y0;
2510 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2258 } 2511 }
2259 2512
2260 $y += $h; 2513 $y += $h;
2261 } 2514 }
2262 2515
2263 glDisable GL_TEXTURE_2D;
2264 glDisable GL_BLEND; 2516 glDisable GL_BLEND;
2265 }; 2517 };
2266 }); 2518 });
2267} 2519}
2268 2520
2269sub _draw { 2521sub _draw {
2270 my ($self) = @_; 2522 my ($self) = @_;
2271 2523
2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274 glEnable GL_TEXTURE_2D; 2524 glEnable GL_TEXTURE_2D;
2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276 glColor 1, 1, 1, 1; 2526 glColor 1, 1, 1, 1;
2277 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2527 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278 glDisable GL_TEXTURE_2D; 2528 glDisable GL_TEXTURE_2D;
2279 glDisable GL_BLEND;
2280 2529
2281 $self->{children}[1]->draw; 2530 $self->{children}[1]->draw;
2282 2531
2283} 2532}
2284 2533
… …
2332 2581
2333sub new { 2582sub new {
2334 my $class = shift; 2583 my $class = shift;
2335 2584
2336 my $self = $class->SUPER::new ( 2585 my $self = $class->SUPER::new (
2337 state => 0, 2586 state => 0,
2338 connect_activate => \&toggle_flopper, 2587 on_activate => \&toggle_flopper,
2339 @_ 2588 @_
2340 ); 2589 );
2341 2590
2342 if ($self->{state}) {
2343 $self->{state} = 0;
2344 $self->toggle_flopper;
2345 }
2346
2347 $self 2591 $self
2348} 2592}
2349 2593
2350sub toggle_flopper { 2594sub toggle_flopper {
2351 my ($self) = @_; 2595 my ($self) = @_;
2352 2596
2353 # TODO: use animation 2597 $self->{other}->toggle_visibility;
2354 if ($self->{state} = !$self->{state}) {
2355 $CFClient::UI::ROOT->add ($self->{other});
2356 $self->{other}->move ($self->coord2global (0, $self->{h}));
2357 $self->emit ("open");
2358 } else {
2359 $CFClient::UI::ROOT->remove ($self->{other});
2360 $self->emit ("close");
2361 }
2362
2363 $self->emit (changed => $self->{state});
2364} 2598}
2365 2599
2366############################################################################# 2600#############################################################################
2367 2601
2368package CFClient::UI::Tooltip; 2602package CFClient::UI::Tooltip;
… …
2378 @_, 2612 @_,
2379 can_events => 0, 2613 can_events => 0,
2380 ) 2614 )
2381} 2615}
2382 2616
2383sub set_markup { 2617sub set_tooltip_from {
2384 my ($self, $text) = @_; 2618 my ($self, $widget) = @_;
2385 2619
2386 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2620 $self->add (new CFClient::UI::Label
2387 $self->{label}->set_markup ($text); 2621 markup => $widget->{tooltip},
2388 $self->add ($self->{label}); 2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8,
2624 fg => [0, 0, 0, 1],
2625 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP),
2627 );
2389} 2628}
2390 2629
2391sub size_request { 2630sub size_request {
2392 my ($self) = @_; 2631 my ($self) = @_;
2393 2632
2394 $self->child->set_max_size ($::WIDTH * 0.3);
2395
2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397 2634
2398 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2399} 2636}
2400 2637
2401sub size_allocate { 2638sub size_allocate {
2402 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2403 2640
2641 return unless $changed;
2642
2404 $self->SUPER::size_allocate ($w - 4, $h - 4); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2644}
2645
2646sub visibility_change {
2647 my ($self, $visible) = @_;
2648
2649 return unless $visible;
2650
2651 $self->{root}->on_post_alloc ("move_$self" => sub {
2652 my $widget = $self->{owner}
2653 or return;
2654
2655 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2656
2657 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2658 if $x + $self->{w} > $::WIDTH;
2659
2660 $self->move_abs ($x, $y);
2661 });
2405} 2662}
2406 2663
2407sub _draw { 2664sub _draw {
2408 my ($self) = @_; 2665 my ($self) = @_;
2409 2666
2410 glPushMatrix;
2411 glTranslate 0.375, 0.375; 2667 glTranslate 0.375, 0.375;
2412 2668
2413 my ($w, $h) = @$self{qw(w h)}; 2669 my ($w, $h) = @$self{qw(w h)};
2414 2670
2415 glColor 1, 0.8, 0.4; 2671 glColor 1, 0.8, 0.4;
… …
2426 glVertex 0 , $h; 2682 glVertex 0 , $h;
2427 glVertex $w, $h; 2683 glVertex $w, $h;
2428 glVertex $w, 0; 2684 glVertex $w, 0;
2429 glEnd; 2685 glEnd;
2430 2686
2431 glPopMatrix; 2687 glTranslate 2 - 0.375, 2 - 0.375;
2432 2688
2433 glTranslate 2, 2;
2434 $self->SUPER::_draw; 2689 $self->SUPER::_draw;
2435} 2690}
2436 2691
2437############################################################################# 2692#############################################################################
2438 2693
… …
2443use CFClient::OpenGL; 2698use CFClient::OpenGL;
2444 2699
2445sub new { 2700sub new {
2446 my $class = shift; 2701 my $class = shift;
2447 2702
2448 $class->SUPER::new ( 2703 my $self = $class->SUPER::new (
2449 aspect => 1, 2704 aspect => 1,
2705 can_events => 0,
2450 @_, 2706 @_,
2451 ) 2707 );
2708
2709 if ($self->{anim} && $self->{animspeed}) {
2710 Scalar::Util::weaken (my $widget = $self);
2711
2712 $self->{timer} = Event->timer (
2713 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2714 hard => 1,
2715 interval => $self->{animspeed},
2716 cb => sub {
2717 ++$widget->{frame};
2718 $widget->update;
2719 },
2720 );
2721 }
2722
2723 $self
2452} 2724}
2453 2725
2454sub size_request { 2726sub size_request {
2455 (32, 8) 2727 (32, 8)
2456} 2728}
2457 2729
2730sub update {
2731 my ($self) = @_;
2732
2733 return unless $self->{visible};
2734
2735 $self->SUPER::update;
2736}
2737
2458sub _draw { 2738sub _draw {
2459 my ($self) = @_; 2739 my ($self) = @_;
2460 2740
2461 return unless $::CONN;#d# manage and cache textures differently 2741 return unless $::CONN;
2742
2743 my $face;
2744
2745 if ($self->{frame}) {
2746 my $anim = $::CONN->{anim}[$self->{anim}];
2747
2748 $face = $anim->[ $self->{frame} % @$anim ]
2749 if $anim && @$anim;
2750 }
2751
2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2463 2753
2464 # TODO animation
2465 if ($tex) { 2754 if ($tex) {
2466 glEnable GL_BLEND;
2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468 glEnable GL_TEXTURE_2D; 2755 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2757 glColor 1, 1, 1, 1;
2471 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2759 glDisable GL_TEXTURE_2D;
2473 glDisable GL_BLEND;
2474 } 2760 }
2761}
2762
2763sub DESTROY {
2764 my ($self) = @_;
2765
2766 $self->{timer}->cancel
2767 if $self->{timer};
2768
2769 $self->SUPER::DESTROY;
2475} 2770}
2476 2771
2477############################################################################# 2772#############################################################################
2478 2773
2479package CFClient::UI::InventoryItem; 2774package CFClient::UI::Inventory;
2480 2775
2481our @ISA = CFClient::UI::HBox::; 2776our @ISA = CFClient::UI::ScrolledWindow::;
2482 2777
2483sub new { 2778sub new {
2484 my $class = shift; 2779 my $class = shift;
2485 2780
2486 my %args = @_;
2487
2488 my $item = delete $args{item};
2489
2490 my $desc = $item->{nrof} < 2
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494
2495 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2496 can_hover => 1, 2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2497 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_;
2502
2503 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) {
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519 ],
2520 )->popup ($ev);
2521 }
2522
2523 1
2524 },
2525 %args
2526 );
2527
2528 $self->add (new CFClient::UI::Face
2529 can_events => 0,
2530 face => $item->{face},
2531 anim => $item->{anim},
2532 animspeed => $item->{animspeed},
2533 );
2534
2535 $self->add (new CFClient::UI::Label
2536 can_events => 0,
2537 text => $desc,
2538 );
2539
2540 $self
2541}
2542
2543#############################################################################
2544
2545package CFClient::UI::Inventory;
2546
2547our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549sub new {
2550 my $class = shift;
2551
2552 my $self = $class->SUPER::new (
2553 scrolled => (new CFClient::UI::VBox),
2554 @_, 2783 @_,
2555 ); 2784 );
2556 2785
2557 $self 2786 $self
2558} 2787}
… …
2561 my ($self, $items) = @_; 2790 my ($self, $items) = @_;
2562 2791
2563 $self->{scrolled}->clear; 2792 $self->{scrolled}->clear;
2564 return unless $items; 2793 return unless $items;
2565 2794
2566 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2567 2799
2568 $self->{real_items} = \@items; 2800 $self->{real_items} = \@items;
2569 2801
2802 my $row = 0;
2570 for my $item (@items) { 2803 for my $item (@items) {
2571 my $desc = $item->{nrof} < 2 2804 CFClient::Item::update_widgets $item;
2572 ? $item->{name}
2573 : "$item->{nrof} $item->{name_pl}";
2574 2805
2575 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2576 } 2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2577 2809
2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2810 $row++;
2579} 2811 }
2580
2581sub size_request {
2582 my ($self) = @_;
2583 ($self->{req_w}, $self->{req_h});
2584} 2812}
2585 2813
2586############################################################################# 2814#############################################################################
2587 2815
2588package CFClient::UI::Menu; 2816package CFClient::UI::Menu;
… …
2623 2851
2624# popup given the event (must be a mouse button down event currently) 2852# popup given the event (must be a mouse button down event currently)
2625sub popup { 2853sub popup {
2626 my ($self, $ev) = @_; 2854 my ($self, $ev) = @_;
2627 2855
2628 $self->emit ("popdown"); 2856 $self->_emit ("popdown");
2629 2857
2630 # maybe save $GRAB? must be careful about events... 2858 # maybe save $GRAB? must be careful about events...
2631 $GRAB = $self; 2859 $GRAB = $self;
2632 $self->{button} = $ev->{button}; 2860 $self->{button} = $ev->{button};
2633 2861
… …
2648 2876
2649 if ($ev->{button} == $self->{button}) { 2877 if ($ev->{button} == $self->{button}) {
2650 undef $GRAB; 2878 undef $GRAB;
2651 $self->hide; 2879 $self->hide;
2652 2880
2653 $self->emit ("popdown"); 2881 $self->_emit ("popdown");
2654 $self->{hover}[1]->() if $self->{hover}; 2882 $self->{hover}[1]->() if $self->{hover};
2655 } 2883 }
2656} 2884}
2657 2885
2658############################################################################# 2886#############################################################################
2659 2887
2660package CFClient::UI::Root; 2888package CFClient::UI::Statusbox;
2661 2889
2662our @ISA = CFClient::UI::Container::; 2890our @ISA = CFClient::UI::VBox::;
2663
2664use CFClient::OpenGL;
2665 2891
2666sub new { 2892sub new {
2667 my $class = shift; 2893 my $class = shift;
2668 2894
2669 $class->SUPER::new ( 2895 $class->SUPER::new (
2896 fontsize => 0.8,
2670 @_, 2897 @_,
2671 ) 2898 )
2672} 2899}
2673 2900
2901sub reorder {
2902 my ($self) = @_;
2903 my $NOW = time;
2904
2905 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 }
2908
2909 my @widgets;
2910
2911 my @items = sort {
2912 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} };
2915
2916 my $count = 10 + 1;
2917 for my $item (@items) {
2918 last unless --$count;
2919
2920 push @widgets, $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text};
2925
2926 for ($short) {
2927 s/^\s+//;
2928 s/\s+/ /g;
2929 }
2930
2931 new CFClient::UI::Label
2932 markup => $short,
2933 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg},
2939 can_events => 1,
2940 can_hover => 1
2941 };
2942 }
2943
2944 $self->clear;
2945 $self->SUPER::add (reverse @widgets);
2946}
2947
2948sub add {
2949 my ($self, $text, %arg) = @_;
2950
2951 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//;
2953
2954 return unless $text;
2955
2956 my $timeout = time + ((delete $arg{timeout}) || 60);
2957
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959
2960 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) {
2962 $item->{count}++;
2963 } else {
2964 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text;
2966 }
2967 $item->{id} = ++$self->{id};
2968 $item->{timeout} = $timeout;
2969 delete $item->{label};
2970 } else {
2971 $self->{item}{$group} = {
2972 id => ++$self->{id},
2973 text => $text,
2974 timeout => $timeout,
2975 tooltip => $text,
2976 fg => [0.8, 0.8, 0.8, 0.8],
2977 pri => 0,
2978 count => 1,
2979 %arg,
2980 };
2981 }
2982
2983 $self->reorder;
2984}
2985
2986sub reconfigure {
2987 my ($self) = @_;
2988
2989 delete $_->{label}
2990 for values %{ $self->{item} || {} };
2991
2992 $self->reorder;
2993 $self->SUPER::reconfigure;
2994}
2995
2996#############################################################################
2997
2998package CFClient::UI::Root;
2999
3000our @ISA = CFClient::UI::Container::;
3001
3002use CFClient::OpenGL;
3003
3004sub new {
3005 my $class = shift;
3006
3007 my $self = $class->SUPER::new (
3008 visible => 1,
3009 @_,
3010 );
3011
3012 Scalar::Util::weaken ($self->{root} = $self);
3013
3014 $self
3015}
3016
2674sub configure { 3017sub configure {
2675 my ($self, $x, $y, $w, $h) = @_; 3018 my ($self, $x, $y, $w, $h) = @_;
2676 3019
2677 $self->{w} = $w; 3020 $self->{w} = $w;
2678 $self->{h} = $h; 3021 $self->{h} = $h;
2679} 3022}
2680 3023
2681sub check_size { 3024sub reconfigure {
2682 my ($self) = @_; 3025 my ($self) = @_;
2683 3026
3027 $self->SUPER::reconfigure;
3028
2684 $self->size_allocate ($self->{w}, $self->{h}) 3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
2685 if $self->{w}; 3030 if $self->{w};
2686} 3031}
2687 3032
2688sub size_request { 3033sub size_request {
2689 my ($self) = @_; 3034 my ($self) = @_;
2690 3035
2691 ($self->{w}, $self->{h}) 3036 ($self->{w}, $self->{h})
2692} 3037}
2693 3038
3039sub _to_pixel {
3040 my ($coord, $size, $max) = @_;
3041
3042 $coord =
3043 $coord eq "center" ? ($max - $size) * 0.5
3044 : $coord eq "max" ? $max
3045 : $coord;
3046
3047 $coord = 0 if $coord < 0;
3048 $coord = $max - $size if $coord > $max - $size;
3049
3050 int $coord + 0.5
3051}
3052
2694sub size_allocate { 3053sub size_allocate {
2695 my ($self, $w, $h) = @_; 3054 my ($self, $w, $h, $changed) = @_;
2696
2697 my $old_w = $self->{old_w};
2698 my $old_h = $self->{old_h};
2699
2700 if ($old_w && $old_h) {
2701 for my $child ($self->children) {
2702 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710 }
2711 }
2712 3055
2713 for my $child ($self->children) { 3056 for my $child ($self->children) {
2714 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3057 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715 3058
2716 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3059 $X = $child->{force_x} if exists $child->{force_x};
2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3060 $Y = $child->{force_y} if exists $child->{force_y};
3061
3062 $X = _to_pixel $X, $W, $self->{w};
3063 $Y = _to_pixel $Y, $H, $self->{h};
3064
2718 $child->configure ($X, $Y, $W, $H); 3065 $child->configure ($X, $Y, $W, $H);
2719 } 3066 }
2720
2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723} 3067}
2724 3068
2725sub coord2local { 3069sub coord2local {
2726 my ($self, $x, $y) = @_; 3070 my ($self, $x, $y) = @_;
2727 3071
… …
2735} 3079}
2736 3080
2737sub update { 3081sub update {
2738 my ($self) = @_; 3082 my ($self) = @_;
2739 3083
2740 $self->check_size;
2741 $::WANT_REFRESH++; 3084 $::WANT_REFRESH++;
2742} 3085}
2743 3086
2744sub add { 3087sub add {
2745 my ($self, $child) = @_; 3088 my ($self, @children) = @_;
2746 3089
2747 # integerise window positions 3090 $_->{is_toplevel} = 1
2748 $child->{x} = int $child->{x}; 3091 for @children;
2749 $child->{y} = int $child->{y};
2750 3092
2751 $self->SUPER::add ($child); 3093 $self->SUPER::add (@children);
3094}
3095
3096sub remove {
3097 my ($self, @children) = @_;
3098
3099 $self->SUPER::remove (@children);
3100
3101 delete $self->{is_toplevel}
3102 for @children;
3103
3104 while (@children) {
3105 my $w = pop @children;
3106 push @children, $w->children;
3107 $w->set_invisible;
3108 }
2752} 3109}
2753 3110
2754sub on_refresh { 3111sub on_refresh {
2755 my ($self, $id, $cb) = @_; 3112 my ($self, $id, $cb) = @_;
2756 3113
2757 $self->{refresh_hook}{$id} = $cb; 3114 $self->{refresh_hook}{$id} = $cb;
2758} 3115}
2759 3116
3117sub on_post_alloc {
3118 my ($self, $id, $cb) = @_;
3119
3120 $self->{post_alloc_hook}{$id} = $cb;
3121}
3122
2760sub draw { 3123sub draw {
2761 my ($self) = @_; 3124 my ($self) = @_;
2762
2763 if ($self->{check_size}) {
2764 my @queue = ([], []);
2765
2766 for (;;) {
2767 if ($self->{check_size}) {
2768 # heuristic: check containers last
2769 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2770 for values %{delete $self->{check_size}}
2771 }
2772
2773 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2774
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request;
2778
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2780 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781
2782 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h;
2784
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2786
2787 $widget->{parent}->check_size
2788 if $widget->{parent};
2789 }
2790 }
2791 }
2792
2793 while ($self->{size_alloc}) {
2794 for (values %{delete $self->{size_alloc}}) {
2795 my ($widget, $w, $h) = @$_;
2796
2797 $w = 0 if $w < 0;
2798 $h = 0 if $h < 0;
2799
2800 $widget->{w} = $w;
2801 $widget->{h} = $h;
2802 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h);
2804 }
2805 }
2806 3125
2807 while ($self->{refresh_hook}) { 3126 while ($self->{refresh_hook}) {
2808 $_->() 3127 $_->()
2809 for values %{delete $self->{refresh_hook}}; 3128 for values %{delete $self->{refresh_hook}};
2810 } 3129 }
2811 3130
3131 if ($self->{realloc}) {
3132 my @queue;
3133
3134 while () {
3135 if ($self->{realloc}) {
3136 #TODO use array-of-depth approach
3137
3138 @queue = sort { $a->{visible} <=> $b->{visible} }
3139 @queue, values %{delete $self->{realloc}};
3140 }
3141
3142 my $widget = pop @queue || last;
3143
3144 $widget->{visible} or last; # do not resize invisible widgets
3145
3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147 ? @$widget{qw(force_w force_h)}
3148 : $widget->size_request;
3149
3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151
3152 $w = $min_size if $w < $min_size;
3153 $h = $min_size if $h < $min_size;
3154
3155 $widget->{req_w} = $w;
3156 $widget->{req_h} = $h;
3157
3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3159
3160 push @queue, $widget->{parent}
3161 if $widget->{parent};
3162 }
3163 }
3164
3165 while (my $size_alloc = delete $self->{size_alloc}) {
3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167 values %$size_alloc;
3168
3169 while () {
3170 my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3174
3175 $w = 0 if $w < 0;
3176 $h = 0 if $h < 0;
3177
3178 $w = int $w + 0.5;
3179 $h = int $h + 0.5;
3180
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3182
3183 $widget->{w} = $w;
3184 $widget->{h} = $h;
3185
3186 $widget->emit (size_allocate => $w, $h, $changed);
3187 }
3188 }
3189
3190 while ($self->{post_alloc_hook}) {
3191 $_->()
3192 for values %{delete $self->{post_alloc_hook}};
3193 }
3194
2812 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3195 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3196 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814 glClear GL_COLOR_BUFFER_BIT; 3197 glClear GL_COLOR_BUFFER_BIT;
2815 3198
2816 glMatrixMode GL_PROJECTION; 3199 glMatrixMode GL_PROJECTION;
2817 glLoadIdentity; 3200 glLoadIdentity;
2818 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3201 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2819 glMatrixMode GL_MODELVIEW; 3202 glMatrixMode GL_MODELVIEW;
2820 glLoadIdentity; 3203 glLoadIdentity;
2821 3204
2822 $self->_draw; 3205 $self->_draw;
2823} 3206}
… …
2825############################################################################# 3208#############################################################################
2826 3209
2827package CFClient::UI; 3210package CFClient::UI;
2828 3211
2829$ROOT = new CFClient::UI::Root; 3212$ROOT = new CFClient::UI::Root;
2830$TOOLTIP = new CFClient::UI::Tooltip; 3213$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831 3214
28321 32151
2833 3216

Diff Legend

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