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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC

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

Diff Legend

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