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.171 by root, Mon Apr 24 11:54:26 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
239} 364}
240 365
366sub children {
367}
368
241sub set_max_size { 369sub set_max_size {
242 my ($self, $w, $h) = @_; 370 my ($self, $w, $h) = @_;
243 371
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 372 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 373 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 374}
247 375
248# return top left coordinates 376sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 377 my ($self, $tooltip) = @_;
251 378
252 $self->{parent} 379 $tooltip =~ s/^\s+//;
253 or Carp::confess "no parent widget in _topleft\n";#d# 380 $tooltip =~ s/\s+$//;
254 381
255 $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 }
256} 390}
257 391
258# translate global coordinates to local coordinate system 392# translate global coordinates to local coordinate system
259sub coord2local { 393sub coord2local {
260 my ($self, $x, $y) = @_; 394 my ($self, $x, $y) = @_;
261 395
262 my ($X, $Y) = $self->_topleft; 396 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
263 ($x - $X, $y - $Y)
264} 397}
265 398
266# translate local coordinates to global coordinate system 399# translate local coordinates to global coordinate system
267sub coord2global { 400sub coord2global {
268 my ($self, $x, $y) = @_; 401 my ($self, $x, $y) = @_;
269 402
270 my ($X, $Y) = $self->_topleft; 403 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
271 ($x + $X, $y + $Y)
272} 404}
273 405
274sub focus_in { 406sub focus_in {
275 my ($self) = @_; 407 my ($self) = @_;
276 408
277 return if $FOCUS == $self; 409 return if $FOCUS == $self;
278 return unless $self->{can_focus}; 410 return unless $self->{can_focus};
279 411
280 my $focus = $FOCUS; $FOCUS = $self; 412 my $focus = $FOCUS; $FOCUS = $self;
281 413
282 $self->emit (focus_in => $focus); 414 $self->_emit (focus_in => $focus);
283 415
284 $focus->update if $focus; 416 $focus->update if $focus;
285 $FOCUS->update; 417 $FOCUS->update;
286} 418}
287 419
… …
290 422
291 return unless $FOCUS == $self; 423 return unless $FOCUS == $self;
292 424
293 my $focus = $FOCUS; undef $FOCUS; 425 my $focus = $FOCUS; undef $FOCUS;
294 426
295 $self->emit (focus_out => $focus); 427 $self->_emit (focus_out => $focus);
296 428
297 $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;
298} 433}
299 434
300sub mouse_motion { } 435sub mouse_motion { }
301sub button_up { } 436sub button_up { }
302sub key_down { } 437sub key_down { }
303sub key_up { } 438sub key_up { }
304 439
305sub button_down { 440sub button_down {
306 my ($self, $ev, $x, $y) = @_; 441 my ($self, $ev, $x, $y) = @_;
307 442
308 $self->focus_in; 443 $self->focus_in;
… …
311sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
312sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
313sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
314sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
315sub 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}
316 521
317sub draw { 522sub draw {
318 my ($self) = @_; 523 my ($self) = @_;
319 524
320 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
337 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
338 glEnd; 543 glEnd;
339 glDisable GL_BLEND; 544 glDisable GL_BLEND;
340 } 545 }
341 546
342 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
343 glPushMatrix; 548 glPushMatrix;
344 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
345 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
346 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
347 glVertex 0 , 0; 552 glVertex 0 , 0;
348 glVertex $self->{w}, 0; 553 glVertex $self->{w} - 1, 0;
349 glVertex $self->{w}, $self->{h}; 554 glVertex $self->{w} - 1, $self->{h} - 1;
350 glVertex 0 , $self->{h}; 555 glVertex 0 , $self->{h} - 1;
351 glEnd; 556 glEnd;
352 glPopMatrix; 557 glPopMatrix;
353 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;
354 } 559 }
355} 560}
356 561
357sub _draw { 562sub _draw {
358 my ($self) = @_; 563 my ($self) = @_;
359 564
360 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
361} 566}
362 567
363sub find_widget {
364 my ($self, $x, $y) = @_;
365
366 return () unless $self->{can_events};
367
368 return $self
369 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
370 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
371
372 ()
373}
374
375sub set_parent {
376 my ($self, $parent) = @_;
377
378 Scalar::Util::weaken ($self->{parent} = $parent);
379}
380
381sub check_size {
382 my ($self) = @_;
383
384 $self->{parent}
385 or return 1;
386
387 my ($w, $h) = $self->{user_w} && $self->{user_h}
388 ? @$self{qw(user_w user_h)}
389 : $self->size_request;
390
391 if ($w != $self->{req_w} || $h != $self->{req_h}) {
392 $self->{req_w} = $w;
393 $self->{req_h} = $h;
394
395 $self->{parent}->check_size
396 or $self->size_allocate (
397 (List::Util::max $self->{w}, $w),
398 (List::Util::max $self->{h}, $h),
399 );
400
401 1
402 } else {
403 0
404 }
405}
406
407sub update {
408 my ($self) = @_;
409
410 $self->{parent}->update
411 if $self->{parent};
412}
413
414sub connect {
415 my ($self, $signal, $cb) = @_;
416
417 push @{ $self->{signal_cb}{$signal} }, $cb;
418}
419
420sub emit {
421 my ($self, $signal, @args) = @_;
422
423 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
424}
425
426sub DESTROY { 568sub DESTROY {
427 my ($self) = @_; 569 my ($self) = @_;
428 570
571 delete $WIDGET{$self+0};
429 #$self->deactivate; 572 #$self->deactivate;
430} 573}
431 574
432############################################################################# 575#############################################################################
433 576
… …
442 my $class = shift; 585 my $class = shift;
443 586
444 # range [value, low, high, page] 587 # range [value, low, high, page]
445 588
446 $class->SUPER::new ( 589 $class->SUPER::new (
447 bg => [0, 0, 0, 0.2], 590 #bg => [0, 0, 0, 0.2],
448 active_bg => [1, 1, 1, 0.5], 591 #active_bg => [1, 1, 1, 0.5],
449 @_ 592 @_
450 ) 593 )
451} 594}
452 595
453sub _draw { 596sub _draw {
454 my ($self) = @_; 597 my ($self) = @_;
455 598
599 my $color = $FOCUS == $self && $self->{active_bg}
600 ? $self->{active_bg}
601 : $self->{bg};
602
603 if ($color && (@$color < 4 || $color->[3])) {
456 my ($w, $h) = @$self{qw(w h)}; 604 my ($w, $h) = @$self{qw(w h)};
457 605
458 glEnable GL_BLEND; 606 glEnable GL_BLEND;
459 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
460 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 608 glColor @$color;
461 609
462 glBegin GL_QUADS; 610 glBegin GL_QUADS;
463 glVertex 0 , 0; 611 glVertex 0 , 0;
464 glVertex 0 , $h; 612 glVertex 0 , $h;
465 glVertex $w, $h; 613 glVertex $w, $h;
466 glVertex $w, 0; 614 glVertex $w, 0;
467 glEnd; 615 glEnd;
468 616
469 glDisable GL_BLEND; 617 glDisable GL_BLEND;
618 }
470} 619}
471 620
472############################################################################# 621#############################################################################
473 622
474package CFClient::UI::Empty; 623package CFClient::UI::Empty;
… …
479 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
480 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
481} 630}
482 631
483sub size_request { 632sub size_request {
484 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
485} 636}
486 637
487sub draw { } 638sub draw { }
488 639
489############################################################################# 640#############################################################################
… …
506 657
507 $self 658 $self
508} 659}
509 660
510sub add { 661sub add {
511 my ($self, $child) = @_; 662 my ($self, @widgets) = @_;
512 663
513 $child->set_parent ($self); 664 $_->set_parent ($self)
665 for @widgets;
514 666
515 use sort 'stable'; 667 use sort 'stable';
516 668
517 $self->{children} = [ 669 $self->{children} = [
518 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 671 @{$self->{children}}, @widgets
520 ]; 672 ];
521 673
522 $child->check_size; 674 $self->realloc;
675}
676
677sub children {
678 @{ $_[0]{children} }
523} 679}
524 680
525sub remove { 681sub remove {
526 my ($self, $child) = @_; 682 my ($self, $child) = @_;
527 683
528 delete $child->{parent}; 684 delete $child->{parent};
529 $child->hide; 685 $child->hide;
530 686
531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532 688
533 $self->check_size; 689 $self->realloc;
534 $self->update;
535} 690}
536 691
537sub clear { 692sub clear {
538 my ($self) = @_; 693 my ($self) = @_;
539 694
… …
542 697
543 for (@$children) { 698 for (@$children) {
544 delete $_->{parent}; 699 delete $_->{parent};
545 $_->hide; 700 $_->hide;
546 } 701 }
702
703 $self->realloc;
547} 704}
548 705
549sub find_widget { 706sub find_widget {
550 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
551 708
… …
604sub size_request { 761sub size_request {
605 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
606} 763}
607 764
608sub size_allocate { 765sub size_allocate {
609 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
610 767
611 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
612} 769}
613 770
614############################################################################# 771#############################################################################
… …
626} 783}
627 784
628sub update { 785sub update {
629 my ($self) = @_; 786 my ($self) = @_;
630 787
631 # we want to do this delayed... 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 789 $self->SUPER::update;
634} 790}
635 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
636sub render_chld { 804sub render_child {
637 my ($self) = @_; 805 my ($self) = @_;
638 806
639 $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 {
640 glClearColor 0, 0, 0, 1; 808 glClearColor 0, 0, 0, 0;
641 glClear GL_COLOR_BUFFER_BIT; 809 glClear GL_COLOR_BUFFER_BIT;
642 $self->child->draw; 810
811 $self->_render;
643 }; 812 };
644}
645
646sub size_allocate {
647 my ($self, $w, $h) = @_;
648
649 $self->child->configure (0, 0, $w, $h);
650
651 $self->render_chld;
652} 813}
653 814
654sub _draw { 815sub _draw {
655 my ($self) = @_; 816 my ($self) = @_;
656 817
657 my ($w, $h) = ($self->w, $self->h); 818 my ($w, $h) = ($self->w, $self->h);
658 819
659 my $tex = $self->{texture} 820 my $tex = $self->{texture}
660 or return; 821 or return;
661 822
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
665 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;
666 826
667 $tex->draw_quad (0, 0, $w, $h); 827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
668 828
669 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 829 glDisable GL_TEXTURE_2D;
671} 830}
672 831
673############################################################################# 832#############################################################################
674 833
675package CFClient::UI::ViewPort; 834package CFClient::UI::ViewPort;
676 835
677our @ISA = CFClient::UI::Window::; 836our @ISA = CFClient::UI::Window::;
678
679sub new { die }
680
681sub size_request {
682 my ($self) = @_;
683
684 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
685 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
686
687 @$self{qw(child_w child_h)}
688}
689
690sub _draw {
691 my ($self) = @_;
692
693 $self->{children}[1]->draw;
694}
695
696
697#############################################################################
698
699package CFClient::UI::Frame;
700
701our @ISA = CFClient::UI::Bin::;
702
703use CFClient::OpenGL;
704 837
705sub new { 838sub new {
706 my $class = shift; 839 my $class = shift;
707 840
708 my $self = $class->SUPER::new ( 841 $class->SUPER::new (
709 bg => [1, 1, 1, 1], 842 scroll_x => 0,
710 border_bg => [1, 1, 1, 1], 843 scroll_y => 1,
711 border => 0.8,
712 @_ 844 @_,
713 ); 845 )
714
715 $self
716} 846}
717 847
718sub _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 {
719 my ($self) = @_; 870 my ($self, $x, $y) = @_;
720 871
721 my ($w, $h) = ($self->{w}, $self->{h}); 872 $self->{view_x} = int $x;
873 $self->{view_y} = int $y;
722 874
723 glEnable GL_BLEND; 875 $self->update;
724 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 876}
725 glEnable GL_TEXTURE_2D;
726 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
727 877
728# glBegin GL_QUADS; 878# hmm, this does not work for topleft of $self... but we should not ask for that
729# glColor 0, 0, 0, 0; 879sub coord2local {
730# glVertex 0 , 0; 880 my ($self, $x, $y) = @_;
731# glVertex 0 , $h;
732# glVertex $w, $h;
733# glVertex $w, 0;
734# glEnd;
735 881
882 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
883}
736 884
737 $self->child->draw; 885sub coord2global {
738 glDisable GL_BLEND; 886 my ($self, $x, $y) = @_;
739 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;
740} 912}
741 913
742############################################################################# 914#############################################################################
743 915
744package CFClient::UI::FancyFrame; 916package CFClient::UI::ScrolledWindow;
745 917
746our @ISA = CFClient::UI::Bin::; 918our @ISA = CFClient::UI::HBox::;
747
748use CFClient::OpenGL;
749
750my @tex =
751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
752 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
753 919
754sub new { 920sub new {
755 my $class = shift; 921 my $class = shift;
756 922
757 # 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;
758 1026
759 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
762 border => 0.8, 1030 border => 0.6,
763 can_events => 1, 1031 can_events => 1,
764 @_ 1032 @_
765 ); 1033 );
766 1034
767 $self->{title} &&= new CFClient::UI::Label 1035 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 1036 align => 0,
769 valign => 1, 1037 valign => 1,
770 text => $self->{title}, 1038 text => $self->{title},
771 fontsize => 1; 1039 fontsize => $self->{border};
772 1040
773 $self 1041 $self
774} 1042}
775 1043
776sub border { 1044sub border {
… …
787 $h + $self->border * 2, 1055 $h + $self->border * 2,
788 ) 1056 )
789} 1057}
790 1058
791sub size_allocate { 1059sub size_allocate {
792 my ($self, $w, $h) = @_; 1060 my ($self, $w, $h, $changed) = @_;
1061
1062 return unless $changed;
793 1063
794 $h -= List::Util::max 0, $self->border * 2; 1064 $h -= List::Util::max 0, $self->border * 2;
795 $w -= List::Util::max 0, $self->border * 2; 1065 $w -= List::Util::max 0, $self->border * 2;
796 1066
797 $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)
798 if $self->{title}; 1068 if $self->{title};
799 1069
800 $self->child->configure ($self->border, $self->border, $w, $h); 1070 $self->child->configure ($self->border, $self->border, $w, $h);
801} 1071}
802 1072
803sub button_down { 1073sub button_down {
804 my ($self, $ev, $x, $y) = @_; 1074 my ($self, $ev, $x, $y) = @_;
805 1075
1076 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 1077 my $border = $self->border;
807 1078
808 if ($x < $self->{w} && $x >= $self->{w} - $border 1079 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 1080 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 1081
1082 if ($lr & $td) {
1083 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1084 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 1085 my ($bw, $bh) = ($self->{w}, $self->{h});
813 1086
1087 my $mx = $x < $border;
1088 my $my = $y < $border;
1089
814 $self->{motion} = sub { 1090 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 1091 my ($ev, $x, $y) = @_;
816 1092
817 ($x, $y) = ($ev->{x}, $ev->{y}); 1093 my $dx = $ev->{x} - $ox;
1094 my $dy = $ev->{y} - $oy;
818 1095
819 $self->{user_w} = $bw + $x - $ox; 1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
821 $self->check_size; 1098
1099 $self->realloc;
1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
822 }; 1101 };
823 1102
824 } elsif ($x >= 0 && $x < $self->{w} 1103 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1104 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 1105 my ($bx, $by) = ($self->{x}, $self->{y});
829 1106
830 $self->{motion} = sub { 1107 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 1108 my ($ev, $x, $y) = @_;
832 1109
833 ($x, $y) = ($ev->{x}, $ev->{y}); 1110 ($x, $y) = ($ev->{x}, $ev->{y});
834 1111
835 $self->move ($bx + $x - $ox, $by + $y - $oy); 1112 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
836 $self->update;
837 }; 1113 };
838 } 1114 }
839} 1115}
840 1116
841sub button_up { 1117sub button_up {
… …
854 my ($self) = @_; 1130 my ($self) = @_;
855 1131
856 my ($w, $h ) = ($self->{w}, $self->{h}); 1132 my ($w, $h ) = ($self->{w}, $self->{h});
857 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1133 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
858 1134
859 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 1135 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
863 1137
864 my $border = $self->border; 1138 my $border = $self->border;
865 1139
866 glColor @{ $self->{border_bg} }; 1140 glColor @{ $self->{border_bg} };
867 $tex[1]->draw_quad (0, 0, $w, $border); 1141 $border[0]->draw_quad_alpha (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 1142 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1143 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1144 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
871 1145
872 my $bg = $tex[0]; 1146 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1147 glColor @{ $self->{bg} };
873 1148
874 # TODO: repeat texture not scale 1149 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 1150 # solve this better(?)
876 my $rep_y = $ch / $bg->{h}; 1151 $bg->{s} = $cw / $bg->{w};
877 1152 $bg->{t} = $ch / $bg->{h};
878 glColor @{ $self->{bg} };
879
880 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 }
884 1155
885 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND;
887 1157
888 $self->{title}->draw if $self->{title}; 1158 $self->{title}->draw if $self->{title};
1159
889 $self->child->draw; 1160 $self->child->draw;
890} 1161}
891 1162
892############################################################################# 1163#############################################################################
893 1164
… …
902sub new { 1173sub new {
903 my $class = shift; 1174 my $class = shift;
904 1175
905 $class->SUPER::new ( 1176 $class->SUPER::new (
906 col_expand => [], 1177 col_expand => [],
907 @_ 1178 @_,
908 ) 1179 )
1180}
1181
1182sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} }
909} 1184}
910 1185
911sub add { 1186sub add {
912 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
913 1188
914 $child->set_parent ($self); 1189 $child->set_parent ($self);
915 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
916 1191
917 $child->check_size; 1192 $self->realloc;
918} 1193}
919 1194
920# 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?
921sub clear { 1196sub clear {
922 my ($self) = @_; 1197 my ($self) = @_;
923 1198
924 my $children = delete $self->{children}; 1199 my @children = $self->children;
1200 delete $self->{children};
925 1201
926 for (grep $_, map @$_, grep $_, @$children) { 1202 for (@children) {
927 delete $_->{parent}; 1203 delete $_->{parent};
928 $_->hide; 1204 $_->hide;
929 } 1205 }
930 1206
931 $self->update; 1207 $self->realloc;
932} 1208}
933 1209
934sub get_wh { 1210sub get_wh {
935 my ($self) = @_; 1211 my ($self) = @_;
936 1212
… …
963 (sum @$hs), 1239 (sum @$hs),
964 ) 1240 )
965} 1241}
966 1242
967sub size_allocate { 1243sub size_allocate {
968 my ($self, $w, $h) = @_; 1244 my ($self, $w, $h, $changed) = @_;
969 1245
970 my ($ws, $hs) = $self->get_wh; 1246 my ($ws, $hs) = $self->get_wh;
971 1247
972 my $req_w = sum @$ws; 1248 my $req_w = (sum @$ws) || 1;
973 my $req_h = sum @$hs; 1249 my $req_h = (sum @$hs) || 1;
974 1250
975 # TODO: nicer code && do row_expand 1251 # TODO: nicer code && do row_expand
976 my @col_expand = @{$self->{col_expand}}; 1252 my @col_expand = @{$self->{col_expand}};
977 @col_expand = (1) x @$ws unless @col_expand; 1253 @col_expand = (1) x @$ws unless @col_expand;
978 my $col_expand = (sum @col_expand) || 1; 1254 my $col_expand = (sum @col_expand) || 1;
… …
1032 } 1308 }
1033} 1309}
1034 1310
1035############################################################################# 1311#############################################################################
1036 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
1037package CFClient::UI::HBox; 1373package CFClient::UI::HBox;
1038 1374
1039# TODO: wrap into common Box base class
1040
1041our @ISA = CFClient::UI::Container::; 1375our @ISA = CFClient::UI::Box::;
1042 1376
1043sub size_request { 1377sub new {
1044 my ($self) = @_; 1378 my $class = shift;
1045 1379
1046 my @alloc = map [$_->size_request], @{$self->{children}}; 1380 $class->SUPER::new (
1047 1381 vertical => 0,
1048 ( 1382 @_,
1049 (List::Util::sum map $_->[0], @alloc),
1050 (List::Util::max map $_->[1], @alloc),
1051 ) 1383 )
1052} 1384}
1053 1385
1054sub size_allocate {
1055 my ($self, $w, $h) = @_;
1056
1057 ($h, $w) = ($w, $h);
1058
1059 my $children = $self->{children};
1060
1061 my @h = map $_->{req_w}, @$children;
1062
1063 my $req_h = List::Util::sum @h;
1064
1065 if ($req_h > $h) {
1066 # ah well, not enough space
1067 $_ *= $h / $req_h for @h;
1068 } else {
1069 my $exp = List::Util::sum map $_->{expand}, @$children;
1070 $exp ||= 1;
1071
1072 for (0 .. $#$children) {
1073 my $child = $children->[$_];
1074
1075 my $alloc_h = $h[$_];
1076 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1077 $h[$_] = $alloc_h;
1078 }
1079 }
1080
1081 CFClient::UI::harmonize \@h;
1082
1083 my $y = 0;
1084 for (0 .. $#$children) {
1085 my $child = $children->[$_];
1086 my $h = $h[$_];
1087 $child->configure ($y, 0, $h, $w);
1088
1089 $y += $h;
1090 }
1091
1092 1
1093}
1094
1095############################################################################# 1386#############################################################################
1096 1387
1097package CFClient::UI::VBox; 1388package CFClient::UI::VBox;
1098 1389
1099# TODO: wrap into common Box base class
1100
1101our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Box::;
1102 1391
1103sub size_request { 1392sub new {
1104 my ($self) = @_; 1393 my $class = shift;
1105 1394
1106 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $class->SUPER::new (
1107 1396 vertical => 1,
1108 ( 1397 @_,
1109 (List::Util::max map $_->[0], @alloc),
1110 (List::Util::sum map $_->[1], @alloc),
1111 ) 1398 )
1112} 1399}
1113 1400
1114sub size_allocate {
1115 my ($self, $w, $h) = @_;
1116
1117 my $children = $self->{children};
1118
1119 my @h = map $_->{req_h}, @$children;
1120
1121 my $req_h = List::Util::sum @h;
1122
1123 if ($req_h > $h) {
1124 # ah well, not enough space
1125 $_ *= $h / $req_h for @h;
1126 } else {
1127 my $exp = List::Util::sum map $_->{expand}, @$children;
1128 $exp ||= 1;
1129
1130 for (0 .. $#$children) {
1131 my $child = $children->[$_];
1132
1133 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1134 }
1135 }
1136
1137 CFClient::UI::harmonize \@h;
1138
1139 my $y = 0;
1140 for (0 .. $#$children) {
1141 my $child = $children->[$_];
1142 my $h = $h[$_];
1143 $child->configure (0, $y, $w, $h);
1144
1145 $y += $h;
1146 }
1147
1148 1
1149}
1150
1151############################################################################# 1401#############################################################################
1152 1402
1153package CFClient::UI::Label; 1403package CFClient::UI::Label;
1154 1404
1155our @ISA = CFClient::UI::Base::; 1405our @ISA = CFClient::UI::DrawBG::;
1156 1406
1157use CFClient::OpenGL; 1407use CFClient::OpenGL;
1158 1408
1159sub new { 1409sub new {
1160 my ($class, %arg) = @_; 1410 my ($class, %arg) = @_;
1161 1411
1162 my $self = $class->SUPER::new ( 1412 my $self = $class->SUPER::new (
1163 fg => [1, 1, 1], 1413 fg => [1, 1, 1],
1414 #bg => none
1415 #active_bg => none
1164 #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),
1165 fontsize => 1, 1422 fontsize => 1,
1166 text => "",
1167 align => -1, 1423 align => -1,
1168 valign => -1, 1424 valign => -1,
1169 padding => 2, 1425 padding => 2,
1170 layout => new CFClient::Layout,
1171 can_events => 0, 1426 can_events => 0,
1172 %arg 1427 %arg
1173 ); 1428 );
1174 1429
1175 if (exists $self->{template}) { 1430 if (exists $self->{template}) {
1176 my $layout = new CFClient::Layout; 1431 my $layout = new CFClient::Layout;
1177 $layout->set_text (delete $self->{template}); 1432 $layout->set_text (delete $self->{template});
1178 $self->{template} = $layout; 1433 $self->{template} = $layout;
1179 } 1434 }
1180 1435
1181 $self->set_text (delete $self->{text}) if exists $self->{text}; 1436 if (exists $self->{markup}) {
1182 $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 }
1183 1441
1184 $self 1442 $self
1185} 1443}
1186 1444
1187sub escape { 1445sub escape($) {
1188 local $_ = $_[1]; 1446 local $_ = $_[0];
1189 1447
1190 s/&/&amp;/g; 1448 s/&/&amp;/g;
1191 s/>/&gt;/g; 1449 s/>/&gt;/g;
1192 s/</&lt;/g; 1450 s/</&lt;/g;
1193 1451
1194 $_[1] 1452 $_
1453}
1454
1455sub update {
1456 my ($self) = @_;
1457
1458 delete $self->{texture};
1459 $self->SUPER::update;
1195} 1460}
1196 1461
1197sub set_text { 1462sub set_text {
1198 my ($self, $text) = @_; 1463 my ($self, $text) = @_;
1199 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;
1200 $self->{layout}->set_text ($text); 1469 $self->{layout}->set_text ($text);
1201 1470
1202 delete $self->{texture}; 1471 $self->realloc;
1203 $self->check_size;
1204 $self->update; 1472 $self->update;
1205} 1473}
1206 1474
1207sub set_markup { 1475sub set_markup {
1208 my ($self, $markup) = @_; 1476 my ($self, $markup) = @_;
1209 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;
1210 $self->{layout}->set_markup ($markup); 1484 $self->{layout}->set_markup ($markup);
1211 1485
1212 delete $self->{texture}; 1486 $self->realloc;
1213 $self->check_size;
1214 $self->update; 1487 $self->update;
1215} 1488}
1216 1489
1217sub size_request { 1490sub size_request {
1218 my ($self) = @_; 1491 my ($self) = @_;
1219 1492
1220 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1493 $self->{layout}->set_font ($self->{font}) if $self->{font};
1221 $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});
1222 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1223 1498
1224 my ($w, $h) = $self->{layout}->size; 1499 my ($w, $h) = $self->{layout}->size;
1225 1500
1226 if (exists $self->{template}) { 1501 if (exists $self->{template}) {
… …
1238 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1239 ) 1514 )
1240} 1515}
1241 1516
1242sub size_allocate { 1517sub size_allocate {
1243 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1244 1519
1245 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1246} 1522}
1247 1523
1248sub set_fontsize { 1524sub set_fontsize {
1249 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1250 1526
1251 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1252 delete $self->{texture}; 1528 delete $self->{texture};
1253 $self->check_size; 1529
1254 $self->update; 1530 $self->realloc;
1255} 1531}
1256 1532
1257sub _draw { 1533sub _draw {
1258 my ($self) = @_; 1534 my ($self) = @_;
1259 1535
1536 $self->SUPER::_draw; # draw background, if applicable
1537
1260 my $tex = $self->{texture} ||= do { 1538 my $tex = $self->{texture} ||= do {
1539 $self->{layout}->set_foreground (@{$self->{fg}});
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1540 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $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});
1263 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545
1264 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
1265 }; 1557 };
1266 1558
1267 glEnable GL_BLEND;
1268 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1269 glEnable GL_TEXTURE_2D; 1559 glEnable GL_TEXTURE_2D;
1270 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1271 1561
1562 if ($tex->{format} == GL_ALPHA) {
1272 glColor @{$self->{fg}}; 1563 glColor @{$self->{fg}};
1273
1274 $self->{ox} = int (
1275 $self->{align} < 0 ? $self->{padding}
1276 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1277 : ($self->{w} - $tex->{w}) * 0.5
1278 );
1279
1280 $self->{oy} = int (
1281 $self->{valign} < 0 ? $self->{padding}
1282 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1283 : ($self->{h} - $tex->{h}) * 0.5
1284 );
1285
1286 $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 }
1287 1568
1288 glDisable GL_TEXTURE_2D; 1569 glDisable GL_TEXTURE_2D;
1289 glDisable GL_BLEND;
1290} 1570}
1291 1571
1292############################################################################# 1572#############################################################################
1293 1573
1294package CFClient::UI::EntryBase; 1574package CFClient::UI::EntryBase;
… …
1307 active_fg => [0, 0, 0], 1587 active_fg => [0, 0, 0],
1308 can_hover => 1, 1588 can_hover => 1,
1309 can_focus => 1, 1589 can_focus => 1,
1310 valign => 0, 1590 valign => 0,
1311 can_events => 1, 1591 can_events => 1,
1592 #text => ...
1312 @_ 1593 @_
1313 ) 1594 )
1314} 1595}
1315 1596
1316sub _set_text { 1597sub _set_text {
… …
1326 $self->{text} = $text; 1607 $self->{text} = $text;
1327 1608
1328 $text =~ s/./*/g if $self->{hidden}; 1609 $text =~ s/./*/g if $self->{hidden};
1329 $self->{layout}->set_text ("$text "); 1610 $self->{layout}->set_text ("$text ");
1330 1611
1331 $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;
1332} 1622}
1333 1623
1334sub get_text { 1624sub get_text {
1335 $_[0]{text} 1625 $_[0]{text}
1336} 1626}
… …
1339 my ($self) = @_; 1629 my ($self) = @_;
1340 1630
1341 my ($w, $h) = $self->SUPER::size_request; 1631 my ($w, $h) = $self->SUPER::size_request;
1342 1632
1343 ($w + 1, $h) # add 1 for cursor 1633 ($w + 1, $h) # add 1 for cursor
1344}
1345
1346sub size_allocate {
1347 my ($self, $w, $h) = @_;
1348
1349 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1350}
1351
1352sub set_text {
1353 my ($self, $text) = @_;
1354
1355 $self->{cursor} = length $text;
1356 $self->_set_text ($text);
1357 $self->update;
1358} 1634}
1359 1635
1360sub key_down { 1636sub key_down {
1361 my ($self, $ev) = @_; 1637 my ($self, $ev) = @_;
1362 1638
… …
1364 my $sym = $ev->{sym}; 1640 my $sym = $ev->{sym};
1365 my $uni = $ev->{unicode}; 1641 my $uni = $ev->{unicode};
1366 1642
1367 my $text = $self->get_text; 1643 my $text = $self->get_text;
1368 1644
1369 if ($sym == 8) { 1645 if ($uni == 8) {
1370 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1646 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1371 } elsif ($sym == 127) { 1647 } elsif ($uni == 127) {
1372 substr $text, $self->{cursor}, 1, ""; 1648 substr $text, $self->{cursor}, 1, "";
1373 } elsif ($sym == CFClient::SDLK_LEFT) { 1649 } elsif ($sym == CFClient::SDLK_LEFT) {
1374 --$self->{cursor} if $self->{cursor}; 1650 --$self->{cursor} if $self->{cursor};
1375 } elsif ($sym == CFClient::SDLK_RIGHT) { 1651 } elsif ($sym == CFClient::SDLK_RIGHT) {
1376 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1652 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1377 } elsif ($sym == CFClient::SDLK_HOME) { 1653 } elsif ($sym == CFClient::SDLK_HOME) {
1378 $self->{cursor} = 0; 1654 $self->{cursor} = 0;
1379 } elsif ($sym == CFClient::SDLK_END) { 1655 } elsif ($sym == CFClient::SDLK_END) {
1380 $self->{cursor} = length $text; 1656 $self->{cursor} = length $text;
1381 } elsif ($sym == 27) { 1657 } elsif ($uni == 27) {
1382 $self->emit ('escape'); 1658 $self->_emit ('escape');
1383 } elsif ($uni) { 1659 } elsif ($uni) {
1384 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1385 } 1661 }
1386 1662
1387 $self->_set_text ($text); 1663 $self->_set_text ($text);
1388 $self->update; 1664
1665 $self->realloc;
1389} 1666}
1390 1667
1391sub focus_in { 1668sub focus_in {
1392 my ($self) = @_; 1669 my ($self) = @_;
1393 1670
… …
1473 if ($sym == 13) { 1750 if ($sym == 13) {
1474 unshift @{$self->{history}}, 1751 unshift @{$self->{history}},
1475 my $txt = $self->get_text; 1752 my $txt = $self->get_text;
1476 $self->{history_pointer} = -1; 1753 $self->{history_pointer} = -1;
1477 $self->{history_saveback} = ''; 1754 $self->{history_saveback} = '';
1478 $self->emit (activate => $txt); 1755 $self->_emit (activate => $txt);
1479 $self->update; 1756 $self->update;
1480 1757
1481 } elsif ($sym == CFClient::SDLK_UP) { 1758 } elsif ($sym == CFClient::SDLK_UP) {
1482 if ($self->{history_pointer} < 0) { 1759 if ($self->{history_pointer} < 0) {
1483 $self->{history_saveback} = $self->get_text; 1760 $self->{history_saveback} = $self->get_text;
… …
1522 my $class = shift; 1799 my $class = shift;
1523 1800
1524 $class->SUPER::new ( 1801 $class->SUPER::new (
1525 padding => 4, 1802 padding => 4,
1526 fg => [1, 1, 1], 1803 fg => [1, 1, 1],
1527 bg => [1, 1, 1, 0.2],
1528 active_fg => [0, 0, 1], 1804 active_fg => [0, 0, 1],
1529 can_hover => 1, 1805 can_hover => 1,
1530 align => 0, 1806 align => 0,
1531 valign => 0, 1807 valign => 0,
1532 can_events => 1, 1808 can_events => 1,
1533 @_ 1809 @_
1534 ) 1810 )
1535} 1811}
1536 1812
1813sub activate { }
1814
1537sub button_up { 1815sub button_up {
1538 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1539 1817
1818 $self->emit ("activate")
1540 if ($x >= 0 && $x < $self->{w} 1819 if $x >= 0 && $x < $self->{w}
1541 && $y >= 0 && $y < $self->{h}) { 1820 && $y >= 0 && $y < $self->{h};
1542 $self->emit ("activate");
1543 }
1544} 1821}
1545 1822
1546sub _draw { 1823sub _draw {
1547 my ($self) = @_; 1824 my ($self) = @_;
1548 1825
… …
1550 1827
1551 if ($GRAB == $self) { 1828 if ($GRAB == $self) {
1552 $self->{fg} = $self->{active_fg}; 1829 $self->{fg} = $self->{active_fg};
1553 } 1830 }
1554 1831
1555 glEnable GL_BLEND;
1556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1557 glEnable GL_TEXTURE_2D; 1832 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 glColor 0, 0, 0, 1; 1834 glColor 0, 0, 0, 1;
1560 1835
1561 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1836 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1562 1837
1563 glDisable GL_TEXTURE_2D; 1838 glDisable GL_TEXTURE_2D;
1564 glDisable GL_BLEND;
1565 1839
1566 $self->SUPER::_draw; 1840 $self->SUPER::_draw;
1567} 1841}
1568 1842
1569############################################################################# 1843#############################################################################
… …
1583 1857
1584 $class->SUPER::new ( 1858 $class->SUPER::new (
1585 padding => 2, 1859 padding => 2,
1586 fg => [1, 1, 1], 1860 fg => [1, 1, 1],
1587 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],
1588 state => 0, 1864 state => 0,
1589 can_hover => 1, 1865 can_hover => 1,
1590 @_ 1866 @_
1591 ) 1867 )
1592} 1868}
… …
1601 my ($self, $ev, $x, $y) = @_; 1877 my ($self, $ev, $x, $y) = @_;
1602 1878
1603 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1604 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1605 $self->{state} = !$self->{state}; 1881 $self->{state} = !$self->{state};
1606 $self->emit (changed => $self->{state}); 1882 $self->_emit (changed => $self->{state});
1607 } 1883 }
1608} 1884}
1609 1885
1610sub _draw { 1886sub _draw {
1611 my ($self) = @_; 1887 my ($self) = @_;
… …
1616 1892
1617 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;
1618 1894
1619 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1620 1896
1621 glEnable GL_BLEND; 1897 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898
1622 glEnable GL_TEXTURE_2D; 1899 glEnable GL_TEXTURE_2D;
1623 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1624
1625 my $tex = $self->{state} ? $tex[1] : $tex[0];
1626
1627 $tex->draw_quad (0, 0, $s, $s); 1900 $tex->draw_quad_alpha (0, 0, $s, $s);
1628
1629 glDisable GL_TEXTURE_2D; 1901 glDisable GL_TEXTURE_2D;
1630 glDisable GL_BLEND;
1631} 1902}
1632 1903
1633############################################################################# 1904#############################################################################
1634 1905
1635package CFClient::UI::Image; 1906package CFClient::UI::Image;
… …
1678 glTranslate 0, -$self->{w}, 0; 1949 glTranslate 0, -$self->{w}, 0;
1679 1950
1680 ($w, $h) = ($h, $w); 1951 ($w, $h) = ($h, $w);
1681 } 1952 }
1682 1953
1683 glEnable GL_BLEND;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685 glEnable GL_TEXTURE_2D; 1954 glEnable GL_TEXTURE_2D;
1686 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1687 1956
1688 $tex->draw_quad (0, 0, $w, $h); 1957 $tex->draw_quad_alpha (0, 0, $w, $h);
1689 1958
1690 glDisable GL_BLEND;
1691 glDisable GL_TEXTURE_2D; 1959 glDisable GL_TEXTURE_2D;
1692} 1960}
1693 1961
1694############################################################################# 1962#############################################################################
1695 1963
… …
1743} 2011}
1744 2012
1745sub set_max { 2013sub set_max {
1746 my ($self, $max) = @_; 2014 my ($self, $max) = @_;
1747 2015
2016 return if $self->{max_val} == $max;
2017
1748 $self->{max_val} = $max; 2018 $self->{max_val} = $max;
2019 $self->update;
1749} 2020}
1750 2021
1751sub set_value { 2022sub set_value {
1752 my ($self, $val, $max) = @_; 2023 my ($self, $val, $max) = @_;
1753 2024
1754 $self->set_max ($max) 2025 $self->set_max ($max)
1755 if defined $max; 2026 if defined $max;
1756 2027
1757 $max = $self->{max_val}; 2028 return if $self->{val} == $val;
2029
1758 $self->{val} = $val; 2030 $self->{val} = $val;
1759
1760 $self->update; 2031 $self->update;
1761} 2032}
1762 2033
1763sub _draw { 2034sub _draw {
1764 my ($self) = @_; 2035 my ($self) = @_;
… …
1847 2118
1848 $self->{value}->set_fontsize ($fsize); 2119 $self->{value}->set_fontsize ($fsize);
1849 $self->{max} ->set_fontsize ($fsize); 2120 $self->{max} ->set_fontsize ($fsize);
1850} 2121}
1851 2122
2123sub set_max {
2124 my ($self, $max) = @_;
2125
2126 $self->{gauge}->set_max ($max);
2127 $self->{max}->set_text ($max);
2128}
2129
1852sub set_value { 2130sub set_value {
1853 my ($self, $val, $max) = @_; 2131 my ($self, $val, $max) = @_;
1854 2132
1855 $self->set_max ($max) 2133 $self->set_max ($max)
1856 if defined $max; 2134 if defined $max;
1857 2135
1858 $self->{gauge}->set_value ($val, $max); 2136 $self->{gauge}->set_value ($val, $max);
1859 $self->{value}->set_text ($val); 2137 $self->{value}->set_text ($val);
1860}
1861
1862sub set_max {
1863 my ($self, $max) = @_;
1864
1865 $self->{gauge}->set_max ($max);
1866 $self->{max}->set_text ($max);
1867} 2138}
1868 2139
1869############################################################################# 2140#############################################################################
1870 2141
1871package CFClient::UI::Slider; 2142package CFClient::UI::Slider;
… …
1881 qw(s1_slider.png s1_slider_bg.png); 2152 qw(s1_slider.png s1_slider_bg.png);
1882 2153
1883sub new { 2154sub new {
1884 my $class = shift; 2155 my $class = shift;
1885 2156
1886 # range [value, low, high, page] 2157 # range [value, low, high, page, unit]
1887 2158
1888 # TODO: 0-width page 2159 # TODO: 0-width page
1889 # TODO: req_w/h are wrong with vertical 2160 # TODO: req_w/h are wrong with vertical
1890 # TODO: calculations are off 2161 # TODO: calculations are off
1891 my $self = $class->SUPER::new ( 2162 my $self = $class->SUPER::new (
1892 fg => [1, 1, 1], 2163 fg => [1, 1, 1],
1893 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],
1894 range => [0, 0, 100, 10], 2167 range => [0, 0, 100, 10, 0],
1895 req_w => 20, 2168 min_w => $::WIDTH / 80,
1896 req_h => 20, 2169 min_h => $::WIDTH / 80,
1897 vertical => 0, 2170 vertical => 0,
1898 can_hover => 1, 2171 can_hover => 1,
1899 inner_pad => 5, 2172 inner_pad => 0.02,
1900 @_ 2173 @_
1901 ); 2174 );
1902 2175
2176 $self->set_value ($self->{range}[0]);
2177 $self->update;
2178
1903 $self 2179 $self
1904} 2180}
1905 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
1906sub size_request { 2216sub size_request {
1907 my ($self) = @_; 2217 my ($self) = @_;
1908 2218
1909 my $w = $self->{req_w}; 2219 ($self->{req_w}, $self->{req_h})
1910 my $h = $self->{req_h};
1911
1912 $self->{vertical} ? ($h, $w) : ($w, $h)
1913} 2220}
1914 2221
1915sub button_down { 2222sub button_down {
1916 my ($self, $ev, $x, $y) = @_; 2223 my ($self, $ev, $x, $y) = @_;
1917 2224
1918 $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
1919 $self->mouse_motion ($ev, $x, $y); 2229 $self->mouse_motion ($ev, $x, $y);
1920} 2230}
1921 2231
1922sub mouse_motion { 2232sub mouse_motion {
1923 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1924 2234
1925 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
1926 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2252 my ($value, $lo, $hi, $page) = @{$self->{range}};
2253 my $range = ($hi - $page - $lo) || 1e-100;
1927 2254
1928 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2255 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1929 2256
1930 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2257 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1931 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2258 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1932 2259
1933 $x -= $inner_pad_px; # substract the padding 2260 $value = ($value - $lo) / $range;
1934 $x = $x * ($hi - $lo) / $inner_w + $lo; 2261 $value = $value * $self->{scale} + $self->{offset};
1935 $x = $lo if $x < $lo;
1936 $x = $hi - $page if $x > $hi - $page;
1937 $self->{range}[0] = $x;
1938 2262
1939 $self->emit (changed => $x); 2263 $self->{knob_x} = $value - $knob_w * 0.5;
1940 $self->update; 2264 $self->{knob_w} = $knob_w;
1941 } 2265 });
1942}
1943 2266
1944# the inner_* stuff is for generating a padding for the slider handle, 2267 $self->SUPER::update;
1945# so that the handle doesn't leave the texture. This calculation isn't 100%
1946# correct propably, but it does the job for now
1947sub _calc_inner_pad_px {
1948 my ($self, $w) = @_;
1949 ($w / 100) * $self->{inner_pad} # % to pixels
1950} 2268}
1951 2269
1952sub _draw { 2270sub _draw {
1953 my ($self) = @_; 2271 my ($self) = @_;
1954 2272
1955 $self->SUPER::_draw (); 2273 $self->SUPER::_draw ();
1956 2274
1957 my ($w, $h) = @$self{qw(w h)}; 2275 glScale $self->{w}, $self->{h};
1958 2276
1959 if ($self->{vertical}) { 2277 if ($self->{vertical}) {
1960 # draw a vertical slider like a rotated horizontal slider 2278 # draw a vertical slider like a rotated horizontal slider
1961 2279
2280 glTranslate 1, 0, 0;
1962 glRotate 90, 0, 0, 1; 2281 glRotate 90, 0, 0, 1;
1963 glTranslate 0, -$self->{w}, 0;
1964
1965 ($w, $h) = ($h, $w);
1966 } 2282 }
1967 2283
1968 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2284 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1969 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2285 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1970 2286
1971 my ($value, $lo, $hi, $page) = @{$self->{range}};
1972
1973 $hi = $value + 1 if $lo == $hi;
1974
1975 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1976 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1977
1978 $page = int $page * $inner_w / ($hi - $lo);
1979 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1980
1981 $w -= $page;
1982 $page &= ~1;
1983 glTranslate $page * 0.5, 0, 0;
1984 $page ||= 2;
1985
1986 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1987 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1988
1989 glEnable GL_BLEND;
1990 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1991 glEnable GL_TEXTURE_2D; 2287 glEnable GL_TEXTURE_2D;
1992 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2288 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1993 2289
1994 # draw background 2290 # draw background
1995 $tex[1]->draw_quad (0, 0, $w, $h); 2291 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1996 2292
1997 # draw handle 2293 # draw handle
1998 $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);
1999 2295
2000 glDisable GL_BLEND;
2001 glDisable GL_TEXTURE_2D; 2296 glDisable GL_TEXTURE_2D;
2002} 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 (@_) }
2003 2339
2004############################################################################# 2340#############################################################################
2005 2341
2006package CFClient::UI::TextView; 2342package CFClient::UI::TextView;
2007 2343
… …
2016 fontsize => 1, 2352 fontsize => 1,
2017 can_events => 0, 2353 can_events => 0,
2018 #font => default_font 2354 #font => default_font
2019 @_, 2355 @_,
2020 2356
2021 layout => (new CFClient::Layout), 2357 layout => (new CFClient::Layout 1),
2022 par => [], 2358 par => [],
2023 height => 0, 2359 height => 0,
2024 children => [ 2360 children => [
2025 (new CFClient::UI::Empty expand => 1), 2361 (new CFClient::UI::Empty expand => 1),
2026 (new CFClient::UI::Slider vertical => 1), 2362 (new CFClient::UI::Slider vertical => 1),
2027 ], 2363 ],
2028 ); 2364 );
2029 2365
2030 $self->{children}[1]->connect (changed => sub { 2366 $self->{children}[1]->connect (changed => sub { $self->update });
2031 $self->update;
2032 });
2033 2367
2034 $self 2368 $self
2035} 2369}
2036 2370
2037sub set_fontsize { 2371sub set_fontsize {
… …
2039 2373
2040 $self->{fontsize} = $fontsize; 2374 $self->{fontsize} = $fontsize;
2041 $self->reflow; 2375 $self->reflow;
2042} 2376}
2043 2377
2044sub text_height {
2045 my ($self, $text) = @_;
2046
2047 my $layout = $self->{layout};
2048
2049 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2050 $layout->set_width ($self->{w});
2051 $layout->set_text ($text);
2052
2053 ($layout->size)[1]
2054}
2055
2056sub reflow {
2057 my ($self) = @_;
2058
2059 $self->{need_reflow}++;
2060 $self->update;
2061}
2062
2063sub size_allocate { 2378sub size_allocate {
2064 my ($self, $w, $h) = @_; 2379 my ($self, $w, $h, $changed) = @_;
2065 2380
2066 $self->SUPER::size_allocate ($w, $h); 2381 $self->SUPER::size_allocate ($w, $h, $changed);
2382
2383 return unless $changed;
2067 2384
2068 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2385 $self->{layout}->set_font ($self->{font}) if $self->{font};
2069 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2070 $self->{layout}->set_width ($self->{children}[0]{w}); 2387 $self->{layout}->set_width ($self->{children}[0]{w});
2071 2388
2072 $self->reflow; 2389 $self->reflow;
2073} 2390}
2074 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
2075sub add_paragraph { 2426sub add_paragraph {
2076 my ($self, $color, $text) = @_; 2427 my ($self, $color, $text, $indent) = @_;
2077 2428
2078 #TODO: intelligently "reformat" paragraph 2429 for my $line (split /\n/, $text) {
2079 2430 my ($w, $h) = $self->text_size ($line);
2080 my $height = $self->text_height ($text);
2081
2082 $self->{height} += $height; 2431 $self->{height} += $h;
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2433 }
2083 2434
2084 push @{$self->{par}}, [$height, $color, $text];
2085
2086 $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]);
2087 $self->{children}[1]->update;
2088} 2436}
2089 2437
2090sub update { 2438sub update {
2091 my ($self) = @_; 2439 my ($self) = @_;
2092 2440
… …
2094 2442
2095 return unless $self->{h} > 0; 2443 return unless $self->{h} > 0;
2096 2444
2097 delete $self->{texture}; 2445 delete $self->{texture};
2098 2446
2099 $ROOT->on_refresh ($self, sub { 2447 $ROOT->on_post_alloc ($self, sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449
2100 if (delete $self->{need_reflow}) { 2450 if (delete $self->{need_reflow}) {
2101 my $height = 0; 2451 my $height = 0;
2102 2452
2103 $height += $_->[0] = $self->text_height ($_->[2]) 2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2104 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 }
2105 2468
2106 $self->{height} = $height; 2469 $self->{height} = $height;
2107 2470
2108 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2109 2472
2110 delete $self->{texture}; 2473 delete $self->{texture};
2111 } 2474 }
2112 2475
2113 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2114 glClearColor 0, 0, 0, 1; 2477 glClearColor 0.5, 0.5, 0.5, 0;
2115 glClear GL_COLOR_BUFFER_BIT; 2478 glClear GL_COLOR_BUFFER_BIT;
2116 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
2117 glEnable GL_BLEND; 2491 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off
2118 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2119 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121
2122 my $top = int $self->{children}[1]{range}[0];
2123
2124 my $y0 = $top;
2125 my $y1 = $top + $self->{h};
2126
2127 my $y = 0;
2128
2129 my $layout = $self->{layout};
2130
2131 $layout->set_font ($self->{font}) if $self->{font};
2132 2494
2133 for my $par (@{$self->{par}}) { 2495 for my $par (@{$self->{par}}) {
2134 my $h = $par->[0]; 2496 my $h = $par->[1];
2135 2497
2136 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]);
2137 $layout->set_text ($par->[2]); 2501 $layout->set_markup ($par->[4]);
2138 2502
2139 glColor @{ $par->[1] }; 2503 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2140 my ($W, $H) = $layout->size; 2504
2141 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;
2142 } 2507 }
2143 2508
2144 $y += $h; 2509 $y += $h;
2145 } 2510 }
2146 2511
2147 glDisable GL_TEXTURE_2D;
2148 glDisable GL_BLEND; 2512 glDisable GL_BLEND;
2149 }; 2513 };
2150 }); 2514 });
2151} 2515}
2152 2516
2153sub _draw { 2517sub _draw {
2154 my ($self) = @_; 2518 my ($self) = @_;
2155 2519
2156 if ($self->{texture}) {
2157 glEnable GL_TEXTURE_2D; 2520 glEnable GL_TEXTURE_2D;
2158 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522 glColor 1, 1, 1, 1;
2159 $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});
2160 glDisable GL_TEXTURE_2D; 2524 glDisable GL_TEXTURE_2D;
2161 }
2162 2525
2163 $self->{children}[1]->draw; 2526 $self->{children}[1]->draw;
2164 2527
2165} 2528}
2166 2529
… …
2214 2577
2215sub new { 2578sub new {
2216 my $class = shift; 2579 my $class = shift;
2217 2580
2218 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2219 state => 0, 2582 state => 0,
2220 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2221 @_ 2584 @_
2222 ); 2585 );
2223 2586
2224 if ($self->{state}) {
2225 $self->{state} = 0;
2226 $self->toggle_flopper;
2227 }
2228
2229 $self 2587 $self
2230} 2588}
2231 2589
2232sub toggle_flopper { 2590sub toggle_flopper {
2233 my ($self) = @_; 2591 my ($self) = @_;
2234 2592
2235 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2236 if ($self->{state} = !$self->{state}) {
2237 $CFClient::UI::ROOT->add ($self->{other});
2238 $self->{other}->move ($self->coord2global (0, $self->{h}));
2239 $self->emit ("open");
2240 } else {
2241 $CFClient::UI::ROOT->remove ($self->{other});
2242 $self->emit ("close");
2243 }
2244
2245 $self->emit (changed => $self->{state});
2246} 2594}
2247 2595
2248############################################################################# 2596#############################################################################
2249 2597
2250package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2260 @_, 2608 @_,
2261 can_events => 0, 2609 can_events => 0,
2262 ) 2610 )
2263} 2611}
2264 2612
2265sub set_markup { 2613sub set_tooltip_from {
2266 my ($self, $text) = @_; 2614 my ($self, $widget) = @_;
2267 2615
2268 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2616 $self->add (new CFClient::UI::Label
2269 $self->{label}->set_markup ($text); 2617 markup => $widget->{tooltip},
2270 $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 );
2271} 2624}
2272 2625
2273sub size_request { 2626sub size_request {
2274 my ($self) = @_; 2627 my ($self) = @_;
2275 2628
2276 $self->child->set_max_size ($::WIDTH * 0.3);
2277
2278 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2629 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2279 2630
2280 ($w + 4, $h + 4) 2631 ($w + 4, $h + 4)
2281} 2632}
2282 2633
2283sub size_allocate { 2634sub size_allocate {
2284 my ($self, $w, $h) = @_; 2635 my ($self, $w, $h, $changed) = @_;
2285 2636
2637 return unless $changed;
2638
2286 $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 });
2287} 2658}
2288 2659
2289sub _draw { 2660sub _draw {
2290 my ($self) = @_; 2661 my ($self) = @_;
2291 2662
2292 glPushMatrix;
2293 glTranslate 0.375, 0.375; 2663 glTranslate 0.375, 0.375;
2294 2664
2295 my ($w, $h) = @$self{qw(w h)}; 2665 my ($w, $h) = @$self{qw(w h)};
2296 2666
2297 glColor 1, 0.8, 0.4; 2667 glColor 1, 0.8, 0.4;
… …
2308 glVertex 0 , $h; 2678 glVertex 0 , $h;
2309 glVertex $w, $h; 2679 glVertex $w, $h;
2310 glVertex $w, 0; 2680 glVertex $w, 0;
2311 glEnd; 2681 glEnd;
2312 2682
2313 glPopMatrix; 2683 glTranslate 2 - 0.375, 2 - 0.375;
2314 2684
2315 glTranslate 2, 2;
2316 $self->SUPER::_draw; 2685 $self->SUPER::_draw;
2317} 2686}
2318 2687
2319############################################################################# 2688#############################################################################
2320 2689
… …
2325use CFClient::OpenGL; 2694use CFClient::OpenGL;
2326 2695
2327sub new { 2696sub new {
2328 my $class = shift; 2697 my $class = shift;
2329 2698
2330 $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2331 aspect => 1, 2700 aspect => 1,
2701 can_events => 0,
2332 @_, 2702 @_,
2333 ) 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
2334} 2720}
2335 2721
2336sub size_request { 2722sub size_request {
2337 (32, 8) 2723 (32, 8)
2338} 2724}
2339 2725
2726sub update {
2727 my ($self) = @_;
2728
2729 return unless $self->{visible};
2730
2731 $self->SUPER::update;
2732}
2733
2340sub draw { 2734sub _draw {
2341 my ($self) = @_; 2735 my ($self) = @_;
2342 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
2343 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2748 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2344 2749
2345 if ($tex) { 2750 if ($tex) {
2346 glEnable GL_BLEND;
2347 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2348 glEnable GL_TEXTURE_2D; 2751 glEnable GL_TEXTURE_2D;
2349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2350 glColor 1, 1, 1, 1; 2753 glColor 1, 1, 1, 1;
2351 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2754 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2352 glDisable GL_TEXTURE_2D; 2755 glDisable GL_TEXTURE_2D;
2353 glDisable GL_BLEND;
2354 } 2756 }
2757}
2758
2759sub DESTROY {
2760 my ($self) = @_;
2761
2762 $self->{timer}->cancel
2763 if $self->{timer};
2764
2765 $self->SUPER::DESTROY;
2355} 2766}
2356 2767
2357############################################################################# 2768#############################################################################
2358 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
2359package CFClient::UI::Root; 2994package CFClient::UI::Root;
2360 2995
2361our @ISA = CFClient::UI::Container::; 2996our @ISA = CFClient::UI::Container::;
2362 2997
2363use CFClient::OpenGL; 2998use CFClient::OpenGL;
2364 2999
2365sub check_size { 3000sub new {
2366 my ($self) = @_; 3001 my $class = shift;
2367 3002
2368 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3003 my $self = $class->SUPER::new (
2369} 3004 visible => 1,
3005 @_,
3006 );
2370 3007
2371sub size_request { 3008 Scalar::Util::weaken ($self->{root} = $self);
2372 ($::WIDTH, $::HEIGHT) 3009
3010 $self
2373} 3011}
2374 3012
2375sub configure { 3013sub configure {
2376 my ($self, $x, $y, $w, $h) = @_; 3014 my ($self, $x, $y, $w, $h) = @_;
2377 3015
2378 $self->SUPER::configure ($x, $y, $w, $h); 3016 $self->{w} = $w;
3017 $self->{h} = $h;
3018}
2379 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
2380 for my $child (@{$self->{children}}) { 3052 for my $child ($self->children) {
2381 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)};
2382 3054
2383 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3055 $X = $child->{force_x} if exists $child->{force_x};
2384 $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
2385 $child->configure ($X, $Y, $W,$H); 3061 $child->configure ($X, $Y, $W, $H);
2386 } 3062 }
2387} 3063}
2388 3064
2389sub _topleft { 3065sub coord2local {
2390 my ($self, $x, $y) = @_; 3066 my ($self, $x, $y) = @_;
2391 3067
2392 ($x, $y) 3068 ($x, $y)
2393} 3069}
2394 3070
3071sub coord2global {
3072 my ($self, $x, $y) = @_;
3073
3074 ($x, $y)
3075}
3076
2395sub update { 3077sub update {
2396 my ($self) = @_; 3078 my ($self) = @_;
2397 3079
2398 $self->check_size; 3080 $::WANT_REFRESH++;
2399 ::refresh ();
2400} 3081}
2401 3082
2402sub add { 3083sub add {
2403 my ($self, $child) = @_; 3084 my ($self, @children) = @_;
2404 3085
2405 # integerize window positions 3086 $_->{is_toplevel} = 1
2406 $child->{x} = int $child->{x}; 3087 for @children;
2407 $child->{y} = int $child->{y};
2408 3088
2409 $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 }
2410} 3105}
2411 3106
2412sub on_refresh { 3107sub on_refresh {
2413 my ($self, $id, $cb) = @_; 3108 my ($self, $id, $cb) = @_;
2414 3109
2415 $self->{refresh_hook}{$id} = $cb; 3110 $self->{refresh_hook}{$id} = $cb;
2416} 3111}
2417 3112
3113sub on_post_alloc {
3114 my ($self, $id, $cb) = @_;
3115
3116 $self->{post_alloc_hook}{$id} = $cb;
3117}
3118
2418sub draw { 3119sub draw {
2419 my ($self) = @_; 3120 my ($self) = @_;
2420 3121
2421 while (my $rcb = delete $self->{refresh_hook}) { 3122 while ($self->{refresh_hook}) {
2422 $_->() 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}};
2423 } 3190 }
2424 3191
2425 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3192 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2426 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2427 glClear GL_COLOR_BUFFER_BIT; 3194 glClear GL_COLOR_BUFFER_BIT;
2428 3195
2429 glMatrixMode GL_PROJECTION; 3196 glMatrixMode GL_PROJECTION;
2430 glLoadIdentity; 3197 glLoadIdentity;
2431 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2432 glMatrixMode GL_MODELVIEW; 3199 glMatrixMode GL_MODELVIEW;
2433 glLoadIdentity; 3200 glLoadIdentity;
2434 3201
2435 $self->_draw; 3202 $self->_draw;
2436} 3203}
… …
2438############################################################################# 3205#############################################################################
2439 3206
2440package CFClient::UI; 3207package CFClient::UI;
2441 3208
2442$ROOT = new CFClient::UI::Root; 3209$ROOT = new CFClient::UI::Root;
2443$TOOLTIP = new CFClient::UI::Tooltip; 3210$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2444 3211
24451 32121
2446 3213

Diff Legend

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