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.150 by elmex, Sun Apr 23 00:08:29 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;
16our $TOOLTIP;
13our $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}
40
41sub check_tooltip {
42 if (!$GRAB) {
43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44 if (length $widget->{tooltip}) {
45
46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
49 $TOOLTIP->{owner} = $widget;
50
51 my $tip = $widget->{tooltip};
52
53 $tip = $tip->($widget) if CODE:: eq ref $tip;
54
55 $TOOLTIP->set_tooltip_from ($widget);
56 $TOOLTIP->show;
57 }
58
59 return;
60 }
61 }
62 }
63
64 $TOOLTIP->hide;
65 delete $TOOLTIP->{owner};
66}
14 67
15# class methods for events 68# class methods for events
16sub feed_sdl_key_down_event { 69sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 70 $FOCUS->emit (key_down => $_[0])
71 if $FOCUS;
18} 72}
19 73
20sub feed_sdl_key_up_event { 74sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_up => $_[0])
76 if $FOCUS;
22} 77}
23 78
24sub feed_sdl_button_down_event { 79sub feed_sdl_button_down_event {
25 my ($ev) = @_; 80 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 81 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 83 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 84 my $widget = $ROOT->find_widget ($x, $y);
30 85
31 $GRAB = $widget; 86 $GRAB = $widget;
32 $GRAB->update if $GRAB; 87 $GRAB->update if $GRAB;
88
89 check_tooltip;
33 } 90 }
34 91
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 92 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 93
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 94 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
95 if $GRAB;
38} 96}
39 97
40sub feed_sdl_button_up_event { 98sub feed_sdl_button_up_event {
41 my ($ev) = @_; 99 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
43 101
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 102 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 103
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 104 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 105
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 106 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
107 if $GRAB;
49 108
50 if (!$BUTTON_STATE) { 109 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 110 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 111 $grab->update if $grab;
53 $GRAB->update if $GRAB; 112 $GRAB->update if $GRAB;
113
114 check_tooltip;
54 } 115 }
55} 116}
56 117
57sub feed_sdl_motion_event { 118sub feed_sdl_motion_event {
58 my ($ev) = @_; 119 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 124 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 125 my $hover = $HOVER; $HOVER = $widget;
65 126
66 $hover->update if $hover && $hover->{can_hover}; 127 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 128 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 129
130 check_tooltip;
131 }
132
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 133 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
134 if $HOVER;
71} 135}
72 136
73# convert position array to integers 137# convert position array to integers
74sub harmonize { 138sub harmonize {
75 my ($vals) = @_; 139 my ($vals) = @_;
… …
81 $rem += $_ - $i; 145 $rem += $_ - $i;
82 $_ = $i; 146 $_ = $i;
83 } 147 }
84} 148}
85 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
86############################################################################# 191#############################################################################
87 192
88package CFClient::UI::Base; 193package CFClient::UI::Base;
89 194
90use strict; 195use strict;
… …
93 198
94sub new { 199sub new {
95 my $class = shift; 200 my $class = shift;
96 201
97 my $self = bless { 202 my $self = bless {
98 x => 0, 203 x => "center",
99 y => 0, 204 y => "center",
100 z => 0, 205 z => 0,
206 w => undef,
207 h => undef,
101 can_events => 1, 208 can_events => 1,
102 @_ 209 @_
103 }, $class; 210 }, $class;
104 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
105 for (keys %$self) { 224 for (keys %$self) {
106 if (/^connect_(.*)$/) { 225 if (/^on_(.*)$/) {
107 $self->connect ($1 => delete $self->{$_}); 226 $self->connect ($1 => delete $self->{$_});
108 } 227 }
109 } 228 }
110 229
111 $self 230 $self
112} 231}
113 232
233sub destroy {
234 my ($self) = @_;
235
236 $self->hide;
237 %$self = ();
238}
239
114sub show { 240sub show {
115 my ($self) = @_; 241 my ($self) = @_;
116 242
117 return if $self->{parent}; 243 return if $self->{parent};
118 244
119 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
120} 246}
121 247
248sub set_visible {
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};
272
273 undef $GRAB if $GRAB == $self;
274 undef $HOVER if $HOVER == $self;
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
122sub hide { 301sub hide {
123 my ($self) = @_; 302 my ($self) = @_;
124 303
125 return unless $self->{parent}; 304 $self->set_invisible;
126 305
127 $self->{parent}->remove ($self); 306 $self->{parent}->remove ($self)
307 if $self->{parent};
128} 308}
129 309
130sub move { 310sub move_abs {
131 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
132 312
133 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
134 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
135 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
136 316
137 $self->update; 317 $self->update;
138} 318}
139 319
140sub needs_redraw { 320sub set_size {
141 0 321 my ($self, $w, $h) = @_;
322
323 $self->{force_w} = $w;
324 $self->{force_h} = $h;
325
326 $self->realloc;
142} 327}
143 328
144sub size_request { 329sub size_request {
145 require Carp; 330 require Carp;
146 Carp::confess "size_request is abstract"; 331 Carp::confess "size_request is abstract";
… …
148 333
149sub configure { 334sub configure {
150 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
151 336
152 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
153 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
154 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
155 342
156 # use alignment to adjust x, y 343 # use alignment to adjust x, y
157 344
158 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
159 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
160
161 ($w, $h) = ($w2, $h2);
162 } 347 }
163 348
164 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
165 $self->{x} = $x; 350 $self->{x} = $x;
166 $self->{y} = $y; 351 $self->{y} = $y;
167 $self->update; 352 $self->update;
168 } 353 }
169 354
170 if ($self->{w} != $w || $self->{h} != $h) { 355 if ($self->{w} != $w || $self->{h} != $h) {
171 $self->{w} = $w; 356 return unless $self->{visible};
172 $self->{h} = $h;
173 357
174 $self->size_allocate ($w, $h); 358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
175 $self->update;
176 } 359 }
177} 360}
178 361
179sub size_allocate { 362sub size_allocate {
180 # nothing to be done 363 # nothing to be done
181} 364}
182 365
183# return top left coordinates 366sub children {
184sub _topleft { 367}
368
369sub set_max_size {
185 my ($self, $x, $y) = @_; 370 my ($self, $w, $h) = @_;
186 371
187 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 372 delete $self->{max_w}; $self->{max_w} = $w if $w;
373 delete $self->{max_h}; $self->{max_h} = $h if $h;
374}
375
376sub set_tooltip {
377 my ($self, $tooltip) = @_;
378
379 $tooltip =~ s/^\s+//;
380 $tooltip =~ s/\s+$//;
381
382 return if $self->{tooltip} eq $tooltip;
383
384 $self->{tooltip} = $tooltip;
385
386 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
387 delete $CFClient::UI::TOOLTIP->{owner};
388 CFClient::UI::check_tooltip;
389 }
188} 390}
189 391
190# translate global coordinates to local coordinate system 392# translate global coordinates to local coordinate system
191sub coord2local { 393sub coord2local {
192 my ($self, $x, $y) = @_; 394 my ($self, $x, $y) = @_;
193 395
194 my ($X, $Y) = $self->_topleft; 396 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
195 ($x - $X, $y - $Y)
196} 397}
197 398
198# translate local coordinates to global coordinate system 399# translate local coordinates to global coordinate system
199sub coord2global { 400sub coord2global {
200 my ($self, $x, $y) = @_; 401 my ($self, $x, $y) = @_;
201 402
202 my ($X, $Y) = $self->_topleft; 403 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
203 ($x + $X, $y + $Y)
204} 404}
205 405
206sub focus_in { 406sub focus_in {
207 my ($self) = @_; 407 my ($self) = @_;
208 408
209 return if $FOCUS == $self; 409 return if $FOCUS == $self;
210 return unless $self->{can_focus}; 410 return unless $self->{can_focus};
211 411
212 my $focus = $FOCUS; $FOCUS = $self; 412 my $focus = $FOCUS; $FOCUS = $self;
213 413
214 $self->emit (focus_in => $focus); 414 $self->_emit (focus_in => $focus);
215 415
216 $focus->update if $focus; 416 $focus->update if $focus;
217 $FOCUS->update; 417 $FOCUS->update;
218} 418}
219 419
… …
222 422
223 return unless $FOCUS == $self; 423 return unless $FOCUS == $self;
224 424
225 my $focus = $FOCUS; undef $FOCUS; 425 my $focus = $FOCUS; undef $FOCUS;
226 426
227 $self->emit (focus_out => $focus); 427 $self->_emit (focus_out => $focus);
228 428
229 $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;
230} 433}
231 434
232sub mouse_motion { } 435sub mouse_motion { }
233sub button_up { } 436sub button_up { }
234sub key_down { } 437sub key_down { }
235sub key_up { } 438sub key_up { }
236 439
237sub button_down { 440sub button_down {
238 my ($self, $ev, $x, $y) = @_; 441 my ($self, $ev, $x, $y) = @_;
239 442
240 $self->focus_in; 443 $self->focus_in;
… …
243sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
244sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
245sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
246sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
247sub 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}
248 521
249sub draw { 522sub draw {
250 my ($self) = @_; 523 my ($self) = @_;
251 524
252 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
268 glVertex $x + $self->{w}, $y + $self->{h}; 541 glVertex $x + $self->{w}, $y + $self->{h};
269 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
270 glEnd; 543 glEnd;
271 glDisable GL_BLEND; 544 glDisable GL_BLEND;
272 } 545 }
546
547 if ($ENV{CFPLUS_DEBUG}) {
548 glPushMatrix;
549 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
551 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0;
553 glVertex $self->{w} - 1, 0;
554 glVertex $self->{w} - 1, $self->{h} - 1;
555 glVertex 0 , $self->{h} - 1;
556 glEnd;
557 glPopMatrix;
558 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559 }
273} 560}
274 561
275sub _draw { 562sub _draw {
276 my ($self) = @_; 563 my ($self) = @_;
277 564
278 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
279} 566}
280 567
281sub find_widget {
282 my ($self, $x, $y) = @_;
283
284 return () unless $self->{can_events};
285
286 return $self
287 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
288 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
289
290 ()
291}
292
293sub set_parent {
294 my ($self, $parent) = @_;
295
296 Scalar::Util::weaken ($self->{parent} = $parent);
297}
298
299sub check_size {
300 my ($self) = @_;
301
302 return unless $self->{parent};
303
304 my ($w, $h) = $self->size_request;
305
306 if ($w != $self->{req_w} || $h != $self->{req_h}) {
307 $self->{req_w} = $w;
308 $self->{req_h} = $h;
309
310 $self->{parent}->check_size;
311 }
312}
313
314sub update {
315 my ($self) = @_;
316
317 $self->{parent}->update
318 if $self->{parent};
319}
320
321sub connect {
322 my ($self, $signal, $cb) = @_;
323
324 push @{ $self->{signal_cb}{$signal} }, $cb;
325}
326
327sub emit {
328 my ($self, $signal, @args) = @_;
329
330 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
331 $cb->($self, @args);
332 }
333}
334
335sub DESTROY { 568sub DESTROY {
336 my ($self) = @_; 569 my ($self) = @_;
337 570
571 delete $WIDGET{$self+0};
338 #$self->deactivate; 572 #$self->deactivate;
339} 573}
340 574
341############################################################################# 575#############################################################################
342 576
… …
351 my $class = shift; 585 my $class = shift;
352 586
353 # range [value, low, high, page] 587 # range [value, low, high, page]
354 588
355 $class->SUPER::new ( 589 $class->SUPER::new (
356 bg => [0, 0, 0, 0.2], 590 #bg => [0, 0, 0, 0.2],
357 active_bg => [1, 1, 1, 0.5], 591 #active_bg => [1, 1, 1, 0.5],
358 @_ 592 @_
359 ) 593 )
360} 594}
361 595
362sub _draw { 596sub _draw {
363 my ($self) = @_; 597 my ($self) = @_;
364 598
599 my $color = $FOCUS == $self && $self->{active_bg}
600 ? $self->{active_bg}
601 : $self->{bg};
602
603 if ($color && (@$color < 4 || $color->[3])) {
365 my ($w, $h) = @$self{qw(w h)}; 604 my ($w, $h) = @$self{qw(w h)};
366 605
367 glEnable GL_BLEND; 606 glEnable GL_BLEND;
368 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
369 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 608 glColor @$color;
370 609
371 glBegin GL_QUADS; 610 glBegin GL_QUADS;
372 glVertex 0 , 0; 611 glVertex 0 , 0;
373 glVertex 0 , $h; 612 glVertex 0 , $h;
374 glVertex $w, $h; 613 glVertex $w, $h;
375 glVertex $w, 0; 614 glVertex $w, 0;
376 glEnd; 615 glEnd;
377 616
378 glDisable GL_BLEND; 617 glDisable GL_BLEND;
618 }
379} 619}
380 620
381############################################################################# 621#############################################################################
382 622
383package CFClient::UI::Empty; 623package CFClient::UI::Empty;
… …
388 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
389 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
390} 630}
391 631
392sub size_request { 632sub size_request {
393 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
394} 636}
395 637
396sub draw { } 638sub draw { }
397 639
398############################################################################# 640#############################################################################
… …
404sub new { 646sub new {
405 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
406 648
407 my $children = delete $arg{children} || []; 649 my $children = delete $arg{children} || [];
408 650
409 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 651 my $self = $class->SUPER::new (
652 children => [],
653 can_events => 0,
654 %arg,
655 );
410 $self->add ($_) for @$children; 656 $self->add ($_) for @$children;
411 657
412 $self 658 $self
413} 659}
414 660
415sub add { 661sub add {
416 my ($self, $child) = @_; 662 my ($self, @widgets) = @_;
417 663
418 $child->set_parent ($self); 664 $_->set_parent ($self)
665 for @widgets;
419 666
420 use sort 'stable'; 667 use sort 'stable';
421 668
422 $self->{children} = [ 669 $self->{children} = [
423 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
424 @{$self->{children}}, $child 671 @{$self->{children}}, @widgets
425 ]; 672 ];
426 673
427 $child->check_size; 674 $self->realloc;
675}
676
677sub children {
678 @{ $_[0]{children} }
428} 679}
429 680
430sub remove { 681sub remove {
431 my ($self, $child) = @_; 682 my ($self, $child) = @_;
432 683
433 delete $child->{parent}; 684 delete $child->{parent};
685 $child->hide;
434 686
435 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
436 688
437 $self->check_size; 689 $self->realloc;
690}
691
692sub clear {
693 my ($self) = @_;
694
695 my $children = delete $self->{children};
696 $self->{children} = [];
697
698 for (@$children) {
699 delete $_->{parent};
700 $_->hide;
701 }
702
703 $self->realloc;
438} 704}
439 705
440sub find_widget { 706sub find_widget {
441 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
442 708
… …
495sub size_request { 761sub size_request {
496 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
497} 763}
498 764
499sub size_allocate { 765sub size_allocate {
500 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
501 767
502 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
503} 769}
504 770
505############################################################################# 771#############################################################################
… …
517} 783}
518 784
519sub update { 785sub update {
520 my ($self) = @_; 786 my ($self) = @_;
521 787
522 # we want to do this delayed... 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
523 $self->render_chld;
524 $self->SUPER::update; 789 $self->SUPER::update;
525} 790}
526 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
527sub render_chld { 804sub render_child {
528 my ($self) = @_; 805 my ($self) = @_;
529 806
530 $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 {
531 glClearColor 0, 0, 0, 1; 808 glClearColor 0, 0, 0, 0;
532 glClear GL_COLOR_BUFFER_BIT; 809 glClear GL_COLOR_BUFFER_BIT;
533 $self->child->draw; 810
811 $self->_render;
534 }; 812 };
535}
536
537sub size_allocate {
538 my ($self, $w, $h) = @_;
539
540 $self->child->configure (0, 0, $w, $h);
541
542 $self->render_chld;
543} 813}
544 814
545sub _draw { 815sub _draw {
546 my ($self) = @_; 816 my ($self) = @_;
547 817
548 my ($w, $h) = ($self->w, $self->h); 818 my ($w, $h) = ($self->w, $self->h);
549 819
550 my $tex = $self->{texture} 820 my $tex = $self->{texture}
551 or return; 821 or return;
552 822
553 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
555 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
556 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;
557 826
558 $tex->draw_quad (0, 0, $w, $h); 827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
559 828
560 glDisable GL_BLEND;
561 glDisable GL_TEXTURE_2D; 829 glDisable GL_TEXTURE_2D;
562} 830}
563 831
564############################################################################# 832#############################################################################
565 833
566package CFClient::UI::ViewPort; 834package CFClient::UI::ViewPort;
567 835
568our @ISA = CFClient::UI::Window::; 836our @ISA = CFClient::UI::Window::;
569
570sub new { die }
571
572sub size_request {
573 my ($self) = @_;
574
575 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
576 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
577
578 @$self{qw(child_w child_h)}
579}
580
581sub _draw {
582 my ($self) = @_;
583
584 $self->{children}[1]->draw;
585}
586
587
588#############################################################################
589
590package CFClient::UI::Frame;
591
592our @ISA = CFClient::UI::Bin::;
593
594use CFClient::OpenGL;
595 837
596sub new { 838sub new {
597 my $class = shift; 839 my $class = shift;
598 840
599 my $self = $class->SUPER::new ( 841 $class->SUPER::new (
600 bg => [1, 1, 1, 1], 842 scroll_x => 0,
601 border_bg => [1, 1, 1, 1], 843 scroll_y => 1,
602 border => 0.8,
603 @_ 844 @_,
604 ); 845 )
605
606 $self
607}
608
609sub set_size {
610 my ($self, $w, $h) = @_;
611 $self->{req_w} = $w;
612 $self->{req_h} = $h;
613 $self->check_size;
614} 846}
615 847
616sub size_request { 848sub size_request {
617 my ($self) = @_; 849 my ($self) = @_;
618 ($self->{req_w}, $self->{req_h}) 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)
619} 857}
620 858
621sub size_allocate { 859sub size_allocate {
622 my ($self, $w, $h) = @_; 860 my ($self, $w, $h, $changed) = @_;
623 $self->{w} = $w; 861
624 $self->{h} = $h; 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
625 $self->child->configure (0, 0, $w, $h); 865 $self->child->configure (0, 0, $w, $h);
866 $self->update;
626} 867}
627 868
628sub _draw { 869sub set_offset {
629 my ($self) = @_; 870 my ($self, $x, $y) = @_;
630 871
631 my ($w, $h) = ($self->{w}, $self->{h}); 872 $self->{view_x} = int $x;
873 $self->{view_y} = int $y;
632 874
633 glEnable GL_BLEND; 875 $self->update;
634 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 876}
635 glEnable GL_TEXTURE_2D;
636 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
637 877
638# glBegin GL_QUADS; 878# hmm, this does not work for topleft of $self... but we should not ask for that
639# glColor 0, 0, 0, 0; 879sub coord2local {
640# glVertex 0 , 0; 880 my ($self, $x, $y) = @_;
641# glVertex 0 , $h;
642# glVertex $w, $h;
643# glVertex $w, 0;
644# glEnd;
645 881
882 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
883}
646 884
647 $self->child->draw; 885sub coord2global {
648 glDisable GL_BLEND; 886 my ($self, $x, $y) = @_;
649 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;
650} 912}
651 913
652############################################################################# 914#############################################################################
653 915
654package CFClient::UI::FancyFrame; 916package CFClient::UI::ScrolledWindow;
655 917
656our @ISA = CFClient::UI::Bin::; 918our @ISA = CFClient::UI::HBox::;
657
658use CFClient::OpenGL;
659
660my @tex =
661 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
662 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
663 919
664sub new { 920sub new {
665 my $class = shift; 921 my $class = shift;
666 922
667 # 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;
668 1026
669 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
670 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
671 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
672 border => 0.8, 1030 border => 0.6,
673 can_events => 1, 1031 can_events => 1,
674 @_ 1032 @_
675 ); 1033 );
676 1034
677 $self->{title} &&= new CFClient::UI::Label 1035 $self->{title} &&= new CFClient::UI::Label
678 align => 0, 1036 align => 0,
679 valign => 1, 1037 valign => 1,
680 text => $self->{title}, 1038 text => $self->{title},
681 fontsize => 1; 1039 fontsize => $self->{border};
682 1040
683 $self 1041 $self
684} 1042}
685 1043
686sub border { 1044sub border {
687 int $_[0]{border} * $::FONTSIZE 1045 int $_[0]{border} * $::FONTSIZE
688} 1046}
689 1047
690sub size_request { 1048sub size_request {
691 my ($self) = @_; 1049 my ($self) = @_;
692
693 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
694 1050
695 my ($w, $h) = $self->SUPER::size_request; 1051 my ($w, $h) = $self->SUPER::size_request;
696 1052
697 ( 1053 (
698 $w + $self->border * 2, 1054 $w + $self->border * 2,
699 $h + $self->border * 2, 1055 $h + $self->border * 2,
700 ) 1056 )
701} 1057}
702 1058
703sub size_allocate { 1059sub size_allocate {
704 my ($self, $w, $h) = @_; 1060 my ($self, $w, $h, $changed) = @_;
1061
1062 return unless $changed;
705 1063
706 $h -= List::Util::max 0, $self->border * 2; 1064 $h -= List::Util::max 0, $self->border * 2;
707 $w -= List::Util::max 0, $self->border * 2; 1065 $w -= List::Util::max 0, $self->border * 2;
708 1066
709 $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)
710 if $self->{title}; 1068 if $self->{title};
711 1069
712 $self->child->configure ($self->border, $self->border, $w, $h); 1070 $self->child->configure ($self->border, $self->border, $w, $h);
713} 1071}
714 1072
715sub button_down { 1073sub button_down {
716 my ($self, $ev, $x, $y) = @_; 1074 my ($self, $ev, $x, $y) = @_;
717 1075
1076 my ($w, $h) = @$self{qw(w h)};
718 my $border = $self->border; 1077 my $border = $self->border;
719 1078
720 if ($x < $self->{w} && $x >= $self->{w} - $border 1079 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
721 && $y < $self->{h} && $y >= $self->{h} - $border) { 1080 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
722 1081
1082 if ($lr & $td) {
1083 my ($wx, $wy) = ($self->{x}, $self->{y});
723 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1084 my ($ox, $oy) = ($ev->{x}, $ev->{y});
724 my ($bw, $bh) = ($self->{w}, $self->{h}); 1085 my ($bw, $bh) = ($self->{w}, $self->{h});
725 1086
1087 my $mx = $x < $border;
1088 my $my = $y < $border;
1089
726 $self->{motion} = sub { 1090 $self->{motion} = sub {
727 my ($ev, $x, $y) = @_; 1091 my ($ev, $x, $y) = @_;
728 1092
729 ($x, $y) = ($ev->{x}, $ev->{y}); 1093 my $dx = $ev->{x} - $ox;
1094 my $dy = $ev->{y} - $oy;
730 1095
731 $self->{user_w} = $bw + $x - $ox; 1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
732 $self->{user_h} = $bh + $y - $oy; 1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
733 $self->check_size; 1098
1099 $self->realloc;
1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
734 }; 1101 };
735 1102
736 } elsif ($x >= 0 && $x < $self->{w} 1103 } elsif ($lr ^ $td) {
737 && $y >= 0 && $y < $border) {
738
739 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1104 my ($ox, $oy) = ($ev->{x}, $ev->{y});
740 my ($bx, $by) = ($self->{x}, $self->{y}); 1105 my ($bx, $by) = ($self->{x}, $self->{y});
741 1106
742 $self->{motion} = sub { 1107 $self->{motion} = sub {
743 my ($ev, $x, $y) = @_; 1108 my ($ev, $x, $y) = @_;
744 1109
745 ($x, $y) = ($ev->{x}, $ev->{y}); 1110 ($x, $y) = ($ev->{x}, $ev->{y});
746 1111
747 $self->move ($bx + $x - $ox, $by + $y - $oy); 1112 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
748 $self->update;
749 }; 1113 };
750 } 1114 }
751} 1115}
752 1116
753sub button_up { 1117sub button_up {
… …
766 my ($self) = @_; 1130 my ($self) = @_;
767 1131
768 my ($w, $h ) = ($self->{w}, $self->{h}); 1132 my ($w, $h ) = ($self->{w}, $self->{h});
769 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1133 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
770 1134
771 glEnable GL_BLEND;
772 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
773 glEnable GL_TEXTURE_2D; 1135 glEnable GL_TEXTURE_2D;
774 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
775 1137
776 my $border = $self->border; 1138 my $border = $self->border;
777 1139
778 glColor @{ $self->{border_bg} }; 1140 glColor @{ $self->{border_bg} };
779 $tex[1]->draw_quad (0, 0, $w, $border); 1141 $border[0]->draw_quad_alpha (0, 0, $w, $border);
780 $tex[3]->draw_quad (0, $border, $border, $ch); 1142 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
781 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1143 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
782 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1144 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
783 1145
784 my $bg = $tex[0]; 1146 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1147 glColor @{ $self->{bg} };
785 1148
786 # TODO: repeat texture not scale 1149 # TODO: repeat texture not scale
787 my $rep_x = $cw / $bg->{w}; 1150 # solve this better(?)
788 my $rep_y = $ch / $bg->{h}; 1151 $bg->{s} = $cw / $bg->{w};
789 1152 $bg->{t} = $ch / $bg->{h};
790 glColor @{ $self->{bg} };
791
792 $bg->{s} = $rep_x;
793 $bg->{t} = $rep_y;
794 $bg->{wrap_mode} = 1;
795 $bg->draw_quad ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 }
796 1155
797 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
798 glDisable GL_BLEND;
799 1157
800 $self->{title}->draw if $self->{title}; 1158 $self->{title}->draw if $self->{title};
1159
801 $self->child->draw; 1160 $self->child->draw;
802} 1161}
803 1162
804############################################################################# 1163#############################################################################
805 1164
… …
814sub new { 1173sub new {
815 my $class = shift; 1174 my $class = shift;
816 1175
817 $class->SUPER::new ( 1176 $class->SUPER::new (
818 col_expand => [], 1177 col_expand => [],
819 @_ 1178 @_,
820 ) 1179 )
1180}
1181
1182sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} }
821} 1184}
822 1185
823sub add { 1186sub add {
824 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
825 1188
826 $child->set_parent ($self); 1189 $child->set_parent ($self);
827 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
828 1191
829 $child->check_size; 1192 $self->realloc;
830} 1193}
831 1194
832# 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?
833sub clear { 1196sub clear {
834 my ($self) = @_; 1197 my ($self) = @_;
835 1198
1199 my @children = $self->children;
836 delete $self->{children}; 1200 delete $self->{children};
837 $self->update; 1201
1202 for (@children) {
1203 delete $_->{parent};
1204 $_->hide;
1205 }
1206
1207 $self->realloc;
838} 1208}
839 1209
840sub get_wh { 1210sub get_wh {
841 my ($self) = @_; 1211 my ($self) = @_;
842 1212
… …
869 (sum @$hs), 1239 (sum @$hs),
870 ) 1240 )
871} 1241}
872 1242
873sub size_allocate { 1243sub size_allocate {
874 my ($self, $w, $h) = @_; 1244 my ($self, $w, $h, $changed) = @_;
875 1245
876 my ($ws, $hs) = $self->get_wh; 1246 my ($ws, $hs) = $self->get_wh;
877 1247
878 my $req_w = sum @$ws; 1248 my $req_w = (sum @$ws) || 1;
879 my $req_h = sum @$hs; 1249 my $req_h = (sum @$hs) || 1;
880 1250
881 # TODO: nicer code && do row_expand 1251 # TODO: nicer code && do row_expand
882 my @col_expand = @{$self->{col_expand}}; 1252 my @col_expand = @{$self->{col_expand}};
883 @col_expand = (1) x @$ws unless @col_expand; 1253 @col_expand = (1) x @$ws unless @col_expand;
884 my $col_expand = (sum @col_expand) || 1; 1254 my $col_expand = (sum @col_expand) || 1;
… …
938 } 1308 }
939} 1309}
940 1310
941############################################################################# 1311#############################################################################
942 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
943package CFClient::UI::HBox; 1373package CFClient::UI::HBox;
944 1374
945# TODO: wrap into common Box base class
946
947our @ISA = CFClient::UI::Container::; 1375our @ISA = CFClient::UI::Box::;
948 1376
949sub size_request { 1377sub new {
950 my ($self) = @_; 1378 my $class = shift;
951 1379
952 my @alloc = map [$_->size_request], @{$self->{children}}; 1380 $class->SUPER::new (
953 1381 vertical => 0,
954 ( 1382 @_,
955 (List::Util::sum map $_->[0], @alloc),
956 (List::Util::max map $_->[1], @alloc),
957 ) 1383 )
958} 1384}
959 1385
960sub size_allocate {
961 my ($self, $w, $h) = @_;
962
963 ($h, $w) = ($w, $h);
964
965 my $children = $self->{children};
966
967 my @h = map $_->{req_w}, @$children;
968
969 my $req_h = List::Util::sum @h;
970
971 if ($req_h > $h) {
972 # ah well, not enough space
973 $_ *= $h / $req_h for @h;
974 } else {
975 my $exp = List::Util::sum map $_->{expand}, @$children;
976 $exp ||= 1;
977
978 for (0 .. $#$children) {
979 my $child = $children->[$_];
980
981 my $alloc_h = $h[$_];
982 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
983 $h[$_] = $alloc_h;
984 }
985 }
986
987 CFClient::UI::harmonize \@h;
988
989 my $y = 0;
990 for (0 .. $#$children) {
991 my $child = $children->[$_];
992 my $h = $h[$_];
993 $child->configure ($y, 0, $h, $w);
994
995 $y += $h;
996 }
997
998 1
999}
1000
1001############################################################################# 1386#############################################################################
1002 1387
1003package CFClient::UI::VBox; 1388package CFClient::UI::VBox;
1004 1389
1005# TODO: wrap into common Box base class
1006
1007our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Box::;
1008 1391
1009sub size_request { 1392sub new {
1010 my ($self) = @_; 1393 my $class = shift;
1011 1394
1012 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $class->SUPER::new (
1013 1396 vertical => 1,
1014 ( 1397 @_,
1015 (List::Util::max map $_->[0], @alloc),
1016 (List::Util::sum map $_->[1], @alloc),
1017 ) 1398 )
1018} 1399}
1019 1400
1020sub size_allocate {
1021 my ($self, $w, $h) = @_;
1022
1023 my $children = $self->{children};
1024
1025 my @h = map $_->{req_h}, @$children;
1026
1027 my $req_h = List::Util::sum @h;
1028
1029 if ($req_h > $h) {
1030 # ah well, not enough space
1031 $_ *= $h / $req_h for @h;
1032 } else {
1033 my $exp = List::Util::sum map $_->{expand}, @$children;
1034 $exp ||= 1;
1035
1036 for (0 .. $#$children) {
1037 my $child = $children->[$_];
1038
1039 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1040 }
1041 }
1042
1043 CFClient::UI::harmonize \@h;
1044
1045 my $y = 0;
1046 for (0 .. $#$children) {
1047 my $child = $children->[$_];
1048 my $h = $h[$_];
1049 $child->configure (0, $y, $w, $h);
1050
1051 $y += $h;
1052 }
1053
1054 1
1055}
1056
1057############################################################################# 1401#############################################################################
1058 1402
1059package CFClient::UI::Label; 1403package CFClient::UI::Label;
1060 1404
1061our @ISA = CFClient::UI::Base::; 1405our @ISA = CFClient::UI::DrawBG::;
1062 1406
1063use CFClient::OpenGL; 1407use CFClient::OpenGL;
1064 1408
1065sub new { 1409sub new {
1066 my ($class, %arg) = @_; 1410 my ($class, %arg) = @_;
1067 1411
1068 my $self = $class->SUPER::new ( 1412 my $self = $class->SUPER::new (
1069 fg => [1, 1, 1], 1413 fg => [1, 1, 1],
1414 #bg => none
1415 #active_bg => none
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),
1070 fontsize => 1, 1422 fontsize => 1,
1071 text => "",
1072 align => -1, 1423 align => -1,
1073 valign => -1, 1424 valign => -1,
1074 padding => 2, 1425 padding => 2,
1075 layout => new CFClient::Layout,
1076 can_events => 0, 1426 can_events => 0,
1077 %arg 1427 %arg
1078 ); 1428 );
1079 1429
1080 if (exists $self->{template}) { 1430 if (exists $self->{template}) {
1081 my $layout = new CFClient::Layout; 1431 my $layout = new CFClient::Layout;
1082 $layout->set_text (delete $self->{template}); 1432 $layout->set_text (delete $self->{template});
1083 $self->{template} = $layout; 1433 $self->{template} = $layout;
1084 } 1434 }
1085 1435
1086 $self->set_text (delete $self->{text}) if exists $self->{text}; 1436 if (exists $self->{markup}) {
1087 $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 }
1088 1441
1089 $self 1442 $self
1090} 1443}
1091 1444
1092sub escape_text { 1445sub escape($) {
1093 local $_ = $_[1]; 1446 local $_ = $_[0];
1094 1447
1095 s/&/&amp;/g; 1448 s/&/&amp;/g;
1096 s/>/&gt;/g; 1449 s/>/&gt;/g;
1097 s/</&lt;/g; 1450 s/</&lt;/g;
1098 1451
1099 $_[1] 1452 $_
1453}
1454
1455sub update {
1456 my ($self) = @_;
1457
1458 delete $self->{texture};
1459 $self->SUPER::update;
1100} 1460}
1101 1461
1102sub set_text { 1462sub set_text {
1103 my ($self, $text) = @_; 1463 my ($self, $text) = @_;
1104 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;
1105 $self->{layout}->set_text ($text); 1469 $self->{layout}->set_text ($text);
1106 1470
1107 delete $self->{texture}; 1471 $self->realloc;
1108 $self->check_size;
1109 $self->update; 1472 $self->update;
1110} 1473}
1111 1474
1112sub set_markup { 1475sub set_markup {
1113 my ($self, $markup) = @_; 1476 my ($self, $markup) = @_;
1114 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;
1115 $self->{layout}->set_markup ($markup); 1484 $self->{layout}->set_markup ($markup);
1116 1485
1117 delete $self->{texture}; 1486 $self->realloc;
1118 $self->check_size;
1119 $self->update; 1487 $self->update;
1120} 1488}
1121 1489
1122sub size_request { 1490sub size_request {
1123 my ($self) = @_; 1491 my ($self) = @_;
1124 1492
1125 $self->{layout}->set_width; 1493 $self->{layout}->set_font ($self->{font}) if $self->{font};
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});
1126 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1127 1498
1128 my ($w, $h) = $self->{layout}->size; 1499 my ($w, $h) = $self->{layout}->size;
1129 1500
1130 if (exists $self->{template}) { 1501 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font};
1131 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1132 1504
1133 my ($w2, $h2) = $self->{template}->size; 1505 my ($w2, $h2) = $self->{template}->size;
1134 1506
1135 $w = List::Util::max $w, $w2; 1507 $w = List::Util::max $w, $w2;
… …
1141 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1142 ) 1514 )
1143} 1515}
1144 1516
1145sub size_allocate { 1517sub size_allocate {
1146 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1147 1519
1148 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1149} 1522}
1150 1523
1151sub set_fontsize { 1524sub set_fontsize {
1152 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1153 1526
1154 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1155 $self->check_size; 1528 delete $self->{texture};
1529
1530 $self->realloc;
1156} 1531}
1157 1532
1158sub _draw { 1533sub _draw {
1159 my ($self) = @_; 1534 my ($self) = @_;
1160 1535
1536 $self->SUPER::_draw; # draw background, if applicable
1537
1161 my $tex = $self->{texture} ||= do { 1538 my $tex = $self->{texture} ||= do {
1539 $self->{layout}->set_foreground (@{$self->{fg}});
1540 $self->{layout}->set_font ($self->{font}) if $self->{font};
1162 $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});
1163 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545
1164 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
1165 }; 1557 };
1166 1558
1167 glEnable GL_BLEND;
1168 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1169 glEnable GL_TEXTURE_2D; 1559 glEnable GL_TEXTURE_2D;
1170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1171 1561
1562 if ($tex->{format} == GL_ALPHA) {
1172 glColor @{$self->{fg}}; 1563 glColor @{$self->{fg}};
1173
1174 $self->{ox} = int (
1175 $self->{align} < 0 ? $self->{padding}
1176 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1177 : ($self->{w} - $tex->{w}) * 0.5
1178 );
1179
1180 $self->{oy} = int (
1181 $self->{valign} < 0 ? $self->{padding}
1182 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1183 : ($self->{h} - $tex->{h}) * 0.5
1184 );
1185
1186 $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 }
1187 1568
1188 glDisable GL_TEXTURE_2D; 1569 glDisable GL_TEXTURE_2D;
1189 glDisable GL_BLEND;
1190} 1570}
1191 1571
1192############################################################################# 1572#############################################################################
1193 1573
1194package CFClient::UI::EntryBase; 1574package CFClient::UI::EntryBase;
… …
1199 1579
1200sub new { 1580sub new {
1201 my $class = shift; 1581 my $class = shift;
1202 1582
1203 $class->SUPER::new ( 1583 $class->SUPER::new (
1204 fg => [1, 1, 1], 1584 fg => [1, 1, 1],
1205 bg => [0, 0, 0, 0.2], 1585 bg => [0, 0, 0, 0.2],
1206 active_bg => [1, 1, 1, 0.5], 1586 active_bg => [1, 1, 1, 0.5],
1207 active_fg => [0, 0, 0], 1587 active_fg => [0, 0, 0],
1208 can_hover => 1, 1588 can_hover => 1,
1209 can_focus => 1, 1589 can_focus => 1,
1210 valign => 0, 1590 valign => 0,
1211 can_events => 1, 1591 can_events => 1,
1592 #text => ...
1212 @_ 1593 @_
1213 ) 1594 )
1214} 1595}
1215 1596
1216sub _set_text { 1597sub _set_text {
… …
1226 $self->{text} = $text; 1607 $self->{text} = $text;
1227 1608
1228 $text =~ s/./*/g if $self->{hidden}; 1609 $text =~ s/./*/g if $self->{hidden};
1229 $self->{layout}->set_text ("$text "); 1610 $self->{layout}->set_text ("$text ");
1230 1611
1231 $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;
1232} 1622}
1233 1623
1234sub get_text { 1624sub get_text {
1235 $_[0]{text} 1625 $_[0]{text}
1236} 1626}
… …
1239 my ($self) = @_; 1629 my ($self) = @_;
1240 1630
1241 my ($w, $h) = $self->SUPER::size_request; 1631 my ($w, $h) = $self->SUPER::size_request;
1242 1632
1243 ($w + 1, $h) # add 1 for cursor 1633 ($w + 1, $h) # add 1 for cursor
1244}
1245
1246sub size_allocate {
1247 my ($self, $w, $h) = @_;
1248
1249 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1250}
1251
1252sub set_text {
1253 my ($self, $text) = @_;
1254
1255 $self->{cursor} = length $text;
1256 $self->_set_text ($text);
1257 $self->update;
1258} 1634}
1259 1635
1260sub key_down { 1636sub key_down {
1261 my ($self, $ev) = @_; 1637 my ($self, $ev) = @_;
1262 1638
… …
1264 my $sym = $ev->{sym}; 1640 my $sym = $ev->{sym};
1265 my $uni = $ev->{unicode}; 1641 my $uni = $ev->{unicode};
1266 1642
1267 my $text = $self->get_text; 1643 my $text = $self->get_text;
1268 1644
1269 if ($sym == 8) { 1645 if ($uni == 8) {
1270 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1646 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1271 } elsif ($sym == 127) { 1647 } elsif ($uni == 127) {
1272 substr $text, $self->{cursor}, 1, ""; 1648 substr $text, $self->{cursor}, 1, "";
1273 } elsif ($sym == CFClient::SDLK_LEFT) { 1649 } elsif ($sym == CFClient::SDLK_LEFT) {
1274 --$self->{cursor} if $self->{cursor}; 1650 --$self->{cursor} if $self->{cursor};
1275 } elsif ($sym == CFClient::SDLK_RIGHT) { 1651 } elsif ($sym == CFClient::SDLK_RIGHT) {
1276 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1652 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1277 } elsif ($sym == CFClient::SDLK_HOME) { 1653 } elsif ($sym == CFClient::SDLK_HOME) {
1278 $self->{cursor} = 0; 1654 $self->{cursor} = 0;
1279 } elsif ($sym == CFClient::SDLK_END) { 1655 } elsif ($sym == CFClient::SDLK_END) {
1280 $self->{cursor} = length $text; 1656 $self->{cursor} = length $text;
1281 } elsif ($sym == 27) { 1657 } elsif ($uni == 27) {
1282 $self->emit ('escape'); 1658 $self->_emit ('escape');
1283 } elsif ($uni) { 1659 } elsif ($uni) {
1284 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1285 } 1661 }
1286 1662
1287 $self->_set_text ($text); 1663 $self->_set_text ($text);
1288 $self->update; 1664
1665 $self->realloc;
1289} 1666}
1290 1667
1291sub focus_in { 1668sub focus_in {
1292 my ($self) = @_; 1669 my ($self) = @_;
1293 1670
… …
1369 my ($self, $ev) = @_; 1746 my ($self, $ev) = @_;
1370 1747
1371 my $sym = $ev->{sym}; 1748 my $sym = $ev->{sym};
1372 1749
1373 if ($sym == 13) { 1750 if ($sym == 13) {
1751 unshift @{$self->{history}},
1752 my $txt = $self->get_text;
1753 $self->{history_pointer} = -1;
1754 $self->{history_saveback} = '';
1374 $self->emit (activate => $self->get_text); 1755 $self->_emit (activate => $txt);
1375 $self->update; 1756 $self->update;
1757
1758 } elsif ($sym == CFClient::SDLK_UP) {
1759 if ($self->{history_pointer} < 0) {
1760 $self->{history_saveback} = $self->get_text;
1761 }
1762 if (@{$self->{history} || []} > 0) {
1763 $self->{history_pointer}++;
1764 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1765 $self->{history_pointer} = @{$self->{history} || []} - 1;
1766 }
1767 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1768 }
1769
1770 } elsif ($sym == CFClient::SDLK_DOWN) {
1771 $self->{history_pointer}--;
1772 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1773
1774 if ($self->{history_pointer} >= 0) {
1775 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1776 } else {
1777 $self->set_text ($self->{history_saveback});
1778 }
1376 1779
1377 } else { 1780 } else {
1378 $self->SUPER::key_down ($ev); 1781 $self->SUPER::key_down ($ev);
1379 } 1782 }
1380 1783
… …
1394 1797
1395sub new { 1798sub new {
1396 my $class = shift; 1799 my $class = shift;
1397 1800
1398 $class->SUPER::new ( 1801 $class->SUPER::new (
1399 padding => 4, 1802 padding => 4,
1400 fg => [1, 1, 1], 1803 fg => [1, 1, 1],
1401 bg => [1, 1, 1, 0.2],
1402 active_fg => [0, 0, 1], 1804 active_fg => [0, 0, 1],
1403 can_hover => 1, 1805 can_hover => 1,
1404 align => 0, 1806 align => 0,
1405 valign => 0, 1807 valign => 0,
1406 can_events => 1, 1808 can_events => 1,
1407 @_ 1809 @_
1408 ) 1810 )
1409} 1811}
1410 1812
1813sub activate { }
1814
1411sub button_up { 1815sub button_up {
1412 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1413 1817
1818 $self->emit ("activate")
1414 if ($x >= 0 && $x < $self->{w} 1819 if $x >= 0 && $x < $self->{w}
1415 && $y >= 0 && $y < $self->{h}) { 1820 && $y >= 0 && $y < $self->{h};
1416 $self->emit ("activate");
1417 }
1418} 1821}
1419 1822
1420sub _draw { 1823sub _draw {
1421 my ($self) = @_; 1824 my ($self) = @_;
1422 1825
… …
1424 1827
1425 if ($GRAB == $self) { 1828 if ($GRAB == $self) {
1426 $self->{fg} = $self->{active_fg}; 1829 $self->{fg} = $self->{active_fg};
1427 } 1830 }
1428 1831
1429 glEnable GL_BLEND;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1431 glEnable GL_TEXTURE_2D; 1832 glEnable GL_TEXTURE_2D;
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1433 glColor 0, 0, 0, 1; 1834 glColor 0, 0, 0, 1;
1434 1835
1435 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1836 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1436 1837
1437 glDisable GL_TEXTURE_2D; 1838 glDisable GL_TEXTURE_2D;
1438 glDisable GL_BLEND;
1439 1839
1440 $self->SUPER::_draw; 1840 $self->SUPER::_draw;
1441} 1841}
1442 1842
1443############################################################################# 1843#############################################################################
… …
1457 1857
1458 $class->SUPER::new ( 1858 $class->SUPER::new (
1459 padding => 2, 1859 padding => 2,
1460 fg => [1, 1, 1], 1860 fg => [1, 1, 1],
1461 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],
1462 state => 0, 1864 state => 0,
1463 can_hover => 1, 1865 can_hover => 1,
1464 @_ 1866 @_
1465 ) 1867 )
1466} 1868}
… …
1475 my ($self, $ev, $x, $y) = @_; 1877 my ($self, $ev, $x, $y) = @_;
1476 1878
1477 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1478 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1479 $self->{state} = !$self->{state}; 1881 $self->{state} = !$self->{state};
1480 $self->emit (changed => $self->{state}); 1882 $self->_emit (changed => $self->{state});
1481 } 1883 }
1482} 1884}
1483 1885
1484sub _draw { 1886sub _draw {
1485 my ($self) = @_; 1887 my ($self) = @_;
… …
1490 1892
1491 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;
1492 1894
1493 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1494 1896
1495 glEnable GL_BLEND; 1897 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898
1496 glEnable GL_TEXTURE_2D; 1899 glEnable GL_TEXTURE_2D;
1497 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1498
1499 my $tex = $self->{state} ? $tex[1] : $tex[0];
1500
1501 $tex->draw_quad (0, 0, $s, $s); 1900 $tex->draw_quad_alpha (0, 0, $s, $s);
1502
1503 glDisable GL_TEXTURE_2D; 1901 glDisable GL_TEXTURE_2D;
1504 glDisable GL_BLEND;
1505} 1902}
1506 1903
1507############################################################################# 1904#############################################################################
1508 1905
1509package CFClient::UI::Image; 1906package CFClient::UI::Image;
… …
1552 glTranslate 0, -$self->{w}, 0; 1949 glTranslate 0, -$self->{w}, 0;
1553 1950
1554 ($w, $h) = ($h, $w); 1951 ($w, $h) = ($h, $w);
1555 } 1952 }
1556 1953
1557 glEnable GL_BLEND;
1558 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1559 glEnable GL_TEXTURE_2D; 1954 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561 1956
1562 $tex->draw_quad (0, 0, $w, $h); 1957 $tex->draw_quad_alpha (0, 0, $w, $h);
1563 1958
1564 glDisable GL_BLEND;
1565 glDisable GL_TEXTURE_2D; 1959 glDisable GL_TEXTURE_2D;
1566} 1960}
1567 1961
1568############################################################################# 1962#############################################################################
1569 1963
1570package CFClient::UI::VGauge; 1964package CFClient::UI::VGauge;
1571 1965
1572our @ISA = CFClient::UI::Base::; 1966our @ISA = CFClient::UI::Base::;
1967
1968use List::Util qw(min max);
1573 1969
1574use CFClient::OpenGL; 1970use CFClient::OpenGL;
1575 1971
1576my %tex = ( 1972my %tex = (
1577 food => [ 1973 food => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1974 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1975 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1580 ], 1976 ],
1581 grace => [ 1977 grace => [
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1978 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1583 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1979 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1584 ], 1980 ],
1585 hp => [ 1981 hp => [
1586 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1982 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1587 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1983 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1588 ], 1984 ],
1589 mana => [ 1985 mana => [
1590 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1986 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1591 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1987 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1592 ], 1988 ],
1593); 1989);
1594 1990
1595# eg. VGauge->new (gauge => 'food'), default gauge: food 1991# eg. VGauge->new (gauge => 'food'), default gauge: food
1596sub new { 1992sub new {
… …
1615} 2011}
1616 2012
1617sub set_max { 2013sub set_max {
1618 my ($self, $max) = @_; 2014 my ($self, $max) = @_;
1619 2015
2016 return if $self->{max_val} == $max;
2017
1620 $self->{max_val} = $max; 2018 $self->{max_val} = $max;
2019 $self->update;
1621} 2020}
1622 2021
1623sub set_value { 2022sub set_value {
1624 my ($self, $val, $max) = @_; 2023 my ($self, $val, $max) = @_;
1625 2024
1626 $self->set_max ($max) 2025 $self->set_max ($max)
1627 if defined $max; 2026 if defined $max;
1628 2027
1629 $max = $self->{max_val}; 2028 return if $self->{val} == $val;
2029
1630 $self->{val} = $val; 2030 $self->{val} = $val;
1631
1632 $self->update; 2031 $self->update;
1633} 2032}
1634 2033
1635sub _draw { 2034sub _draw {
1636 my ($self) = @_; 2035 my ($self) = @_;
1637 2036
1638 my $tex = $tex{$self->{type}}; 2037 my $tex = $tex{$self->{type}};
2038 my ($t1, $t2, $t3) = @$tex;
1639 2039
1640 my ($w, $h) = ($self->{w}, $self->{h}); 2040 my ($w, $h) = ($self->{w}, $self->{h});
1641 2041
1642 if ($self->{vertical}) { 2042 if ($self->{vertical}) {
1643 glRotate 90, 0, 0, 1; 2043 glRotate 90, 0, 0, 1;
… …
1645 2045
1646 ($w, $h) = ($h, $w); 2046 ($w, $h) = ($h, $w);
1647 } 2047 }
1648 2048
1649 my $ycut = $self->{val} / ($self->{max_val} || 1); 2049 my $ycut = $self->{val} / ($self->{max_val} || 1);
1650 $ycut = 1 if $self->{val} > $self->{max_val};
1651 2050
1652 my $t1 = $tex->[0]; 2051 my $ycut1 = max 0, min 1, $ycut;
1653 my $t2 = $tex->[1]; 2052 my $ycut2 = max 0, min 1, $ycut - 1;
2053
2054 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2);
1654 2056
1655 glEnable GL_BLEND; 2057 glEnable GL_BLEND;
1656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1657 glEnable GL_TEXTURE_2D; 2059 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 2061
1660 my $h1 = $self->{h} - $ycut * $self->{h};
1661 my $h2 = $ycut * $self->{h};
1662
1663 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2062 glBindTexture GL_TEXTURE_2D, $t1->{name};
1664 glBegin GL_QUADS; 2063 glBegin GL_QUADS;
1665 glTexCoord 0 , 0; glVertex 0 , 0; 2064 glTexCoord 0 , 0; glVertex 0 , 0;
1666 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2065 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1667 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2066 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1668 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2067 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1669 glEnd; 2068 glEnd;
1670 2069
2070 my $ycut1 = List::Util::min 1, $ycut;
1671 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2071 glBindTexture GL_TEXTURE_2D, $t2->{name};
1672 glBegin GL_QUADS; 2072 glBegin GL_QUADS;
1673 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2073 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1674 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2074 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1675 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2075 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1676 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2076 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1677 glEnd; 2077 glEnd;
2078
2079 if ($t3) {
2080 glBindTexture GL_TEXTURE_2D, $t3->{name};
2081 glBegin GL_QUADS;
2082 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2083 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2084 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2085 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2086 glEnd;
2087 }
1678 2088
1679 glDisable GL_BLEND; 2089 glDisable GL_BLEND;
1680 glDisable GL_TEXTURE_2D; 2090 glDisable GL_TEXTURE_2D;
1681} 2091}
1682 2092
… …
1685package CFClient::UI::Gauge; 2095package CFClient::UI::Gauge;
1686 2096
1687our @ISA = CFClient::UI::VBox::; 2097our @ISA = CFClient::UI::VBox::;
1688 2098
1689sub new { 2099sub new {
1690 my ($class, %arg) = shift; 2100 my ($class, %arg) = @_;
1691 2101
1692 my $self = $class->SUPER::new ( 2102 my $self = $class->SUPER::new (
1693 @_, 2103 tooltip => $arg{type},
2104 can_hover => 1,
2105 can_events => 1,
2106 %arg,
1694 ); 2107 );
1695 2108
1696 $self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 2109 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
2110 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1697 $self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 2111 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1698 $self->add ($self->{value});
1699 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1700 $self->add ($self->{max});
1701 2112
1702 $self 2113 $self
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707 (($self->{max}->size_request)[0], 0)
1708} 2114}
1709 2115
1710sub set_fontsize { 2116sub set_fontsize {
1711 my ($self, $fsize) = @_; 2117 my ($self, $fsize) = @_;
1712 2118
1713 $self->{value}->set_fontsize ($fsize); 2119 $self->{value}->set_fontsize ($fsize);
1714 $self->{max} ->set_fontsize ($fsize); 2120 $self->{max} ->set_fontsize ($fsize);
1715} 2121}
1716 2122
2123sub set_max {
2124 my ($self, $max) = @_;
2125
2126 $self->{gauge}->set_max ($max);
2127 $self->{max}->set_text ($max);
2128}
2129
1717sub set_value { 2130sub set_value {
1718 my ($self, $val, $max) = @_; 2131 my ($self, $val, $max) = @_;
1719 2132
1720 $self->set_max ($max) 2133 $self->set_max ($max)
1721 if defined $max; 2134 if defined $max;
1722 2135
1723 $self->{gauge}->set_value ($val, $max); 2136 $self->{gauge}->set_value ($val, $max);
1724 $self->{value}->set_text ($val); 2137 $self->{value}->set_text ($val);
1725}
1726
1727sub set_max {
1728 my ($self, $max) = @_;
1729
1730 $self->{gauge}->set_max ($max);
1731 $self->{max}->set_text ($max);
1732} 2138}
1733 2139
1734############################################################################# 2140#############################################################################
1735 2141
1736package CFClient::UI::Slider; 2142package CFClient::UI::Slider;
… …
1746 qw(s1_slider.png s1_slider_bg.png); 2152 qw(s1_slider.png s1_slider_bg.png);
1747 2153
1748sub new { 2154sub new {
1749 my $class = shift; 2155 my $class = shift;
1750 2156
1751 # range [value, low, high, page] 2157 # range [value, low, high, page, unit]
1752 2158
1753 # TODO: 0-width page 2159 # TODO: 0-width page
1754 # TODO: req_w/h are wrong with vertical 2160 # TODO: req_w/h are wrong with vertical
1755 # TODO: calculations are off 2161 # TODO: calculations are off
1756 my $self = $class->SUPER::new ( 2162 my $self = $class->SUPER::new (
1757 fg => [1, 1, 1], 2163 fg => [1, 1, 1],
1758 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],
1759 range => [0, 0, 100, 10], 2167 range => [0, 0, 100, 10, 0],
1760 req_w => 20, 2168 min_w => $::WIDTH / 80,
1761 req_h => 20, 2169 min_h => $::WIDTH / 80,
1762 vertical => 0, 2170 vertical => 0,
1763 can_hover => 1, 2171 can_hover => 1,
1764 inner_pad => 5, 2172 inner_pad => 0.02,
1765 @_ 2173 @_
1766 ); 2174 );
1767 2175
2176 $self->set_value ($self->{range}[0]);
2177 $self->update;
2178
1768 $self 2179 $self
1769} 2180}
1770 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
1771sub size_request { 2216sub size_request {
1772 my ($self) = @_; 2217 my ($self) = @_;
1773 2218
1774 my $w = $self->{req_w}; 2219 ($self->{req_w}, $self->{req_h})
1775 my $h = $self->{req_h};
1776
1777 $self->{vertical} ? ($h, $w) : ($w, $h)
1778} 2220}
1779 2221
1780sub button_down { 2222sub button_down {
1781 my ($self, $ev, $x, $y) = @_; 2223 my ($self, $ev, $x, $y) = @_;
1782 2224
1783 $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
1784 $self->mouse_motion ($ev, $x, $y); 2229 $self->mouse_motion ($ev, $x, $y);
1785} 2230}
1786 2231
1787sub mouse_motion { 2232sub mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1789 2234
1790 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
1791 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2252 my ($value, $lo, $hi, $page) = @{$self->{range}};
2253 my $range = ($hi - $page - $lo) || 1e-100;
1792 2254
1793 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2255 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1794 2256
1795 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2257 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1796 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2258 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1797 2259
1798 $x -= $inner_pad_px; # substract the padding 2260 $value = ($value - $lo) / $range;
1799 $x = $x * ($hi - $lo) / $inner_w + $lo; 2261 $value = $value * $self->{scale} + $self->{offset};
1800 $x = $lo if $x < $lo;
1801 $x = $hi - $page if $x > $hi - $page;
1802 $self->{range}[0] = $x;
1803 2262
1804 $self->emit (changed => $x); 2263 $self->{knob_x} = $value - $knob_w * 0.5;
1805 $self->update; 2264 $self->{knob_w} = $knob_w;
1806 } 2265 });
1807}
1808 2266
1809# the inner_* stuff is for generating a padding for the slider handle, 2267 $self->SUPER::update;
1810# so that the handle doesn't leave the texture. This calculation isn't 100%
1811# correct propably, but it does the job for now
1812sub _calc_inner_pad_px {
1813 my ($self, $w) = @_;
1814 ($w / 100) * $self->{inner_pad} # % to pixels
1815} 2268}
1816 2269
1817sub _draw { 2270sub _draw {
1818 my ($self) = @_; 2271 my ($self) = @_;
1819 2272
1820 $self->SUPER::_draw (); 2273 $self->SUPER::_draw ();
1821 2274
1822 my ($w, $h) = @$self{qw(w h)}; 2275 glScale $self->{w}, $self->{h};
1823 2276
1824 if ($self->{vertical}) { 2277 if ($self->{vertical}) {
1825 # draw a vertical slider like a rotated horizontal slider 2278 # draw a vertical slider like a rotated horizontal slider
1826 2279
2280 glTranslate 1, 0, 0;
1827 glRotate 90, 0, 0, 1; 2281 glRotate 90, 0, 0, 1;
1828 glTranslate 0, -$self->{w}, 0;
1829
1830 ($w, $h) = ($h, $w);
1831 } 2282 }
1832 2283
1833 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2284 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1834 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2285 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1835 2286
1836 my ($value, $lo, $hi, $page) = @{$self->{range}};
1837
1838 $hi = $value + 1 if $lo == $hi;
1839
1840 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1841 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1842
1843 $page = int $page * $inner_w / ($hi - $lo);
1844 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1845
1846 $w -= $page;
1847 $page &= ~1;
1848 glTranslate $page * 0.5, 0, 0;
1849 $page ||= 2;
1850
1851 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1852 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1853
1854 glEnable GL_BLEND;
1855 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1856 glEnable GL_TEXTURE_2D; 2287 glEnable GL_TEXTURE_2D;
1857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2288 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1858 2289
1859 # draw background 2290 # draw background
1860 $tex[1]->draw_quad (0, 0, $w, $h); 2291 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1861 2292
1862 # draw handle 2293 # draw handle
1863 $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);
1864 2295
1865 glDisable GL_BLEND;
1866 glDisable GL_TEXTURE_2D; 2296 glDisable GL_TEXTURE_2D;
1867} 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 (@_) }
1868 2339
1869############################################################################# 2340#############################################################################
1870 2341
1871package CFClient::UI::TextView; 2342package CFClient::UI::TextView;
1872 2343
… …
1876 2347
1877sub new { 2348sub new {
1878 my $class = shift; 2349 my $class = shift;
1879 2350
1880 my $self = $class->SUPER::new ( 2351 my $self = $class->SUPER::new (
1881 fontsize => 1, 2352 fontsize => 1,
2353 can_events => 0,
2354 #font => default_font
1882 @_, 2355 @_,
1883 2356
1884 layout => (new CFClient::Layout), 2357 layout => (new CFClient::Layout 1),
1885 par => [], 2358 par => [],
1886 height => 0, 2359 height => 0,
1887 children => [ 2360 children => [
1888 (new CFClient::UI::Empty expand => 1), 2361 (new CFClient::UI::Empty expand => 1),
1889 (new CFClient::UI::Slider vertical => 1), 2362 (new CFClient::UI::Slider vertical => 1),
1890 ], 2363 ],
1891 ); 2364 );
1892 2365
1893 $self->{children}[1]->connect (changed => sub { 2366 $self->{children}[1]->connect (changed => sub { $self->update });
1894 $self->update;
1895 });
1896 2367
1897 $self 2368 $self
1898} 2369}
1899 2370
1900sub set_fontsize { 2371sub set_fontsize {
… …
1902 2373
1903 $self->{fontsize} = $fontsize; 2374 $self->{fontsize} = $fontsize;
1904 $self->reflow; 2375 $self->reflow;
1905} 2376}
1906 2377
2378sub size_allocate {
2379 my ($self, $w, $h, $changed) = @_;
2380
2381 $self->SUPER::size_allocate ($w, $h, $changed);
2382
2383 return unless $changed;
2384
2385 $self->{layout}->set_font ($self->{font}) if $self->{font};
2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387 $self->{layout}->set_width ($self->{children}[0]{w});
2388
2389 $self->reflow;
2390}
2391
1907sub text_height { 2392sub text_size {
1908 my ($self, $text) = @_; 2393 my ($self, $text, $indent) = @_;
1909 2394
1910 my $layout = $self->{layout}; 2395 my $layout = $self->{layout};
1911 2396
1912 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $layout->set_width ($self->{w}); 2398 $layout->set_width ($self->{children}[0]{w} - $indent);
1914 $layout->set_text ($text); 2399 $layout->set_markup ($text);
1915 2400
1916 ($layout->size)[1] 2401 $layout->size
1917} 2402}
1918 2403
1919sub reflow { 2404sub reflow {
1920 my ($self) = @_; 2405 my ($self) = @_;
1921 2406
1922 $self->{need_reflow}++; 2407 $self->{need_reflow}++;
1923 $self->update; 2408 $self->update;
1924} 2409}
1925 2410
1926sub size_allocate { 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 {
1927 my ($self, $w, $h) = @_; 2419 my ($self) = @_;
1928 2420
1929 $self->SUPER::size_allocate ($w, $h); 2421 $self->{par} = [];
1930 2422 $self->{height} = 0;
1931 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2423 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1932 $self->{layout}->set_width ($self->{children}[0]{w});
1933
1934 $self->reflow;
1935} 2424}
1936 2425
1937sub add_paragraph { 2426sub add_paragraph {
1938 my ($self, $color, $text) = @_; 2427 my ($self, $color, $text, $indent) = @_;
1939 2428
1940 #TODO: intelligently "reformat" paragraph 2429 for my $line (split /\n/, $text) {
1941 2430 my ($w, $h) = $self->text_size ($line);
1942 my $height = $self->text_height ($text);
1943
1944 $self->{height} += $height; 2431 $self->{height} += $h;
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2433 }
1945 2434
1946 push @{$self->{par}}, [$height, $color, $text];
1947
1948 $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]);
1949 $self->{children}[1]->update;
1950} 2436}
1951 2437
1952sub update { 2438sub update {
1953 my ($self) = @_; 2439 my ($self) = @_;
1954 2440
… …
1956 2442
1957 return unless $self->{h} > 0; 2443 return unless $self->{h} > 0;
1958 2444
1959 delete $self->{texture}; 2445 delete $self->{texture};
1960 2446
1961 $ROOT->on_refresh ($self, sub { 2447 $ROOT->on_post_alloc ($self, sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449
1962 if (delete $self->{need_reflow}) { 2450 if (delete $self->{need_reflow}) {
1963 my $height = 0; 2451 my $height = 0;
1964 2452
1965 $height += $_->[0] = $self->text_height ($_->[2]) 2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
1966 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 }
1967 2468
1968 $self->{height} = $height; 2469 $self->{height} = $height;
1969 2470
1970 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1971 2472
1972 delete $self->{texture}; 2473 delete $self->{texture};
1973 } 2474 }
1974 2475
1975 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1976 glClearColor 0, 0, 0, 1; 2477 glClearColor 0.5, 0.5, 0.5, 0;
1977 glClear GL_COLOR_BUFFER_BIT; 2478 glClear GL_COLOR_BUFFER_BIT;
1978 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
1979 glEnable GL_BLEND; 2491 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983
1984 my $top = int $self->{children}[1]{range}[0];
1985
1986 my $y0 = $top;
1987 my $y1 = $top + $self->{h};
1988
1989 my $y = 0;
1990
1991 my $layout = $self->{layout};
1992 2494
1993 for my $par (@{$self->{par}}) { 2495 for my $par (@{$self->{par}}) {
1994 my $h = $par->[0]; 2496 my $h = $par->[1];
1995 2497
1996 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]);
1997 $layout->set_text ($par->[2]); 2501 $layout->set_markup ($par->[4]);
1998 2502
1999 glColor @{ $par->[1] }; 2503 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2000 my ($W, $H) = $layout->size; 2504
2001 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;
2002 } 2507 }
2003 2508
2004 $y += $h; 2509 $y += $h;
2005 } 2510 }
2006 2511
2007 glDisable GL_TEXTURE_2D;
2008 glDisable GL_BLEND; 2512 glDisable GL_BLEND;
2009 }; 2513 };
2010 }); 2514 });
2011} 2515}
2012 2516
2013sub _draw { 2517sub _draw {
2014 my ($self) = @_; 2518 my ($self) = @_;
2015 2519
2016 if ($self->{texture}) {
2017 glEnable GL_TEXTURE_2D; 2520 glEnable GL_TEXTURE_2D;
2018 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;
2019 $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});
2020 glDisable GL_TEXTURE_2D; 2524 glDisable GL_TEXTURE_2D;
2021 }
2022 2525
2023 $self->{children}[1]->draw; 2526 $self->{children}[1]->draw;
2024 2527
2025} 2528}
2026 2529
… …
2074 2577
2075sub new { 2578sub new {
2076 my $class = shift; 2579 my $class = shift;
2077 2580
2078 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2079 state => 0, 2582 state => 0,
2080 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2081 can_events => 1,
2082 @_ 2584 @_
2083 ); 2585 );
2084 2586
2085 if ($self->{state}) {
2086 $self->{state} = 0;
2087 $self->toggle_flopper;
2088 }
2089
2090 $self 2587 $self
2091} 2588}
2092 2589
2093sub toggle_flopper { 2590sub toggle_flopper {
2094 my ($self) = @_; 2591 my ($self) = @_;
2095 2592
2096 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2097 if ($self->{state} = !$self->{state}) { 2594}
2098 $CFClient::UI::ROOT->add ($self->{other}); 2595
2099 $self->{other}->move ($self->coord2global (0, $self->{h})); 2596#############################################################################
2597
2598package CFClient::UI::Tooltip;
2599
2600our @ISA = CFClient::UI::Bin::;
2601
2602use CFClient::OpenGL;
2603
2604sub new {
2605 my $class = shift;
2606
2607 $class->SUPER::new (
2608 @_,
2609 can_events => 0,
2610 )
2611}
2612
2613sub set_tooltip_from {
2614 my ($self, $widget) = @_;
2615
2616 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip},
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 );
2624}
2625
2626sub size_request {
2627 my ($self) = @_;
2628
2629 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2630
2631 ($w + 4, $h + 4)
2632}
2633
2634sub size_allocate {
2635 my ($self, $w, $h, $changed) = @_;
2636
2637 return unless $changed;
2638
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 });
2658}
2659
2660sub _draw {
2661 my ($self) = @_;
2662
2663 glTranslate 0.375, 0.375;
2664
2665 my ($w, $h) = @$self{qw(w h)};
2666
2667 glColor 1, 0.8, 0.4;
2668 glBegin GL_QUADS;
2669 glVertex 0 , 0;
2670 glVertex 0 , $h;
2671 glVertex $w, $h;
2672 glVertex $w, 0;
2673 glEnd;
2674
2675 glColor 0, 0, 0;
2676 glBegin GL_LINE_LOOP;
2677 glVertex 0 , 0;
2678 glVertex 0 , $h;
2679 glVertex $w, $h;
2680 glVertex $w, 0;
2681 glEnd;
2682
2683 glTranslate 2 - 0.375, 2 - 0.375;
2684
2685 $self->SUPER::_draw;
2686}
2687
2688#############################################################################
2689
2690package CFClient::UI::Face;
2691
2692our @ISA = CFClient::UI::Base::;
2693
2694use CFClient::OpenGL;
2695
2696sub new {
2697 my $class = shift;
2698
2699 my $self = $class->SUPER::new (
2700 aspect => 1,
2701 can_events => 0,
2702 @_,
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
2720}
2721
2722sub size_request {
2723 (32, 8)
2724}
2725
2726sub update {
2727 my ($self) = @_;
2728
2729 return unless $self->{visible};
2730
2731 $self->SUPER::update;
2732}
2733
2734sub _draw {
2735 my ($self) = @_;
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
2748 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2749
2750 if ($tex) {
2751 glEnable GL_TEXTURE_2D;
2752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2753 glColor 1, 1, 1, 1;
2754 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2755 glDisable GL_TEXTURE_2D;
2756 }
2757}
2758
2759sub DESTROY {
2760 my ($self) = @_;
2761
2762 $self->{timer}->cancel
2763 if $self->{timer};
2764
2765 $self->SUPER::DESTROY;
2766}
2767
2768#############################################################################
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
2100 $self->emit ("open"); 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};
2101 } else { 2966 } else {
2102 $CFClient::UI::ROOT->remove ($self->{other}); 2967 $self->{item}{$group} = {
2103 $self->emit ("close"); 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 };
2104 } 2977 }
2105 2978
2106 $self->emit (changed => $self->{state}); 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;
2107} 2990}
2108 2991
2109############################################################################# 2992#############################################################################
2110 2993
2111package CFClient::UI::Root; 2994package CFClient::UI::Root;
2112 2995
2113our @ISA = CFClient::UI::Container::; 2996our @ISA = CFClient::UI::Container::;
2114 2997
2115use CFClient::OpenGL; 2998use CFClient::OpenGL;
2116 2999
2117sub check_size { 3000sub new {
2118 my ($self) = @_; 3001 my $class = shift;
2119 3002
2120 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3003 my $self = $class->SUPER::new (
2121} 3004 visible => 1,
3005 @_,
3006 );
2122 3007
2123sub size_request { 3008 Scalar::Util::weaken ($self->{root} = $self);
2124 ($::WIDTH, $::HEIGHT) 3009
3010 $self
2125} 3011}
2126 3012
2127sub configure { 3013sub configure {
2128 my ($self, $x, $y, $w, $h) = @_; 3014 my ($self, $x, $y, $w, $h) = @_;
2129 3015
2130 $self->SUPER::configure ($x, $y, $w, $h); 3016 $self->{w} = $w;
3017 $self->{h} = $h;
3018}
2131 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
2132 for my $child (@{$self->{children}}) { 3052 for my $child ($self->children) {
2133 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)};
2134 3054
2135 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3055 $X = $child->{force_x} if exists $child->{force_x};
2136 $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
2137 $child->configure ($X, $Y, $W,$H); 3061 $child->configure ($X, $Y, $W, $H);
2138 } 3062 }
2139} 3063}
2140 3064
2141sub _topleft { 3065sub coord2local {
2142 my ($self, $x, $y) = @_; 3066 my ($self, $x, $y) = @_;
2143 3067
2144 ($x, $y) 3068 ($x, $y)
2145} 3069}
2146 3070
3071sub coord2global {
3072 my ($self, $x, $y) = @_;
3073
3074 ($x, $y)
3075}
3076
2147sub update { 3077sub update {
2148 my ($self) = @_; 3078 my ($self) = @_;
2149 3079
2150 $self->check_size; 3080 $::WANT_REFRESH++;
2151 ::refresh ();
2152} 3081}
2153 3082
2154sub add { 3083sub add {
2155 my ($self, $child) = @_; 3084 my ($self, @children) = @_;
2156 3085
2157 # integerize window positions 3086 $_->{is_toplevel} = 1
2158 $child->{x} = int $child->{x}; 3087 for @children;
2159 $child->{y} = int $child->{y};
2160 3088
2161 $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 }
2162} 3105}
2163 3106
2164sub on_refresh { 3107sub on_refresh {
2165 my ($self, $id, $cb) = @_; 3108 my ($self, $id, $cb) = @_;
2166 3109
2167 $self->{refresh_hook}{$id} = $cb; 3110 $self->{refresh_hook}{$id} = $cb;
2168} 3111}
2169 3112
3113sub on_post_alloc {
3114 my ($self, $id, $cb) = @_;
3115
3116 $self->{post_alloc_hook}{$id} = $cb;
3117}
3118
2170sub draw { 3119sub draw {
2171 my ($self) = @_; 3120 my ($self) = @_;
2172 3121
2173 while (my $rcb = delete $self->{refresh_hook}) { 3122 while ($self->{refresh_hook}) {
2174 $_->() 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}};
2175 } 3190 }
2176 3191
2177 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3192 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2178 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2179 glClear GL_COLOR_BUFFER_BIT; 3194 glClear GL_COLOR_BUFFER_BIT;
2180 3195
2181 glMatrixMode GL_PROJECTION; 3196 glMatrixMode GL_PROJECTION;
2182 glLoadIdentity; 3197 glLoadIdentity;
2183 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2184 glMatrixMode GL_MODELVIEW; 3199 glMatrixMode GL_MODELVIEW;
2185 glLoadIdentity; 3200 glLoadIdentity;
2186 3201
2187 $self->_draw; 3202 $self->_draw;
2188} 3203}
… …
2190############################################################################# 3205#############################################################################
2191 3206
2192package CFClient::UI; 3207package CFClient::UI;
2193 3208
2194$ROOT = new CFClient::UI::Root; 3209$ROOT = new CFClient::UI::Root;
3210$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2195 3211
21961 32121
2197 3213

Diff Legend

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