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.151 by root, Sun Apr 23 00:57:39 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 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 ();
8use Event;
7 9
8use CFClient; 10use CFClient;
11use CFClient::Texture;
9 12
10our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
11 14
15our $LAYOUT;
12our $ROOT; 16our $ROOT;
13our $TOOLTIP; 17our $TOOLTIP;
14our $BUTTON_STATE; 18our $BUTTON_STATE;
15 19
16sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
17 if (!$GRAB) { 23 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
22 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
23 $TOOLTIP->set_text ($widget->{tooltip}); 37 $TOOLTIP->set_tooltip_from ($widget);
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $TOOLTIP->show; 38 $TOOLTIP->show;
26 } 39 }
27 40
28 return; 41 return;
29 } 42 }
30 } 43 }
31 } 44 }
32 45
33 $TOOLTIP->hide; 46 $TOOLTIP->hide;
34 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
35} 71}
36 72
37# class methods for events 73# class methods for events
38sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
40} 77}
41 78
42sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
44} 82}
45 83
46sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
47 my ($ev) = @_; 85 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
51 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
52 90
53 $GRAB = $widget; 91 $GRAB = $widget;
54 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
55 93
56 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
57 } 95 }
58 96
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 98
61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
62} 101}
63 102
64sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
65 my ($ev) = @_; 104 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
67 106
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 108
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 110
72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
73 113
74 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 116 $grab->update if $grab;
77 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
78 118
79 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
80 } 120 }
81} 121}
82 122
83sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
84 my ($ev) = @_; 124 my ($ev) = @_;
… …
90 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
91 131
92 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 134
95 check_tooltip; 135 $TOOLTIP_WATCHER->start;
96 } 136 }
97 137
98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
99} 140}
100 141
101# convert position array to integers 142# convert position array to integers
102sub harmonize { 143sub harmonize {
103 my ($vals) = @_; 144 my ($vals) = @_;
… …
109 $rem += $_ - $i; 150 $rem += $_ - $i;
110 $_ = $i; 151 $_ = $i;
111 } 152 }
112} 153}
113 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
190 }
191 }
192
193 reconfigure_widgets;
194}
195
114############################################################################# 196#############################################################################
115 197
116package CFClient::UI::Base; 198package CFClient::UI::Base;
117 199
118use strict; 200use strict;
… …
121 203
122sub new { 204sub new {
123 my $class = shift; 205 my $class = shift;
124 206
125 my $self = bless { 207 my $self = bless {
126 x => 0, 208 x => "center",
127 y => 0, 209 y => "center",
128 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
129 can_events => 1, 213 can_events => 1,
130 @_ 214 @_
131 }, $class; 215 }, $class;
132 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
133 for (keys %$self) { 219 for (keys %$self) {
134 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
135 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
136 } 222 }
137 } 223 }
138 224
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
236
139 $self 237 $self
140} 238}
141 239
240sub destroy {
241 my ($self) = @_;
242
243 $self->hide;
244 %$self = ();
245}
246
142sub show { 247sub show {
143 my ($self) = @_; 248 my ($self) = @_;
144 249
145 return if $self->{parent}; 250 return if $self->{parent};
146 251
147 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
148} 253}
149 254
255sub set_visible {
256 my ($self) = @_;
257
258 return if $self->{visible};
259
260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
262
263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
278 delete $self->{visible};
279
280 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self;
282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
150sub hide { 308sub hide {
151 my ($self) = @_; 309 my ($self) = @_;
152 310
153 return unless $self->{parent}; 311 $self->set_invisible;
154 312
155 $self->{parent}->remove ($self); 313 $self->{parent}->remove ($self)
314 if $self->{parent};
156} 315}
157 316
158sub move { 317sub move_abs {
159 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
160 319
161 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
162 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
163 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
164 323
165 $self->update; 324 $self->update;
166} 325}
167 326
168sub needs_redraw { 327sub set_size {
169 0 328 my ($self, $w, $h) = @_;
329
330 $self->{force_w} = $w;
331 $self->{force_h} = $h;
332
333 $self->realloc;
170} 334}
171 335
172sub size_request { 336sub size_request {
173 require Carp; 337 require Carp;
174 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
176 340
177sub configure { 341sub configure {
178 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
179 343
180 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
181 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
182 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
183 349
184 # use alignment to adjust x, y 350 # use alignment to adjust x, y
185 351
186 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
187 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
188
189 ($w, $h) = ($w2, $h2);
190 } 354 }
191 355
192 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
193 $self->{x} = $x; 357 $self->{x} = $x;
194 $self->{y} = $y; 358 $self->{y} = $y;
195 $self->update; 359 $self->update;
196 } 360 }
197 361
198 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
363 return unless $self->{visible};
364
199 $self->{w} = $w; 365 $self->{alloc_w} = $w;
200 $self->{h} = $h; 366 $self->{alloc_h} = $h;
201 367
202 $self->size_allocate ($w, $h); 368 $self->{root}{size_alloc}{$self+0} = $self;
203 $self->update;
204 } 369 }
205} 370}
206 371
207sub size_allocate { 372sub size_allocate {
208 # nothing to be done 373 # nothing to be done
209} 374}
210 375
211# return top left coordinates 376sub children {
212sub _topleft { 377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
382}
383
384sub set_max_size {
213 my ($self, $x, $y) = @_; 385 my ($self, $w, $h) = @_;
214 386
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 387 $self->{max_w} = int $w if defined $w;
388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
391}
392
393sub set_tooltip {
394 my ($self, $tooltip) = @_;
395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
401 $self->{tooltip} = $tooltip;
402
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
406 }
216} 407}
217 408
218# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
219sub coord2local { 410sub coord2local {
220 my ($self, $x, $y) = @_; 411 my ($self, $x, $y) = @_;
221 412
222 my ($X, $Y) = $self->_topleft; 413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
223 ($x - $X, $y - $Y)
224} 414}
225 415
226# translate local coordinates to global coordinate system 416# translate local coordinates to global coordinate system
227sub coord2global { 417sub coord2global {
228 my ($self, $x, $y) = @_; 418 my ($self, $x, $y) = @_;
229 419
230 my ($X, $Y) = $self->_topleft; 420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
231 ($x + $X, $y + $Y)
232} 421}
233 422
234sub focus_in { 423sub focus_in {
235 my ($self) = @_; 424 my ($self) = @_;
236 425
237 return if $FOCUS == $self; 426 return if $FOCUS == $self;
238 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
239 428
240 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
241 430
242 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
243 432
244 $focus->update if $focus; 433 $focus->update if $focus;
245 $FOCUS->update; 434 $FOCUS->update;
246} 435}
247 436
… …
250 439
251 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
252 441
253 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
254 443
255 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
256 445
257 $focus->update if $focus; #? 446 $focus->update if $focus; #?
258}
259 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
260sub mouse_motion { } 452sub mouse_motion { 0 }
261sub button_up { } 453sub button_up { 0 }
262sub key_down { } 454sub key_down { 0 }
263sub key_up { } 455sub key_up { 0 }
264 456
265sub button_down { 457sub button_down {
266 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
267 459
268 $self->focus_in; 460 $self->focus_in;
269}
270 461
271sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
272sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
273sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
274sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
275sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
276
277sub draw {
278 my ($self) = @_;
279
280 return unless $self->{h} && $self->{w};
281
282 glPushMatrix;
283 glTranslate $self->{x}, $self->{y}, 0;
284 $self->_draw;
285 glPopMatrix;
286
287 if ($self == $HOVER && $self->{can_hover}) {
288 my ($x, $y) = @$self{qw(x y)};
289
290 glColor 1, 0.8, 0.5, 0.2;
291 glEnable GL_BLEND;
292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
293 glBegin GL_QUADS;
294 glVertex $x , $y;
295 glVertex $x + $self->{w}, $y;
296 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h};
298 glEnd;
299 glDisable GL_BLEND;
300 } 462 0
301}
302
303sub _draw {
304 my ($self) = @_;
305
306 warn "no draw defined for $self\n";
307} 463}
308 464
309sub find_widget { 465sub find_widget {
310 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
311 467
… …
320 476
321sub set_parent { 477sub set_parent {
322 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
323 479
324 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
325} 482}
326 483
327sub check_size { 484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
328 my ($self) = @_; 504 #my ($self, $visible) = @_;
505}
329 506
330 return unless $self->{parent}; 507sub realloc {
508 my ($self) = @_;
331 509
332 my ($w, $h) = $self->size_request; 510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
333 512
334 if ($w != $self->{req_w} || $h != $self->{req_h}) { 513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
335 $self->{req_w} = $w; 516 delete $self->{req_w};
336 $self->{req_h} = $h; 517 delete $self->{req_h};
337
338 $self->{parent}->check_size;
339 } 518 }
340} 519}
341 520
342sub update { 521sub update {
343 my ($self) = @_; 522 my ($self) = @_;
344 523
345 $self->{parent}->update 524 $self->{parent}->update
346 if $self->{parent}; 525 if $self->{parent};
347} 526}
348 527
349sub connect { 528sub reconfigure {
350 my ($self, $signal, $cb) = @_; 529 my ($self) = @_;
351 530
352 push @{ $self->{signal_cb}{$signal} }, $cb; 531 $self->realloc;
532 $self->update;
353} 533}
354 534
355sub emit { 535# using global variables seems a bit hacky, but passing through all drawing
356 my ($self, $signal, @args) = @_; 536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
357 538
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 539sub draw {
359 $cb->($self, @args); 540 my ($self) = @_;
541
542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553
554 glPushMatrix;
555 glTranslate $self->{x}, $self->{y}, 0;
556
557 if ($self == $HOVER && $self->{can_hover}) {
558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
559 glEnable GL_BLEND;
560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
561 glBegin GL_QUADS;
562 glVertex 0 , 0;
563 glVertex $self->{w}, 0;
564 glVertex $self->{w}, $self->{h};
565 glVertex 0 , $self->{h};
566 glEnd;
567 glDisable GL_BLEND;
360 } 568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
580 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 }
583
584 $self->_draw;
585 glPopMatrix;
586}
587
588sub _draw {
589 my ($self) = @_;
590
591 warn "no draw defined for $self\n";
361} 592}
362 593
363sub DESTROY { 594sub DESTROY {
364 my ($self) = @_; 595 my ($self) = @_;
365 596
597 delete $WIDGET{$self+0};
366 #$self->deactivate; 598 #$self->deactivate;
367} 599}
368 600
369############################################################################# 601#############################################################################
370 602
… …
379 my $class = shift; 611 my $class = shift;
380 612
381 # range [value, low, high, page] 613 # range [value, low, high, page]
382 614
383 $class->SUPER::new ( 615 $class->SUPER::new (
384 bg => [0, 0, 0, 0.2], 616 #bg => [0, 0, 0, 0.2],
385 active_bg => [1, 1, 1, 0.5], 617 #active_bg => [1, 1, 1, 0.5],
386 @_ 618 @_
387 ) 619 )
388} 620}
389 621
390sub _draw { 622sub _draw {
391 my ($self) = @_; 623 my ($self) = @_;
392 624
625 my $color = $FOCUS == $self && $self->{active_bg}
626 ? $self->{active_bg}
627 : $self->{bg};
628
629 if ($color && (@$color < 4 || $color->[3])) {
393 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
394 631
395 glEnable GL_BLEND; 632 glEnable GL_BLEND;
396 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
397 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 634 glColor_premultiply @$color;
398 635
399 glBegin GL_QUADS; 636 glBegin GL_QUADS;
400 glVertex 0 , 0; 637 glVertex 0 , 0;
401 glVertex 0 , $h; 638 glVertex 0 , $h;
402 glVertex $w, $h; 639 glVertex $w, $h;
403 glVertex $w, 0; 640 glVertex $w, 0;
404 glEnd; 641 glEnd;
405 642
406 glDisable GL_BLEND; 643 glDisable GL_BLEND;
644 }
407} 645}
408 646
409############################################################################# 647#############################################################################
410 648
411package CFClient::UI::Empty; 649package CFClient::UI::Empty;
… …
416 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
417 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
418} 656}
419 657
420sub size_request { 658sub size_request {
421 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
422} 662}
423 663
424sub draw { } 664sub draw { }
425 665
426############################################################################# 666#############################################################################
… …
430our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
431 671
432sub new { 672sub new {
433 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
434 674
435 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
436 676
437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 677 my $self = $class->SUPER::new (
678 children => [],
679 can_events => 0,
680 %arg,
681 );
682
438 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
439 685
440 $self 686 $self
441} 687}
442 688
443sub add { 689sub add {
444 my ($self, $child) = @_; 690 my ($self, @widgets) = @_;
445 691
446 $child->set_parent ($self); 692 $_->set_parent ($self)
693 for @widgets;
447 694
448 use sort 'stable'; 695 use sort 'stable';
449 696
450 $self->{children} = [ 697 $self->{children} = [
451 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 699 @{$self->{children}}, @widgets
453 ]; 700 ];
454 701
455 $child->check_size; 702 $self->realloc;
703}
704
705sub children {
706 @{ $_[0]{children} }
456} 707}
457 708
458sub remove { 709sub remove {
459 my ($self, $child) = @_; 710 my ($self, $child) = @_;
460 711
461 delete $child->{parent}; 712 delete $child->{parent};
713 $child->hide;
462 714
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
464 716
465 $self->check_size; 717 $self->realloc;
466 $self->update; 718}
719
720sub clear {
721 my ($self) = @_;
722
723 my $children = delete $self->{children};
724 $self->{children} = [];
725
726 for (@$children) {
727 delete $_->{parent};
728 $_->hide;
729 }
730
731 $self->realloc;
467} 732}
468 733
469sub find_widget { 734sub find_widget {
470 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
471 736
472 $x -= $self->{x}; 737 $x -= $self->{x};
473 $y -= $self->{y}; 738 $y -= $self->{y};
474 739
475 my $res; 740 my $res;
476 741
477 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
478 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
479 and return $res; 744 and return $res;
480 } 745 }
481 746
482 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
531 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
532} 797}
533 798
534############################################################################# 799#############################################################################
535 800
801# back-buffered drawing area
802
536package CFClient::UI::Window; 803package CFClient::UI::Window;
537 804
538our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
539 806
540use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
546} 813}
547 814
548sub update { 815sub update {
549 my ($self) = @_; 816 my ($self) = @_;
550 817
551 # we want to do this delayed... 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 819 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 820}
565 821
566sub size_allocate { 822sub size_allocate {
567 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
568 824
569 $self->child->configure (0, 0, $w, $h); 825 $self->SUPER::size_allocate ($w, $h);
826 $self->update;
827}
570 828
829sub _render {
830 my ($self) = @_;
831
832 $self->{children}[0]->draw;
833}
834
835sub render_child {
836 my ($self) = @_;
837
838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
839 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT;
841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
571 $self->render_chld; 849 $self->_render;
850 };
572} 851}
573 852
574sub _draw { 853sub _draw {
575 my ($self) = @_; 854 my ($self) = @_;
576 855
577 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
578 857
579 my $tex = $self->{texture} 858 my $tex = $self->{texture}
580 or return; 859 or return;
581 860
582 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
585 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1;
586 864
587 $tex->draw_quad (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
588 866
589 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
591} 868}
592 869
593############################################################################# 870#############################################################################
594 871
595package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
596 873
597our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
598
599sub new { die }
600
601sub size_request {
602 my ($self) = @_;
603
604 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
606
607 @$self{qw(child_w child_h)}
608}
609
610sub _draw {
611 my ($self) = @_;
612
613 $self->{children}[1]->draw;
614}
615
616
617#############################################################################
618
619package CFClient::UI::Frame;
620
621our @ISA = CFClient::UI::Bin::;
622
623use CFClient::OpenGL;
624 875
625sub new { 876sub new {
626 my $class = shift; 877 my $class = shift;
627 878
628 my $self = $class->SUPER::new ( 879 $class->SUPER::new (
629 bg => [1, 1, 1, 1], 880 scroll_x => 0,
630 border_bg => [1, 1, 1, 1], 881 scroll_y => 1,
631 border => 0.8,
632 @_ 882 @_,
633 ); 883 )
634
635 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643} 884}
644 885
645sub size_request { 886sub size_request {
646 my ($self) = @_; 887 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h}) 888
889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
890
891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
648} 895}
649 896
650sub size_allocate { 897sub size_allocate {
651 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
652 $self->{w} = $w; 899
653 $self->{h} = $h; 900 my $child = $self->child;
901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
654 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
906 $self->update;
655} 907}
656 908
657sub _draw { 909sub set_offset {
658 my ($self) = @_; 910 my ($self, $x, $y) = @_;
659 911
660 my ($w, $h) = ($self->{w}, $self->{h}); 912 $self->{view_x} = int $x;
913 $self->{view_y} = int $y;
661 914
662 glEnable GL_BLEND; 915 $self->update;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 916}
664 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666 917
667# glBegin GL_QUADS; 918# hmm, this does not work for topleft of $self... but we should not ask for that
668# glColor 0, 0, 0, 0; 919sub coord2local {
669# glVertex 0 , 0; 920 my ($self, $x, $y) = @_;
670# glVertex 0 , $h;
671# glVertex $w, $h;
672# glVertex $w, 0;
673# glEnd;
674 921
922 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
923}
675 924
676 $self->child->draw; 925sub coord2global {
677 glDisable GL_BLEND; 926 my ($self, $x, $y) = @_;
678 glDisable GL_TEXTURE_2D; 927
928 $x = List::Util::min $self->{w}, $x - $self->{view_x};
929 $y = List::Util::min $self->{h}, $y - $self->{view_y};
930
931 $self->SUPER::coord2global ($x, $y)
932}
933
934sub find_widget {
935 my ($self, $x, $y) = @_;
936
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y)
943 }
944}
945
946sub _render {
947 my ($self) = @_;
948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953
954 $self->SUPER::_render;
679} 955}
680 956
681############################################################################# 957#############################################################################
682 958
959package CFClient::UI::ScrolledWindow;
960
961our @ISA = CFClient::UI::HBox::;
962
963sub new {
964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
967
968 my $self;
969
970 my $slider = new CFClient::UI::Slider
971 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]);
975 },
976 ;
977
978 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1),
980 slider => $slider,
981 %arg,
982 );
983
984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
986
987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004}
1005
1006sub size_allocate {
1007 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017
1018#############################################################################
1019
683package CFClient::UI::FancyFrame; 1020package CFClient::UI::Frame;
684 1021
685our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
686 1023
687use CFClient::OpenGL; 1024use CFClient::OpenGL;
688
689my @tex =
690 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
691 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
692 1025
693sub new { 1026sub new {
694 my $class = shift; 1027 my $class = shift;
695 1028
696 # TODO: user_x, user_y, overwrite moveto? 1029 $class->SUPER::new (
1030 bg => undef,
1031 @_,
1032 )
1033}
1034
1035sub _draw {
1036 my ($self) = @_;
1037
1038 if ($self->{bg}) {
1039 my ($w, $h) = @$self{qw(w h)};
1040
1041 glEnable GL_BLEND;
1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1043 glColor_premultiply @{ $self->{bg} };
1044
1045 glBegin GL_QUADS;
1046 glVertex 0 , 0;
1047 glVertex 0 , $h;
1048 glVertex $w, $h;
1049 glVertex $w, 0;
1050 glEnd;
1051
1052 glDisable GL_BLEND;
1053 }
1054
1055 $self->SUPER::_draw;
1056}
1057
1058#############################################################################
1059
1060package CFClient::UI::FancyFrame;
1061
1062our @ISA = CFClient::UI::Bin::;
1063
1064use CFClient::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073
1074sub new {
1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
697 1078
698 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
701 border => 0.8, 1082 border => 0.6,
702 can_events => 1, 1083 can_events => 1,
703 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
704 ); 1087 );
705 1088
706 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
707 align => 0, 1090 align => 0,
708 valign => 1, 1091 valign => 1,
709 text => $self->{title}, 1092 text => $title,
710 fontsize => 1; 1093 fontsize => $self->{border}
1094 if defined $title;
711 1095
712 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
713} 1104}
714 1105
715sub border { 1106sub border {
716 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
717} 1108}
718 1109
719sub size_request { 1110sub size_request {
720 my ($self) = @_; 1111 my ($self) = @_;
721 1112
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 1113 $self->{title}->size_request
1114 if $self->{title};
723 1115
724 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
725 1117
726 ( 1118 (
727 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
730} 1122}
731 1123
732sub size_allocate { 1124sub size_allocate {
733 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
734 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
735 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
736 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
737 1137
738 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
739 if $self->{title};
740
741 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
742} 1139}
743 1140
744sub button_down { 1141sub button_down {
745 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
746 1143
1144 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 1145 my $border = $self->border;
748 1146
749 if ($x < $self->{w} && $x >= $self->{w} - $border 1147 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 1148 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 1149
1150 if ($lr & $td) {
1151 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 1153 my ($bw, $bh) = ($self->{w}, $self->{h});
754 1154
1155 my $mx = $x < $border;
1156 my $my = $y < $border;
1157
755 $self->{motion} = sub { 1158 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
757 1160
758 ($x, $y) = ($ev->{x}, $ev->{y}); 1161 my $dx = $ev->{x} - $ox;
1162 my $dy = $ev->{y} - $oy;
759 1163
760 $self->{user_w} = $bw + $x - $ox; 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
761 $self->{user_h} = $bh + $y - $oy; 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
762 $self->check_size; 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
763 }; 1169 };
764 1170
765 } elsif ($x >= 0 && $x < $self->{w} 1171 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
770 1174
771 $self->{motion} = sub { 1175 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
773 1177
774 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
775 1179
776 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
777 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
778 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
779 } 1188 1
780} 1189}
781 1190
782sub button_up { 1191sub button_up {
783 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
784 1193
785 delete $self->{motion}; 1194 !!delete $self->{motion}
786} 1195}
787 1196
788sub mouse_motion { 1197sub mouse_motion {
789 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
790 1199
791 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
792} 1203}
793 1204
794sub _draw { 1205sub _draw {
795 my ($self) = @_; 1206 my ($self) = @_;
796 1207
1208 my $child = $self->{children}[0];
1209
797 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
798 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
799 1212
800 glEnable GL_BLEND;
801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
802 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
804 1215
805 my $border = $self->border; 1216 my $border = $self->border;
806 1217
807 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
808 $tex[1]->draw_quad (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
812 1223
813 my $bg = $tex[0]; 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} };
814 1226
815 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 1228 # solve this better(?)
817 my $rep_y = $ch / $bg->{h}; 1229 $bg->{s} = $cw / $bg->{w};
818 1230 $bg->{t} = $ch / $bg->{h};
819 glColor @{ $self->{bg} };
820
821 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1232 }
825 1233
826 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND;
828 1235
829 $self->{title}->draw if $self->{title};
830 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
831} 1242}
832 1243
833############################################################################# 1244#############################################################################
834 1245
835package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
843sub new { 1254sub new {
844 my $class = shift; 1255 my $class = shift;
845 1256
846 $class->SUPER::new ( 1257 $class->SUPER::new (
847 col_expand => [], 1258 col_expand => [],
848 @_ 1259 @_,
849 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
850} 1265}
851 1266
852sub add { 1267sub add {
853 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
854 1269
855 $child->set_parent ($self); 1270 $child->set_parent ($self);
856 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
857 1272
858 $child->check_size; 1273 $self->realloc;
859} 1274}
860 1275
861# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
862sub clear { 1277sub clear {
863 my ($self) = @_; 1278 my ($self) = @_;
864 1279
1280 my @children = $self->children;
865 delete $self->{children}; 1281 delete $self->{children};
866 $self->update; 1282
1283 for (@children) {
1284 delete $_->{parent};
1285 $_->hide;
1286 }
1287
1288 $self->realloc;
867} 1289}
868 1290
869sub get_wh { 1291sub get_wh {
870 my ($self) = @_; 1292 my ($self) = @_;
871 1293
… …
902sub size_allocate { 1324sub size_allocate {
903 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
904 1326
905 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
906 1328
907 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
908 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
909 1331
910 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
911 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
912 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
913 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
967 } 1389 }
968} 1390}
969 1391
970############################################################################# 1392#############################################################################
971 1393
972package CFClient::UI::HBox; 1394package CFClient::UI::Box;
973
974# TODO: wrap into common Box base class
975 1395
976our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
977 1397
978sub size_request { 1398sub size_request {
979 my ($self) = @_; 1399 my ($self) = @_;
980 1400
981 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
982 1402 ? (
983 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
984 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
985 (List::Util::max map $_->[1], @alloc), 1405 )
986 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
987} 1410}
988 1411
989sub size_allocate { 1412sub size_allocate {
990 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
991 1414
992 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
993
994 my $children = $self->{children}; 1416 my $children = $self->{children};
995 1417
996 my @h = map $_->{req_w}, @$children; 1418 my @req;
997 1419
998 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
999 1421 @req = ($space / (@$children || 1)) x @$children;
1000 if ($req_h > $h) {
1001 # ah well, not enough space
1002 $_ *= $h / $req_h for @h;
1003 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1004 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1005 $exp ||= 1;
1006 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1007 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1008 my $child = $children->[$_];
1009
1010 my $alloc_h = $h[$_];
1011 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1012 $h[$_] = $alloc_h;
1013 } 1436 }
1014 } 1437 }
1015 1438
1016 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1017 1440
1018 my $y = 0; 1441 my $pos = 0;
1019 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1020 my $child = $children->[$_];
1021 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1022 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1023 1445
1024 $y += $h; 1446 $pos += $alloc;
1025 } 1447 }
1026 1448
1027 1 1449 1
1028} 1450}
1029 1451
1030############################################################################# 1452#############################################################################
1031 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1032package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1033 1470
1034# TODO: wrap into common Box base class
1035
1036our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1037 1472
1038sub size_request { 1473sub new {
1039 my ($self) = @_; 1474 my $class = shift;
1040 1475
1041 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1042 1477 vertical => 1,
1043 ( 1478 @_,
1044 (List::Util::max map $_->[0], @alloc),
1045 (List::Util::sum map $_->[1], @alloc),
1046 ) 1479 )
1047} 1480}
1048 1481
1049sub size_allocate {
1050 my ($self, $w, $h) = @_;
1051
1052 my $children = $self->{children};
1053
1054 my @h = map $_->{req_h}, @$children;
1055
1056 my $req_h = List::Util::sum @h;
1057
1058 if ($req_h > $h) {
1059 # ah well, not enough space
1060 $_ *= $h / $req_h for @h;
1061 } else {
1062 my $exp = List::Util::sum map $_->{expand}, @$children;
1063 $exp ||= 1;
1064
1065 for (0 .. $#$children) {
1066 my $child = $children->[$_];
1067
1068 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1069 }
1070 }
1071
1072 CFClient::UI::harmonize \@h;
1073
1074 my $y = 0;
1075 for (0 .. $#$children) {
1076 my $child = $children->[$_];
1077 my $h = $h[$_];
1078 $child->configure (0, $y, $w, $h);
1079
1080 $y += $h;
1081 }
1082
1083 1
1084}
1085
1086############################################################################# 1482#############################################################################
1087 1483
1088package CFClient::UI::Label; 1484package CFClient::UI::Label;
1089 1485
1090our @ISA = CFClient::UI::Base::; 1486our @ISA = CFClient::UI::DrawBG::;
1091 1487
1092use CFClient::OpenGL; 1488use CFClient::OpenGL;
1093 1489
1094sub new { 1490sub new {
1095 my ($class, %arg) = @_; 1491 my ($class, %arg) = @_;
1096 1492
1097 my $self = $class->SUPER::new ( 1493 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1494 fg => [1, 1, 1],
1495 #bg => none
1496 #active_bg => none
1497 #font => default_font
1498 #text => initial text
1499 #markup => initial narkup
1500 #max_w => maximum pixel width
1501 ellipsise => 3, # end
1502 layout => (new CFClient::Layout),
1099 fontsize => 1, 1503 fontsize => 1,
1100 text => "",
1101 align => -1, 1504 align => -1,
1102 valign => -1, 1505 valign => -1,
1103 padding => 2, 1506 padding_x => 2,
1104 layout => new CFClient::Layout, 1507 padding_y => 2,
1105 can_events => 0, 1508 can_events => 0,
1106 %arg 1509 %arg
1107 ); 1510 );
1108 1511
1109 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout; 1513 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template}); 1514 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout; 1515 $self->{template} = $layout;
1113 } 1516 }
1114 1517
1115 $self->set_text (delete $self->{text}) if exists $self->{text}; 1518 if (exists $self->{markup}) {
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1519 $self->set_markup (delete $self->{markup});
1520 } else {
1521 $self->set_text (delete $self->{text});
1522 }
1117 1523
1118 $self 1524 $self
1119} 1525}
1120 1526
1121sub escape_text { 1527sub escape($) {
1122 local $_ = $_[1]; 1528 local $_ = $_[0];
1123 1529
1124 s/&/&amp;/g; 1530 s/&/&amp;/g;
1125 s/>/&gt;/g; 1531 s/>/&gt;/g;
1126 s/</&lt;/g; 1532 s/</&lt;/g;
1127 1533
1128 $_[1] 1534 $_
1535}
1536
1537sub update {
1538 my ($self) = @_;
1539
1540 delete $self->{texture};
1541 $self->SUPER::update;
1542}
1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1129} 1549}
1130 1550
1131sub set_text { 1551sub set_text {
1132 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1133 1553
1554 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text";
1556
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1134 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1135
1136 delete $self->{texture}; 1559 delete $self->{req_h};
1137 $self->check_size; 1560
1561 $self->realloc;
1138 $self->update; 1562 $self->update;
1139} 1563}
1140 1564
1141sub set_markup { 1565sub set_markup {
1142 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1143 1567
1568 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup";
1570
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1144 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1145
1146 delete $self->{texture}; 1575 delete $self->{req_h};
1147 $self->check_size; 1576
1577 $self->realloc;
1148 $self->update; 1578 $self->update;
1149} 1579}
1150 1580
1151sub size_request { 1581sub size_request {
1152 my ($self) = @_; 1582 my ($self) = @_;
1153 1583
1154 $self->{layout}->set_width; 1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1592
1157 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1158 1594
1159 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1598
1162 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1163 1600
1164 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1165 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1166 } 1603 }
1167 1604
1605 ($w, $h)
1168 ( 1606 }
1169 $w + $self->{padding} * 2,
1170 $h + $self->{padding} * 2,
1171 )
1172} 1607}
1173 1608
1174sub size_allocate { 1609sub size_allocate {
1175 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1176 1611
1612 delete $self->{ox};
1613
1177 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1178} 1616}
1179 1617
1180sub set_fontsize { 1618sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1182 1620
1183 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1184 $self->check_size; 1622 delete $self->{texture};
1623
1624 $self->realloc;
1185} 1625}
1186 1626
1187sub _draw { 1627sub _draw {
1188 my ($self) = @_; 1628 my ($self) = @_;
1189 1629
1630 $self->SUPER::_draw; # draw background, if applicable
1631
1190 my $tex = $self->{texture} ||= do { 1632 my $tex = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1191 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1192 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639
1193 new_from_layout CFClient::Texture $self->{layout} 1640 new_from_layout CFClient::Texture $self->{layout}
1194 }; 1641 };
1195 1642
1196 glEnable GL_BLEND; 1643 unless (exists $self->{ox}) {
1197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5);
1647
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5);
1651 };
1652
1198 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1654
1655 if ($tex->{format} == GL_ALPHA) {
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1199 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1200
1201 glColor @{$self->{fg}};
1202
1203 $self->{ox} = int (
1204 $self->{align} < 0 ? $self->{padding}
1205 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1206 : ($self->{w} - $tex->{w}) * 0.5
1207 );
1208
1209 $self->{oy} = int (
1210 $self->{valign} < 0 ? $self->{padding}
1211 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1212 : ($self->{h} - $tex->{h}) * 0.5
1213 );
1214
1215 $tex->draw_quad ($self->{ox}, $self->{oy}); 1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1662 }
1216 1663
1217 glDisable GL_TEXTURE_2D; 1664 glDisable GL_TEXTURE_2D;
1218 glDisable GL_BLEND;
1219} 1665}
1220 1666
1221############################################################################# 1667#############################################################################
1222 1668
1223package CFClient::UI::EntryBase; 1669package CFClient::UI::EntryBase;
… …
1228 1674
1229sub new { 1675sub new {
1230 my $class = shift; 1676 my $class = shift;
1231 1677
1232 $class->SUPER::new ( 1678 $class->SUPER::new (
1233 fg => [1, 1, 1], 1679 fg => [1, 1, 1],
1234 bg => [0, 0, 0, 0.2], 1680 bg => [0, 0, 0, 0.2],
1235 active_bg => [1, 1, 1, 0.5], 1681 active_bg => [1, 1, 1, 0.5],
1236 active_fg => [0, 0, 0], 1682 active_fg => [0, 0, 0],
1237 can_hover => 1, 1683 can_hover => 1,
1238 can_focus => 1, 1684 can_focus => 1,
1239 valign => 0, 1685 valign => 0,
1240 can_events => 1, 1686 can_events => 1,
1687 #text => ...
1241 @_ 1688 @_
1242 ) 1689 )
1243} 1690}
1244 1691
1245sub _set_text { 1692sub _set_text {
… …
1247 1694
1248 delete $self->{cur_h}; 1695 delete $self->{cur_h};
1249 1696
1250 return if $self->{text} eq $text; 1697 return if $self->{text} eq $text;
1251 1698
1252 delete $self->{texture};
1253
1254 $self->{last_activity} = $::NOW; 1699 $self->{last_activity} = $::NOW;
1255 $self->{text} = $text; 1700 $self->{text} = $text;
1256 1701
1257 $text =~ s/./*/g if $self->{hidden}; 1702 $text =~ s/./*/g if $self->{hidden};
1258 $self->{layout}->set_text ("$text "); 1703 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h};
1259 1705
1260 $self->emit (changed => $self->{text}); 1706 $self->_emit (changed => $self->{text});
1707
1708 $self->realloc;
1709 $self->update;
1710}
1711
1712sub set_text {
1713 my ($self, $text) = @_;
1714
1715 $self->{cursor} = length $text;
1716 $self->_set_text ($text);
1261} 1717}
1262 1718
1263sub get_text { 1719sub get_text {
1264 $_[0]{text} 1720 $_[0]{text}
1265} 1721}
… …
1268 my ($self) = @_; 1724 my ($self) = @_;
1269 1725
1270 my ($w, $h) = $self->SUPER::size_request; 1726 my ($w, $h) = $self->SUPER::size_request;
1271 1727
1272 ($w + 1, $h) # add 1 for cursor 1728 ($w + 1, $h) # add 1 for cursor
1273}
1274
1275sub size_allocate {
1276 my ($self, $w, $h) = @_;
1277
1278 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1279}
1280
1281sub set_text {
1282 my ($self, $text) = @_;
1283
1284 $self->{cursor} = length $text;
1285 $self->_set_text ($text);
1286 $self->update;
1287} 1729}
1288 1730
1289sub key_down { 1731sub key_down {
1290 my ($self, $ev) = @_; 1732 my ($self, $ev) = @_;
1291 1733
… …
1293 my $sym = $ev->{sym}; 1735 my $sym = $ev->{sym};
1294 my $uni = $ev->{unicode}; 1736 my $uni = $ev->{unicode};
1295 1737
1296 my $text = $self->get_text; 1738 my $text = $self->get_text;
1297 1739
1298 if ($sym == 8) { 1740 if ($uni == 8) {
1299 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1741 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1300 } elsif ($sym == 127) { 1742 } elsif ($uni == 127) {
1301 substr $text, $self->{cursor}, 1, ""; 1743 substr $text, $self->{cursor}, 1, "";
1302 } elsif ($sym == CFClient::SDLK_LEFT) { 1744 } elsif ($sym == CFClient::SDLK_LEFT) {
1303 --$self->{cursor} if $self->{cursor}; 1745 --$self->{cursor} if $self->{cursor};
1304 } elsif ($sym == CFClient::SDLK_RIGHT) { 1746 } elsif ($sym == CFClient::SDLK_RIGHT) {
1305 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1747 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1306 } elsif ($sym == CFClient::SDLK_HOME) { 1748 } elsif ($sym == CFClient::SDLK_HOME) {
1307 $self->{cursor} = 0; 1749 $self->{cursor} = 0;
1308 } elsif ($sym == CFClient::SDLK_END) { 1750 } elsif ($sym == CFClient::SDLK_END) {
1309 $self->{cursor} = length $text; 1751 $self->{cursor} = length $text;
1310 } elsif ($sym == 27) { 1752 } elsif ($uni == 27) {
1311 $self->emit ('escape'); 1753 $self->_emit ('escape');
1312 } elsif ($uni) { 1754 } elsif ($uni) {
1313 substr $text, $self->{cursor}++, 0, chr $uni; 1755 substr $text, $self->{cursor}++, 0, chr $uni;
1756 } else {
1757 return 0;
1314 } 1758 }
1315 1759
1316 $self->_set_text ($text); 1760 $self->_set_text ($text);
1317 $self->update; 1761
1762 $self->realloc;
1763
1764 1
1318} 1765}
1319 1766
1320sub focus_in { 1767sub focus_in {
1321 my ($self) = @_; 1768 my ($self) = @_;
1322 1769
… …
1337 utf8::encode $text; 1784 utf8::encode $text;
1338 $self->{cursor} = length substr $text, 0, $idx; 1785 $self->{cursor} = length substr $text, 0, $idx;
1339 1786
1340 $self->_set_text ($self->{text}); 1787 $self->_set_text ($self->{text});
1341 $self->update; 1788 $self->update;
1789
1790 1
1342} 1791}
1343 1792
1344sub mouse_motion { 1793sub mouse_motion {
1345 my ($self, $ev, $x, $y) = @_; 1794 my ($self, $ev, $x, $y) = @_;
1346# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1795# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1796
1797 0
1347} 1798}
1348 1799
1349sub _draw { 1800sub _draw {
1350 my ($self) = @_; 1801 my ($self) = @_;
1351 1802
1352 local $self->{fg} = $self->{fg}; 1803 local $self->{fg} = $self->{fg};
1353 1804
1354 if ($FOCUS == $self) { 1805 if ($FOCUS == $self) {
1355 glColor @{$self->{active_bg}}; 1806 glColor_premultiply @{$self->{active_bg}};
1356 $self->{fg} = $self->{active_fg}; 1807 $self->{fg} = $self->{active_fg};
1357 } else { 1808 } else {
1358 glColor @{$self->{bg}}; 1809 glColor_premultiply @{$self->{bg}};
1359 } 1810 }
1360 1811
1361 glEnable GL_BLEND; 1812 glEnable GL_BLEND;
1362 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1813 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1363 glBegin GL_QUADS; 1814 glBegin GL_QUADS;
1364 glVertex 0 , 0; 1815 glVertex 0 , 0;
1365 glVertex 0 , $self->{h}; 1816 glVertex 0 , $self->{h};
1366 glVertex $self->{w}, $self->{h}; 1817 glVertex $self->{w}, $self->{h};
1367 glVertex $self->{w}, 0; 1818 glVertex $self->{w}, 0;
… …
1398 my ($self, $ev) = @_; 1849 my ($self, $ev) = @_;
1399 1850
1400 my $sym = $ev->{sym}; 1851 my $sym = $ev->{sym};
1401 1852
1402 if ($sym == 13) { 1853 if ($sym == 13) {
1854 unshift @{$self->{history}},
1855 my $txt = $self->get_text;
1856 $self->{history_pointer} = -1;
1857 $self->{history_saveback} = '';
1403 $self->emit (activate => $self->get_text); 1858 $self->_emit (activate => $txt);
1404 $self->update; 1859 $self->update;
1405 1860
1861 } elsif ($sym == CFClient::SDLK_UP) {
1862 if ($self->{history_pointer} < 0) {
1863 $self->{history_saveback} = $self->get_text;
1864 }
1865 if (@{$self->{history} || []} > 0) {
1866 $self->{history_pointer}++;
1867 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1868 $self->{history_pointer} = @{$self->{history} || []} - 1;
1869 }
1870 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1871 }
1872
1873 } elsif ($sym == CFClient::SDLK_DOWN) {
1874 $self->{history_pointer}--;
1875 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1876
1877 if ($self->{history_pointer} >= 0) {
1878 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1879 } else {
1880 $self->set_text ($self->{history_saveback});
1881 }
1882
1406 } else { 1883 } else {
1407 $self->SUPER::key_down ($ev); 1884 return $self->SUPER::key_down ($ev)
1885 }
1886
1408 } 1887 1
1409
1410} 1888}
1411 1889
1412############################################################################# 1890#############################################################################
1413 1891
1414package CFClient::UI::Button; 1892package CFClient::UI::Button;
… …
1423 1901
1424sub new { 1902sub new {
1425 my $class = shift; 1903 my $class = shift;
1426 1904
1427 $class->SUPER::new ( 1905 $class->SUPER::new (
1428 padding => 4, 1906 padding_x => 4,
1907 padding_y => 4,
1429 fg => [1, 1, 1], 1908 fg => [1, 1, 1],
1430 bg => [1, 1, 1, 0.2],
1431 active_fg => [0, 0, 1], 1909 active_fg => [0, 0, 1],
1432 can_hover => 1, 1910 can_hover => 1,
1433 align => 0, 1911 align => 0,
1434 valign => 0, 1912 valign => 0,
1435 can_events => 1, 1913 can_events => 1,
1436 @_ 1914 @_
1437 ) 1915 )
1438} 1916}
1439 1917
1918sub activate { }
1919
1440sub button_up { 1920sub button_up {
1441 my ($self, $ev, $x, $y) = @_; 1921 my ($self, $ev, $x, $y) = @_;
1442 1922
1923 $self->emit ("activate")
1443 if ($x >= 0 && $x < $self->{w} 1924 if $x >= 0 && $x < $self->{w}
1444 && $y >= 0 && $y < $self->{h}) { 1925 && $y >= 0 && $y < $self->{h};
1445 $self->emit ("activate"); 1926
1446 } 1927 1
1447} 1928}
1448 1929
1449sub _draw { 1930sub _draw {
1450 my ($self) = @_; 1931 my ($self) = @_;
1451 1932
1452 local $self->{fg} = $self->{fg}; 1933 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1453 1934
1454 if ($GRAB == $self) {
1455 $self->{fg} = $self->{active_fg};
1456 }
1457
1458 glEnable GL_BLEND;
1459 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1460 glEnable GL_TEXTURE_2D; 1935 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1936 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462 glColor 0, 0, 0, 1; 1937 glColor 0, 0, 0, 1;
1463 1938
1464 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1939 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1465 1940
1466 glDisable GL_TEXTURE_2D; 1941 glDisable GL_TEXTURE_2D;
1467 glDisable GL_BLEND;
1468 1942
1469 $self->SUPER::_draw; 1943 $self->SUPER::_draw;
1470} 1944}
1471 1945
1472############################################################################# 1946#############################################################################
… …
1483 1957
1484sub new { 1958sub new {
1485 my $class = shift; 1959 my $class = shift;
1486 1960
1487 $class->SUPER::new ( 1961 $class->SUPER::new (
1488 padding => 2, 1962 padding_x => 2,
1963 padding_y => 2,
1489 fg => [1, 1, 1], 1964 fg => [1, 1, 1],
1490 active_fg => [1, 1, 0], 1965 active_fg => [1, 1, 0],
1966 bg => [0, 0, 0, 0.2],
1967 active_bg => [1, 1, 1, 0.5],
1491 state => 0, 1968 state => 0,
1492 can_hover => 1, 1969 can_hover => 1,
1493 @_ 1970 @_
1494 ) 1971 )
1495} 1972}
1496 1973
1497sub size_request { 1974sub size_request {
1498 my ($self) = @_; 1975 my ($self) = @_;
1499 1976
1500 ($self->{padding} * 2 + 6) x 2 1977 (6) x 2
1501} 1978}
1502 1979
1503sub button_down { 1980sub button_down {
1504 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1505 1982
1506 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1983 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1507 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1984 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1508 $self->{state} = !$self->{state}; 1985 $self->{state} = !$self->{state};
1509 $self->emit (changed => $self->{state}); 1986 $self->_emit (changed => $self->{state});
1987 } else {
1988 return 0
1989 }
1990
1510 } 1991 1
1511} 1992}
1512 1993
1513sub _draw { 1994sub _draw {
1514 my ($self) = @_; 1995 my ($self) = @_;
1515 1996
1516 $self->SUPER::_draw; 1997 $self->SUPER::_draw;
1517 1998
1518 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1999 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1519 2000
1520 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2001 my ($w, $h) = @$self{qw(w h)};
2002
2003 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1521 2004
1522 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2005 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1523 2006
1524 glEnable GL_BLEND; 2007 my $tex = $self->{state} ? $tex[1] : $tex[0];
2008
1525 glEnable GL_TEXTURE_2D; 2009 glEnable GL_TEXTURE_2D;
1526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1527
1528 my $tex = $self->{state} ? $tex[1] : $tex[0];
1529
1530 $tex->draw_quad (0, 0, $s, $s); 2010 $tex->draw_quad_alpha (0, 0, $s, $s);
1531
1532 glDisable GL_TEXTURE_2D; 2011 glDisable GL_TEXTURE_2D;
1533 glDisable GL_BLEND;
1534} 2012}
1535 2013
1536############################################################################# 2014#############################################################################
1537 2015
1538package CFClient::UI::Image; 2016package CFClient::UI::Image;
… …
1581 glTranslate 0, -$self->{w}, 0; 2059 glTranslate 0, -$self->{w}, 0;
1582 2060
1583 ($w, $h) = ($h, $w); 2061 ($w, $h) = ($h, $w);
1584 } 2062 }
1585 2063
1586 glEnable GL_BLEND;
1587 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1588 glEnable GL_TEXTURE_2D; 2064 glEnable GL_TEXTURE_2D;
1589 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1590 2066
1591 $tex->draw_quad (0, 0, $w, $h); 2067 $tex->draw_quad_alpha (0, 0, $w, $h);
1592 2068
1593 glDisable GL_BLEND;
1594 glDisable GL_TEXTURE_2D; 2069 glDisable GL_TEXTURE_2D;
1595} 2070}
1596 2071
1597############################################################################# 2072#############################################################################
1598 2073
1599package CFClient::UI::VGauge; 2074package CFClient::UI::VGauge;
1600 2075
1601our @ISA = CFClient::UI::Base::; 2076our @ISA = CFClient::UI::Base::;
2077
2078use List::Util qw(min max);
1602 2079
1603use CFClient::OpenGL; 2080use CFClient::OpenGL;
1604 2081
1605my %tex = ( 2082my %tex = (
1606 food => [ 2083 food => [
1607 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2084 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1608 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2085 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1609 ], 2086 ],
1610 grace => [ 2087 grace => [
1611 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1612 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 2089 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1613 ], 2090 ],
1614 hp => [ 2091 hp => [
1615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1616 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2093 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1617 ], 2094 ],
1618 mana => [ 2095 mana => [
1619 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1620 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 2097 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1621 ], 2098 ],
1622); 2099);
1623 2100
1624# eg. VGauge->new (gauge => 'food'), default gauge: food 2101# eg. VGauge->new (gauge => 'food'), default gauge: food
1625sub new { 2102sub new {
… …
1644} 2121}
1645 2122
1646sub set_max { 2123sub set_max {
1647 my ($self, $max) = @_; 2124 my ($self, $max) = @_;
1648 2125
2126 return if $self->{max_val} == $max;
2127
1649 $self->{max_val} = $max; 2128 $self->{max_val} = $max;
2129 $self->update;
1650} 2130}
1651 2131
1652sub set_value { 2132sub set_value {
1653 my ($self, $val, $max) = @_; 2133 my ($self, $val, $max) = @_;
1654 2134
1655 $self->set_max ($max) 2135 $self->set_max ($max)
1656 if defined $max; 2136 if defined $max;
1657 2137
1658 $max = $self->{max_val}; 2138 return if $self->{val} == $val;
2139
1659 $self->{val} = $val; 2140 $self->{val} = $val;
1660
1661 $self->update; 2141 $self->update;
1662} 2142}
1663 2143
1664sub _draw { 2144sub _draw {
1665 my ($self) = @_; 2145 my ($self) = @_;
1666 2146
1667 my $tex = $tex{$self->{type}}; 2147 my $tex = $tex{$self->{type}};
2148 my ($t1, $t2, $t3) = @$tex;
1668 2149
1669 my ($w, $h) = ($self->{w}, $self->{h}); 2150 my ($w, $h) = ($self->{w}, $self->{h});
1670 2151
1671 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
1672 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
… …
1674 2155
1675 ($w, $h) = ($h, $w); 2156 ($w, $h) = ($h, $w);
1676 } 2157 }
1677 2158
1678 my $ycut = $self->{val} / ($self->{max_val} || 1); 2159 my $ycut = $self->{val} / ($self->{max_val} || 1);
1679 $ycut = 1 if $self->{val} > $self->{max_val};
1680 2160
1681 my $t1 = $tex->[0]; 2161 my $ycut1 = max 0, min 1, $ycut;
1682 my $t2 = $tex->[1]; 2162 my $ycut2 = max 0, min 1, $ycut - 1;
2163
2164 my $h1 = $self->{h} * (1 - $ycut1);
2165 my $h2 = $self->{h} * (1 - $ycut2);
1683 2166
1684 glEnable GL_BLEND; 2167 glEnable GL_BLEND;
1685 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2168 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2169 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1686 glEnable GL_TEXTURE_2D; 2170 glEnable GL_TEXTURE_2D;
1687 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1688 2172
1689 my $h1 = $self->{h} - $ycut * $self->{h};
1690 my $h2 = $ycut * $self->{h};
1691
1692 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2173 glBindTexture GL_TEXTURE_2D, $t1->{name};
1693 glBegin GL_QUADS; 2174 glBegin GL_QUADS;
1694 glTexCoord 0 , 0; glVertex 0 , 0; 2175 glTexCoord 0 , 0; glVertex 0 , 0;
1695 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2176 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1696 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2177 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1697 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2178 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1698 glEnd; 2179 glEnd;
1699 2180
2181 my $ycut1 = List::Util::min 1, $ycut;
1700 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2182 glBindTexture GL_TEXTURE_2D, $t2->{name};
1701 glBegin GL_QUADS; 2183 glBegin GL_QUADS;
1702 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2184 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2185 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1704 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2186 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1705 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2187 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1706 glEnd; 2188 glEnd;
2189
2190 if ($t3) {
2191 glBindTexture GL_TEXTURE_2D, $t3->{name};
2192 glBegin GL_QUADS;
2193 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2194 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2195 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2196 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2197 glEnd;
2198 }
1707 2199
1708 glDisable GL_BLEND; 2200 glDisable GL_BLEND;
1709 glDisable GL_TEXTURE_2D; 2201 glDisable GL_TEXTURE_2D;
1710} 2202}
1711 2203
… …
1717 2209
1718sub new { 2210sub new {
1719 my ($class, %arg) = @_; 2211 my ($class, %arg) = @_;
1720 2212
1721 my $self = $class->SUPER::new ( 2213 my $self = $class->SUPER::new (
1722 tooltip => $arg{type}, 2214 tooltip => $arg{type},
2215 can_hover => 1,
2216 can_events => 1,
1723 %arg, 2217 %arg,
1724 ); 2218 );
1725 2219
1726 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2220 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1727 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2221 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1728 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2222 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1729 2223
1730 $self 2224 $self
1731} 2225}
1732 2226
… …
1735 2229
1736 $self->{value}->set_fontsize ($fsize); 2230 $self->{value}->set_fontsize ($fsize);
1737 $self->{max} ->set_fontsize ($fsize); 2231 $self->{max} ->set_fontsize ($fsize);
1738} 2232}
1739 2233
2234sub set_max {
2235 my ($self, $max) = @_;
2236
2237 $self->{gauge}->set_max ($max);
2238 $self->{max}->set_text ($max);
2239}
2240
1740sub set_value { 2241sub set_value {
1741 my ($self, $val, $max) = @_; 2242 my ($self, $val, $max) = @_;
1742 2243
1743 $self->set_max ($max) 2244 $self->set_max ($max)
1744 if defined $max; 2245 if defined $max;
1745 2246
1746 $self->{gauge}->set_value ($val, $max); 2247 $self->{gauge}->set_value ($val, $max);
1747 $self->{value}->set_text ($val); 2248 $self->{value}->set_text ($val);
1748}
1749
1750sub set_max {
1751 my ($self, $max) = @_;
1752
1753 $self->{gauge}->set_max ($max);
1754 $self->{max}->set_text ($max);
1755} 2249}
1756 2250
1757############################################################################# 2251#############################################################################
1758 2252
1759package CFClient::UI::Slider; 2253package CFClient::UI::Slider;
… …
1769 qw(s1_slider.png s1_slider_bg.png); 2263 qw(s1_slider.png s1_slider_bg.png);
1770 2264
1771sub new { 2265sub new {
1772 my $class = shift; 2266 my $class = shift;
1773 2267
1774 # range [value, low, high, page] 2268 # range [value, low, high, page, unit]
1775 2269
1776 # TODO: 0-width page 2270 # TODO: 0-width page
1777 # TODO: req_w/h are wrong with vertical 2271 # TODO: req_w/h are wrong with vertical
1778 # TODO: calculations are off 2272 # TODO: calculations are off
1779 my $self = $class->SUPER::new ( 2273 my $self = $class->SUPER::new (
1780 fg => [1, 1, 1], 2274 fg => [1, 1, 1],
1781 active_fg => [0, 0, 0], 2275 active_fg => [0, 0, 0],
2276 bg => [0, 0, 0, 0.2],
2277 active_bg => [1, 1, 1, 0.5],
1782 range => [0, 0, 100, 10], 2278 range => [0, 0, 100, 10, 0],
1783 req_w => 20, 2279 min_w => $::WIDTH / 80,
1784 req_h => 20, 2280 min_h => $::WIDTH / 80,
1785 vertical => 0, 2281 vertical => 0,
1786 can_hover => 1, 2282 can_hover => 1,
1787 inner_pad => 5, 2283 inner_pad => 0.02,
1788 @_ 2284 @_
1789 ); 2285 );
1790 2286
2287 $self->set_value ($self->{range}[0]);
2288 $self->update;
2289
1791 $self 2290 $self
1792} 2291}
1793 2292
2293sub changed { }
2294
2295sub set_range {
2296 my ($self, $range) = @_;
2297
2298 ($range, $self->{range}) = ($self->{range}, $range);
2299
2300 $self->update
2301 if "@$range" ne "@{$self->{range}}";
2302}
2303
2304sub set_value {
2305 my ($self, $value) = @_;
2306
2307 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2308
2309 $hi = $lo + 1 if $hi <= $lo;
2310
2311 $page = $hi - $lo if $page > $hi - $lo;
2312
2313 $value = $lo if $value < $lo;
2314 $value = $hi - $page if $value > $hi - $page;
2315
2316 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2317 if $unit;
2318
2319 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2320
2321 if ($value != $old_value) {
2322 $self->_emit (changed => $value);
2323 $self->update;
2324 }
2325}
2326
1794sub size_request { 2327sub size_request {
1795 my ($self) = @_; 2328 my ($self) = @_;
1796 2329
1797 my $w = $self->{req_w}; 2330 ($self->{req_w}, $self->{req_h})
1798 my $h = $self->{req_h};
1799
1800 $self->{vertical} ? ($h, $w) : ($w, $h)
1801} 2331}
1802 2332
1803sub button_down { 2333sub button_down {
1804 my ($self, $ev, $x, $y) = @_; 2334 my ($self, $ev, $x, $y) = @_;
1805 2335
1806 $self->SUPER::button_down ($ev, $x, $y); 2336 $self->SUPER::button_down ($ev, $x, $y);
2337
2338 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2339
1807 $self->mouse_motion ($ev, $x, $y); 2340 $self->mouse_motion ($ev, $x, $y)
1808} 2341}
1809 2342
1810sub mouse_motion { 2343sub mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2344 my ($self, $ev, $x, $y) = @_;
1812 2345
1813 if ($GRAB == $self) { 2346 if ($GRAB == $self) {
2347 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2348
2349 my (undef, $lo, $hi, $page) = @{$self->{range}};
2350
2351 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2352
2353 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2354 } else {
2355 return 0;
2356 }
2357
2358 1
2359}
2360
2361sub update {
2362 my ($self) = @_;
2363
2364 delete $self->{knob_w};
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370
2371 unless ($self->{knob_w}) {
2372 $self->set_value ($self->{range}[0]);
2373
1814 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2374 my ($value, $lo, $hi, $page) = @{$self->{range}};
2375 my $range = ($hi - $page - $lo) || 1e-100;
1815 2376
1816 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2377 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1817 2378
1818 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2379 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1819 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2380 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1820 2381
1821 $x -= $inner_pad_px; # substract the padding 2382 $value = ($value - $lo) / $range;
1822 $x = $x * ($hi - $lo) / $inner_w + $lo; 2383 $value = $value * $self->{scale} + $self->{offset};
1823 $x = $lo if $x < $lo;
1824 $x = $hi - $page if $x > $hi - $page;
1825 $self->{range}[0] = $x;
1826 2384
1827 $self->emit (changed => $x); 2385 $self->{knob_x} = $value - $knob_w * 0.5;
1828 $self->update; 2386 $self->{knob_w} = $knob_w;
1829 } 2387 }
1830}
1831
1832# the inner_* stuff is for generating a padding for the slider handle,
1833# so that the handle doesn't leave the texture. This calculation isn't 100%
1834# correct propably, but it does the job for now
1835sub _calc_inner_pad_px {
1836 my ($self, $w) = @_;
1837 ($w / 100) * $self->{inner_pad} # % to pixels
1838}
1839
1840sub _draw {
1841 my ($self) = @_;
1842 2388
1843 $self->SUPER::_draw (); 2389 $self->SUPER::_draw ();
1844 2390
1845 my ($w, $h) = @$self{qw(w h)}; 2391 glScale $self->{w}, $self->{h};
1846 2392
1847 if ($self->{vertical}) { 2393 if ($self->{vertical}) {
1848 # draw a vertical slider like a rotated horizontal slider 2394 # draw a vertical slider like a rotated horizontal slider
1849 2395
2396 glTranslate 1, 0, 0;
1850 glRotate 90, 0, 0, 1; 2397 glRotate 90, 0, 0, 1;
1851 glTranslate 0, -$self->{w}, 0;
1852
1853 ($w, $h) = ($h, $w);
1854 } 2398 }
1855 2399
1856 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2400 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1857 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2401 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1858 2402
1859 my ($value, $lo, $hi, $page) = @{$self->{range}};
1860
1861 $hi = $value + 1 if $lo == $hi;
1862
1863 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1864 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1865
1866 $page = int $page * $inner_w / ($hi - $lo);
1867 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1868
1869 $w -= $page;
1870 $page &= ~1;
1871 glTranslate $page * 0.5, 0, 0;
1872 $page ||= 2;
1873
1874 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1875 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1876
1877 glEnable GL_BLEND;
1878 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1879 glEnable GL_TEXTURE_2D; 2403 glEnable GL_TEXTURE_2D;
1880 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2404 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1881 2405
1882 # draw background 2406 # draw background
1883 $tex[1]->draw_quad (0, 0, $w, $h); 2407 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1884 2408
1885 # draw handle 2409 # draw handle
1886 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2410 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1887 2411
1888 glDisable GL_BLEND;
1889 glDisable GL_TEXTURE_2D; 2412 glDisable GL_TEXTURE_2D;
1890} 2413}
2414
2415#############################################################################
2416
2417package CFClient::UI::ValSlider;
2418
2419our @ISA = CFClient::UI::HBox::;
2420
2421sub new {
2422 my ($class, %arg) = @_;
2423
2424 my $range = delete $arg{range};
2425
2426 my $self = $class->SUPER::new (
2427 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2428 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2429 to_value => sub { shift },
2430 from_value => sub { shift },
2431 %arg,
2432 );
2433
2434 $self->{slider}->connect (changed => sub {
2435 my ($self, $value) = @_;
2436 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2437 $self->{parent}->emit (changed => $value);
2438 });
2439
2440# $self->{entry}->connect (changed => sub {
2441# my ($self, $value) = @_;
2442# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2443# $self->{parent}->emit (changed => $value);
2444# });
2445
2446 $self->add ($self->{slider}, $self->{entry});
2447
2448 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2449
2450 $self
2451}
2452
2453sub set_range { shift->{slider}->set_range (@_) }
2454sub set_value { shift->{slider}->set_value (@_) }
1891 2455
1892############################################################################# 2456#############################################################################
1893 2457
1894package CFClient::UI::TextView; 2458package CFClient::UI::TextView;
1895 2459
… …
1899 2463
1900sub new { 2464sub new {
1901 my $class = shift; 2465 my $class = shift;
1902 2466
1903 my $self = $class->SUPER::new ( 2467 my $self = $class->SUPER::new (
1904 fontsize => 1, 2468 fontsize => 1,
2469 can_events => 0,
2470 #font => default_font
1905 @_, 2471 @_,
1906 2472
1907 layout => (new CFClient::Layout), 2473 layout => (new CFClient::Layout 1),
1908 par => [], 2474 par => [],
1909 height => 0, 2475 height => 0,
1910 children => [ 2476 children => [
1911 (new CFClient::UI::Empty expand => 1), 2477 (new CFClient::UI::Empty expand => 1),
1912 (new CFClient::UI::Slider vertical => 1), 2478 (new CFClient::UI::Slider vertical => 1),
1913 ], 2479 ],
1914 ); 2480 );
1915 2481
1916 $self->{children}[1]->connect (changed => sub { 2482 $self->{children}[1]->connect (changed => sub { $self->update });
1917 $self->update;
1918 });
1919 2483
1920 $self 2484 $self
1921} 2485}
1922 2486
1923sub set_fontsize { 2487sub set_fontsize {
… …
1925 2489
1926 $self->{fontsize} = $fontsize; 2490 $self->{fontsize} = $fontsize;
1927 $self->reflow; 2491 $self->reflow;
1928} 2492}
1929 2493
2494sub size_allocate {
2495 my ($self, $w, $h) = @_;
2496
2497 $self->SUPER::size_allocate ($w, $h);
2498
2499 $self->{layout}->set_font ($self->{font}) if $self->{font};
2500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $self->{layout}->set_width ($self->{children}[0]{w});
2502
2503 $self->reflow;
2504}
2505
1930sub text_height { 2506sub text_size {
1931 my ($self, $text) = @_; 2507 my ($self, $text, $indent) = @_;
1932 2508
1933 my $layout = $self->{layout}; 2509 my $layout = $self->{layout};
1934 2510
1935 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2511 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1936 $layout->set_width ($self->{w}); 2512 $layout->set_width ($self->{children}[0]{w} - $indent);
1937 $layout->set_text ($text); 2513 $layout->set_markup ($text);
1938 2514
1939 ($layout->size)[1] 2515 $layout->size
1940} 2516}
1941 2517
1942sub reflow { 2518sub reflow {
1943 my ($self) = @_; 2519 my ($self) = @_;
1944 2520
1945 $self->{need_reflow}++; 2521 $self->{need_reflow}++;
1946 $self->update; 2522 $self->update;
1947} 2523}
1948 2524
1949sub size_allocate { 2525sub set_offset {
2526 my ($self, $offset) = @_;
2527
2528 # todo: base offset on lines or so, not on pixels
2529 $self->{children}[1]->set_value ($offset);
2530}
2531
2532sub clear {
1950 my ($self, $w, $h) = @_; 2533 my ($self) = @_;
1951 2534
1952 $self->SUPER::size_allocate ($w, $h); 2535 $self->{par} = [];
1953 2536 $self->{height} = 0;
1954 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2537 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1955 $self->{layout}->set_width ($self->{children}[0]{w});
1956
1957 $self->reflow;
1958} 2538}
1959 2539
1960sub add_paragraph { 2540sub add_paragraph {
1961 my ($self, $color, $text) = @_; 2541 my ($self, $color, $text, $indent) = @_;
1962 2542
1963 #TODO: intelligently "reformat" paragraph 2543 for my $line (split /\n/, $text) {
1964 2544 my ($w, $h) = $self->text_size ($line);
1965 my $height = $self->text_height ($text);
1966
1967 $self->{height} += $height; 2545 $self->{height} += $h;
2546 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2547 }
1968 2548
1969 push @{$self->{par}}, [$height, $color, $text];
1970
1971 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2549 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1972 $self->{children}[1]->update;
1973} 2550}
1974 2551
1975sub update { 2552sub update {
1976 my ($self) = @_; 2553 my ($self) = @_;
1977 2554
… …
1979 2556
1980 return unless $self->{h} > 0; 2557 return unless $self->{h} > 0;
1981 2558
1982 delete $self->{texture}; 2559 delete $self->{texture};
1983 2560
1984 $ROOT->on_refresh ($self, sub { 2561 $ROOT->on_post_alloc ($self, sub {
2562 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2563
1985 if (delete $self->{need_reflow}) { 2564 if (delete $self->{need_reflow}) {
1986 my $height = 0; 2565 my $height = 0;
1987 2566
1988 $height += $_->[0] = $self->text_height ($_->[2]) 2567 my $layout = $self->{layout};
2568
2569 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2570
1989 for @{$self->{par}}; 2571 for (@{$self->{par}}) {
2572 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2573 $layout->set_width ($W - $_->[3]);
2574 $layout->set_markup ($_->[4]);
2575 my ($w, $h) = $layout->size;
2576 $_->[0] = $w + $_->[3];
2577 $_->[1] = $h;
2578 }
2579
2580 $height += $_->[1];
2581 }
1990 2582
1991 $self->{height} = $height; 2583 $self->{height} = $height;
1992 2584
1993 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2585 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1994 2586
1995 delete $self->{texture}; 2587 delete $self->{texture};
1996 } 2588 }
1997 2589
1998 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2590 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1999 glClearColor 0, 0, 0, 1; 2591 glClearColor 0, 0, 0, 0;
2000 glClear GL_COLOR_BUFFER_BIT; 2592 glClear GL_COLOR_BUFFER_BIT;
2001 2593
2594 my $top = int $self->{children}[1]{range}[0];
2595
2596 my $y0 = $top;
2597 my $y1 = $top + $H;
2598
2599 my $y = 0;
2600
2601 my $layout = $self->{layout};
2602
2603 $layout->set_font ($self->{font}) if $self->{font};
2604
2002 glEnable GL_BLEND; 2605 glEnable GL_BLEND;
2606 #TODO# not correct in windows where rgba is forced off
2003 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2607 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2004 glEnable GL_TEXTURE_2D;
2005 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2006
2007 my $top = int $self->{children}[1]{range}[0];
2008
2009 my $y0 = $top;
2010 my $y1 = $top + $self->{h};
2011
2012 my $y = 0;
2013
2014 my $layout = $self->{layout};
2015 2608
2016 for my $par (@{$self->{par}}) { 2609 for my $par (@{$self->{par}}) {
2017 my $h = $par->[0]; 2610 my $h = $par->[1];
2018 2611
2019 if ($y0 < $y + $h && $y < $y1) { 2612 if ($y0 < $y + $h && $y < $y1) {
2613 $layout->set_foreground (@{ $par->[2] });
2614 $layout->set_width ($W - $par->[3]);
2020 $layout->set_text ($par->[2]); 2615 $layout->set_markup ($par->[4]);
2021 2616
2022 glColor @{ $par->[1] }; 2617 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2023 my ($W, $H) = $layout->size; 2618
2024 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2619 glRasterPos $par->[3], $y - $y0;
2620 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2025 } 2621 }
2026 2622
2027 $y += $h; 2623 $y += $h;
2028 } 2624 }
2029 2625
2030 glDisable GL_TEXTURE_2D;
2031 glDisable GL_BLEND; 2626 glDisable GL_BLEND;
2032 }; 2627 };
2033 }); 2628 });
2034} 2629}
2035 2630
2036sub _draw { 2631sub _draw {
2037 my ($self) = @_; 2632 my ($self) = @_;
2038 2633
2039 if ($self->{texture}) {
2040 glEnable GL_TEXTURE_2D; 2634 glEnable GL_TEXTURE_2D;
2041 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2042 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2636 glColor 0, 0, 0, 1;
2637 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2043 glDisable GL_TEXTURE_2D; 2638 glDisable GL_TEXTURE_2D;
2044 }
2045 2639
2046 $self->{children}[1]->draw; 2640 $self->{children}[1]->draw;
2047 2641
2048} 2642}
2049 2643
… …
2097 2691
2098sub new { 2692sub new {
2099 my $class = shift; 2693 my $class = shift;
2100 2694
2101 my $self = $class->SUPER::new ( 2695 my $self = $class->SUPER::new (
2102 state => 0, 2696 state => 0,
2103 connect_activate => \&toggle_flopper, 2697 on_activate => \&toggle_flopper,
2104 can_events => 1,
2105 @_ 2698 @_
2106 ); 2699 );
2107 2700
2108 if ($self->{state}) {
2109 $self->{state} = 0;
2110 $self->toggle_flopper;
2111 }
2112
2113 $self 2701 $self
2114} 2702}
2115 2703
2116sub toggle_flopper { 2704sub toggle_flopper {
2117 my ($self) = @_; 2705 my ($self) = @_;
2118 2706
2119 # TODO: use animation 2707 $self->{other}->toggle_visibility;
2120 if ($self->{state} = !$self->{state}) { 2708}
2121 $CFClient::UI::ROOT->add ($self->{other}); 2709
2122 $self->{other}->move ($self->coord2global (0, $self->{h})); 2710#############################################################################
2711
2712package CFClient::UI::Tooltip;
2713
2714our @ISA = CFClient::UI::Bin::;
2715
2716use CFClient::OpenGL;
2717
2718sub new {
2719 my $class = shift;
2720
2721 $class->SUPER::new (
2722 @_,
2723 can_events => 0,
2724 )
2725}
2726
2727sub set_tooltip_from {
2728 my ($self, $widget) = @_;
2729
2730 my $tooltip = $widget->{tooltip};
2731
2732 if ($ENV{CFPLUS_DEBUG} & 2) {
2733 $tooltip .= "\n\n" . (ref $widget) . "\n"
2734 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2735 . "req $widget->{req_w} $widget->{req_h}\n"
2736 . "visible $widget->{visible}";
2737 }
2738
2739 $self->add (new CFClient::UI::Label
2740 markup => $tooltip,
2741 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2742 fontsize => 0.8,
2743 fg => [0, 0, 0, 1],
2744 ellipsise => 0,
2745 font => ($widget->{tooltip_font} || $::FONT_PROP),
2746 );
2747}
2748
2749sub size_request {
2750 my ($self) = @_;
2751
2752 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2753
2754 ($w + 4, $h + 4)
2755}
2756
2757sub size_allocate {
2758 my ($self, $w, $h) = @_;
2759
2760 $self->SUPER::size_allocate ($w - 4, $h - 4);
2761}
2762
2763sub visibility_change {
2764 my ($self, $visible) = @_;
2765
2766 return unless $visible;
2767
2768 $self->{root}->on_post_alloc ("move_$self" => sub {
2769 my $widget = $self->{owner}
2770 or return;
2771
2772 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2773
2774 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2775 if $x + $self->{w} > $::WIDTH;
2776
2777 $self->move_abs ($x, $y);
2778 });
2779}
2780
2781sub _draw {
2782 my ($self) = @_;
2783
2784 glTranslate 0.375, 0.375;
2785
2786 my ($w, $h) = @$self{qw(w h)};
2787
2788 glColor 1, 0.8, 0.4;
2789 glBegin GL_QUADS;
2790 glVertex 0 , 0;
2791 glVertex 0 , $h;
2792 glVertex $w, $h;
2793 glVertex $w, 0;
2794 glEnd;
2795
2796 glColor 0, 0, 0;
2797 glBegin GL_LINE_LOOP;
2798 glVertex 0 , 0;
2799 glVertex 0 , $h;
2800 glVertex $w, $h;
2801 glVertex $w, 0;
2802 glEnd;
2803
2804 glTranslate 2 - 0.375, 2 - 0.375;
2805
2806 $self->SUPER::_draw;
2807}
2808
2809#############################################################################
2810
2811package CFClient::UI::Face;
2812
2813our @ISA = CFClient::UI::Base::;
2814
2815use CFClient::OpenGL;
2816
2817sub new {
2818 my $class = shift;
2819
2820 my $self = $class->SUPER::new (
2821 aspect => 1,
2822 can_events => 0,
2823 @_,
2824 );
2825
2826 if ($self->{anim} && $self->{animspeed}) {
2827 Scalar::Util::weaken (my $widget = $self);
2828
2829 $self->{timer} = Event->timer (
2830 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2831 hard => 1,
2832 interval => $self->{animspeed},
2833 cb => sub {
2834 ++$widget->{frame};
2835 $widget->update;
2836 },
2837 );
2838 }
2839
2840 $self
2841}
2842
2843sub size_request {
2844 (32, 8)
2845}
2846
2847sub update {
2848 my ($self) = @_;
2849
2850 return unless $self->{visible};
2851
2852 $self->SUPER::update;
2853}
2854
2855sub _draw {
2856 my ($self) = @_;
2857
2858 return unless $::CONN;
2859
2860 my $face;
2861
2862 if ($self->{frame}) {
2863 my $anim = $::CONN->{anim}[$self->{anim}];
2864
2865 $face = $anim->[ $self->{frame} % @$anim ]
2866 if $anim && @$anim;
2867 }
2868
2869 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2870
2871 if ($tex) {
2872 glEnable GL_TEXTURE_2D;
2873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2874 glColor 0, 0, 0, 1;
2875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2876 glDisable GL_TEXTURE_2D;
2877 }
2878}
2879
2880sub DESTROY {
2881 my ($self) = @_;
2882
2883 $self->{timer}->cancel
2884 if $self->{timer};
2885
2886 $self->SUPER::DESTROY;
2887}
2888
2889#############################################################################
2890
2891package CFClient::UI::Buttonbar;
2892
2893our @ISA = CFClient::UI::HBox::;
2894
2895# TODO: should actualyl wrap buttons and other goodies.
2896
2897#############################################################################
2898
2899package CFClient::UI::Menu;
2900
2901our @ISA = CFClient::UI::FancyFrame::;
2902
2903use CFClient::OpenGL;
2904
2905sub new {
2906 my $class = shift;
2907
2908 my $self = $class->SUPER::new (
2909 items => [],
2910 z => 100,
2911 @_,
2912 );
2913
2914 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2915
2916 for my $item (@{ $self->{items} }) {
2917 my ($widget, $cb) = @$item;
2918
2919 # handle various types of items, only text for now
2920 if (!ref $widget) {
2921 $widget = new CFClient::UI::Label
2922 can_hover => 1,
2923 can_events => 1,
2924 text => $widget;
2925 }
2926
2927 $self->{item}{$widget} = $item;
2928
2929 $self->{vbox}->add ($widget);
2930 }
2931
2932 $self
2933}
2934
2935# popup given the event (must be a mouse button down event currently)
2936sub popup {
2937 my ($self, $ev) = @_;
2938
2939 $self->_emit ("popdown");
2940
2941 # maybe save $GRAB? must be careful about events...
2942 $GRAB = $self;
2943 $self->{button} = $ev->{button};
2944
2945 $self->show;
2946 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2947}
2948
2949sub mouse_motion {
2950 my ($self, $ev, $x, $y) = @_;
2951
2952 # TODO: should use vbox->find_widget or so
2953 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2954 $self->{hover} = $self->{item}{$HOVER};
2955
2956 0
2957}
2958
2959sub button_up {
2960 my ($self, $ev, $x, $y) = @_;
2961
2962 if ($ev->{button} == $self->{button}) {
2963 undef $GRAB;
2964 $self->hide;
2965
2123 $self->emit ("open"); 2966 $self->_emit ("popdown");
2967 $self->{hover}[1]->() if $self->{hover};
2124 } else { 2968 } else {
2125 $CFClient::UI::ROOT->remove ($self->{other}); 2969 return 0
2126 $self->emit ("close"); 2970 }
2971
2127 } 2972 1
2128
2129 $self->emit (changed => $self->{state});
2130} 2973}
2131 2974
2132############################################################################# 2975#############################################################################
2133 2976
2977package CFClient::UI::Multiplexer;
2978
2979our @ISA = CFClient::UI::Container::;
2980
2981sub new {
2982 my $class = shift;
2983
2984 my $self = $class->SUPER::new (
2985 @_,
2986 );
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990
2991 $self
2992}
2993
2994sub add {
2995 my ($self, @widgets) = @_;
2996
2997 $self->SUPER::add (@widgets);
2998
2999 $self->{current} = $self->{children}[0]
3000 if @{ $self->{children} };
3001}
3002
3003sub set_current_page {
3004 my ($self, $page_or_widget) = @_;
3005
3006 my $widget = ref $page_or_widget
3007 ? $page_or_widget
3008 : $self->{children}[$page_or_widget];
3009
3010 $self->{current} = $widget;
3011 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3012
3013 $self->_emit (page_changed => $self->{current});
3014
3015 $self->realloc;
3016}
3017
3018sub visible_children {
3019 $_[0]{current}
3020}
3021
3022sub size_request {
3023 my ($self) = @_;
3024
3025 $self->{current}->size_request
3026}
3027
3028sub size_allocate {
3029 my ($self, $w, $h) = @_;
3030
3031 $self->{current}->configure (0, 0, $w, $h);
3032}
3033
3034sub _draw {
3035 my ($self) = @_;
3036
3037 $self->{current}->draw;
3038}
3039
3040#############################################################################
3041
3042package CFClient::UI::Notebook;
3043
3044our @ISA = CFClient::UI::VBox::;
3045
3046sub new {
3047 my $class = shift;
3048
3049 my $self = $class->SUPER::new (
3050 buttonbar => (new CFClient::UI::Buttonbar),
3051 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3052 # filter => # will be put between multiplexer and $self
3053 @_,
3054 );
3055
3056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3057 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3058
3059 $self
3060}
3061
3062sub add {
3063 my ($self, $title, $widget, $tooltip) = @_;
3064
3065 Scalar::Util::weaken $self;
3066
3067 $self->{buttonbar}->add (new CFClient::UI::Button
3068 markup => $title,
3069 tooltip => $tooltip,
3070 on_activate => sub { $self->set_current_page ($widget) },
3071 );
3072
3073 $self->{multiplexer}->add ($widget);
3074}
3075
3076sub set_current_page {
3077 my ($self, $page) = @_;
3078
3079 $self->{multiplexer}->set_current_page ($page);
3080 $self->_emit (page_changed => $self->{multiplexer}{current});
3081}
3082
3083#############################################################################
3084
3085package CFClient::UI::Statusbox;
3086
3087our @ISA = CFClient::UI::VBox::;
3088
3089sub new {
3090 my $class = shift;
3091
3092 my $self = $class->SUPER::new (
3093 fontsize => 0.8,
3094 @_,
3095 );
3096
3097 Scalar::Util::weaken (my $this = $self);
3098
3099 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3100
3101 $self
3102}
3103
3104sub reorder {
3105 my ($self) = @_;
3106 my $NOW = Time::HiRes::time;
3107
3108 # freeze display when hovering over any label
3109 return if $CFClient::UI::TOOLTIP->{owner}
3110 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3111 values %{ $self->{item} };
3112
3113 while (my ($k, $v) = each %{ $self->{item} }) {
3114 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3115 }
3116
3117 my @widgets;
3118
3119 my @items = sort {
3120 $a->{pri} <=> $b->{pri}
3121 or $b->{id} <=> $a->{id}
3122 } values %{ $self->{item} };
3123
3124 $self->{timer}->interval (1);
3125
3126 my $count = 10 + 1;
3127 for my $item (@items) {
3128 last unless --$count;
3129
3130 my $label = $item->{label} ||= do {
3131 # TODO: doesn't handle markup well (read as: at all)
3132 my $short = $item->{count} > 1
3133 ? "<b>$item->{count} ×</b> $item->{text}"
3134 : $item->{text};
3135
3136 for ($short) {
3137 s/^\s+//;
3138 s/\s+/ /g;
3139 }
3140
3141 new CFClient::UI::Label
3142 markup => $short,
3143 tooltip => $item->{tooltip},
3144 tooltip_font => $::FONT_PROP,
3145 tooltip_width => 0.67,
3146 fontsize => $item->{fontsize} || $self->{fontsize},
3147 max_w => $::WIDTH * 0.44,
3148 fg => [@{ $item->{fg} }],
3149 can_events => 1,
3150 can_hover => 1
3151 };
3152
3153 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3154 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3155 $label->update;
3156 $label->set_max_size (undef, $label->{req_h} * $diff)
3157 if $diff < 1;
3158 $self->{timer}->interval (1/30);
3159 } else {
3160 $label->{fg}[3] = $item->{fg}[3] || 1;
3161 }
3162
3163 push @widgets, $label;
3164 }
3165
3166 $self->clear;
3167 $self->SUPER::add (reverse @widgets);
3168}
3169
3170sub add {
3171 my ($self, $text, %arg) = @_;
3172
3173 $text =~ s/^\s+//;
3174 $text =~ s/\s+$//;
3175
3176 return unless $text;
3177
3178 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3179
3180 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3181
3182 if (my $item = $self->{item}{$group}) {
3183 if ($item->{text} eq $text) {
3184 $item->{count}++;
3185 } else {
3186 $item->{count} = 1;
3187 $item->{text} = $item->{tooltip} = $text;
3188 }
3189 $item->{id} = ++$self->{id};
3190 $item->{timeout} = $timeout;
3191 delete $item->{label};
3192 } else {
3193 $self->{item}{$group} = {
3194 id => ++$self->{id},
3195 text => $text,
3196 timeout => $timeout,
3197 tooltip => $text,
3198 fg => [0.8, 0.8, 0.8, 0.8],
3199 pri => 0,
3200 count => 1,
3201 %arg,
3202 };
3203 }
3204
3205 $self->reorder;
3206}
3207
3208sub reconfigure {
3209 my ($self) = @_;
3210
3211 delete $_->{label}
3212 for values %{ $self->{item} || {} };
3213
3214 $self->reorder;
3215 $self->SUPER::reconfigure;
3216}
3217
3218sub DESTROY {
3219 my ($self) = @_;
3220
3221 $self->{timer}->cancel;
3222
3223 $self->SUPER::DESTROY;
3224}
3225
3226#############################################################################
3227
3228package CFClient::UI::Inventory;
3229
3230our @ISA = CFClient::UI::ScrolledWindow::;
3231
3232sub new {
3233 my $class = shift;
3234
3235 my $self = $class->SUPER::new (
3236 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3237 @_,
3238 );
3239
3240 $self
3241}
3242
3243sub set_items {
3244 my ($self, $items) = @_;
3245
3246 $self->{child}->clear;
3247 return unless $items;
3248
3249 my @items = sort {
3250 ($a->{type} <=> $b->{type})
3251 or ($a->{name} cmp $b->{name})
3252 } @$items;
3253
3254 $self->{real_items} = \@items;
3255
3256 my $row = 0;
3257 for my $item (@items) {
3258 CFClient::Item::update_widgets $item;
3259
3260 $self->{child}->add (0, $row, $item->{face_widget});
3261 $self->{child}->add (1, $row, $item->{desc_widget});
3262 $self->{child}->add (2, $row, $item->{weight_widget});
3263
3264 $row++;
3265 }
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::BindEditor;
3271
3272our @ISA = CFClient::UI::FancyFrame::;
3273
3274sub new {
3275 my $class = shift;
3276
3277 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3278
3279 $self->add (my $vb = new CFClient::UI::VBox);
3280
3281
3282 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3283 text => "start recording",
3284 tooltip => "Start/Stops recording of actions."
3285 ."All subsequent actions after the recording started will be captured."
3286 ."The actions are displayed after the record was stopped."
3287 ."To bind the action you have to click on the 'Bind' button",
3288 on_activate => sub {
3289 unless ($self->{recording}) {
3290 $self->start;
3291 } else {
3292 $self->stop;
3293 }
3294 });
3295
3296 $vb->add (new CFClient::UI::Label text => "Actions:");
3297 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3298
3299 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3300 $vb->add (my $hb = new CFClient::UI::HBox);
3301 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3302 $hb->add (new CFClient::UI::Button
3303 text => "bind",
3304 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3305 on_activate => sub {
3306 $self->ask_for_bind;
3307 });
3308
3309 $vb->add (my $hb = new CFClient::UI::HBox);
3310 $hb->add (new CFClient::UI::Button
3311 text => "ok",
3312 expand => 1,
3313 tooltip => "This closes the binding editor and saves the binding",
3314 on_activate => sub {
3315 $self->hide;
3316 $self->commit;
3317 });
3318
3319 $hb->add (new CFClient::UI::Button
3320 text => "cancel",
3321 expand => 1,
3322 tooltip => "This closes the binding editor without saving",
3323 on_activate => sub {
3324 $self->hide;
3325 $self->{binding_cancel}->()
3326 if $self->{binding_cancel};
3327 });
3328
3329 $self->update_binding_widgets;
3330
3331 $self
3332}
3333
3334sub commit {
3335 my ($self) = @_;
3336 my ($mod, $sym, $cmds) = $self->get_binding;
3337 if ($sym != 0 && @$cmds > 0) {
3338 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3339 ."'. Don't forget 'Save Config'!");
3340 $self->{binding_change}->($mod, $sym, $cmds)
3341 if $self->{binding_change};
3342 } else {
3343 $::STATUSBOX->add ("No action bound, no key or action specified!");
3344 $self->{binding_cancel}->()
3345 if $self->{binding_cancel};
3346 }
3347}
3348
3349sub start {
3350 my ($self) = @_;
3351
3352 $self->{rec_btn}->set_text ("stop recording");
3353 $self->{recording} = 1;
3354 $self->clear_command_list;
3355 $::CONN->start_record if $::CONN;
3356}
3357
3358sub stop {
3359 my ($self) = @_;
3360
3361 $self->{rec_btn}->set_text ("start recording");
3362 $self->{recording} = 0;
3363
3364 my $rec;
3365 $rec = $::CONN->stop_record if $::CONN;
3366 return unless ref $rec eq 'ARRAY';
3367 $self->set_command_list ($rec);
3368}
3369
3370
3371sub ask_for_bind_and_commit {
3372 my ($self) = @_;
3373 $self->ask_for_bind (1);
3374}
3375
3376sub ask_for_bind {
3377 my ($self, $commit) = @_;
3378
3379 CFClient::Binder::open_binding_dialog (sub {
3380 my ($mod, $sym) = @_;
3381 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3382 $self->update_binding_widgets;
3383 $self->commit if $commit;
3384 });
3385}
3386
3387# $mod and $sym are the modifiers and key symbol
3388# $cmds is a array ref of strings (the commands)
3389# $cb is the callback that is executed on OK
3390# $ccb is the callback that is executed on CANCEL and
3391# when the binding was unsuccessful on OK
3392sub set_binding {
3393 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3394
3395 $self->clear_command_list;
3396 $self->{recording} = 0;
3397 $self->{rec_btn}->set_text ("start recording");
3398
3399 $self->{binding} = [$mod, $sym];
3400 $self->{commands} = $cmds;
3401
3402 $self->{binding_change} = $cb;
3403 $self->{binding_cancel} = $ccb;
3404
3405 $self->update_binding_widgets;
3406}
3407
3408# this is a shortcut method that asks for a binding
3409# and then just binds it.
3410sub do_quick_binding {
3411 my ($self, $cmds) = @_;
3412 $self->set_binding (undef, undef, $cmds, sub {
3413 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3414 });
3415 $self->ask_for_bind (1);
3416}
3417
3418sub update_binding_widgets {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3422 $self->set_command_list ($cmds);
3423}
3424
3425sub get_binding {
3426 my ($self) = @_;
3427 return (
3428 $self->{binding}->[0],
3429 $self->{binding}->[1],
3430 [ grep { defined $_ } @{$self->{commands}} ]
3431 );
3432}
3433
3434sub clear_command_list {
3435 my ($self) = @_;
3436 $self->{cmdbox}->clear ();
3437}
3438
3439sub set_command_list {
3440 my ($self, $cmds) = @_;
3441
3442 $self->{cmdbox}->clear ();
3443 $self->{commands} = $cmds;
3444
3445 my $idx = 0;
3446
3447 for (@$cmds) {
3448 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3449
3450 my $i = $idx;
3451 $hb->add (new CFClient::UI::Label text => $_);
3452 $hb->add (new CFClient::UI::Button
3453 text => "delete",
3454 tooltip => "Deletes the action from the record",
3455 on_activate => sub {
3456 $self->{cmdbox}->remove ($hb);
3457 $cmds->[$i] = undef;
3458 });
3459
3460
3461 $idx++
3462 }
3463}
3464
3465#############################################################################
3466
3467package CFClient::UI::SpellList;
3468
3469our @ISA = CFClient::UI::Table::;
3470
3471sub new {
3472 my $class = shift;
3473
3474 my $self = $class->SUPER::new (
3475 binding => [],
3476 commands => [],
3477 @_,
3478 )
3479}
3480
3481# XXX: Do sorting? Argl...
3482sub add_spell {
3483 my ($self, $spell) = @_;
3484 $self->{spells}->{$spell->{name}} = $spell;
3485
3486 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3487 face => $spell->{face},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message});
3491
3492 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3493 text => $spell->{name},
3494 can_hover => 1,
3495 can_events => 1,
3496 tooltip => $spell->{message},
3497 expand => 1);
3498
3499 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3500 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3501 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3502 expand => 1);
3503
3504 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3505 text => "bind to key",
3506 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3507}
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511 $self->{tbl_idx} = 0;
3512 $self->add_spell ($_) for values %{$self->{spells}};
3513}
3514
3515sub remove_spell {
3516 my ($self, $spell) = @_;
3517 delete $self->{spells}->{$spell->{name}};
3518 $self->rebuild_spell_list;
3519}
3520
3521#############################################################################
3522
2134package CFClient::UI::Root; 3523package CFClient::UI::Root;
2135 3524
2136our @ISA = CFClient::UI::Container::; 3525our @ISA = CFClient::UI::Container::;
2137 3526
3527use List::Util qw(min max);
3528
2138use CFClient::OpenGL; 3529use CFClient::OpenGL;
2139 3530
2140sub check_size { 3531sub new {
2141 my ($self) = @_; 3532 my $class = shift;
2142 3533
2143 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3534 my $self = $class->SUPER::new (
3535 visible => 1,
3536 @_,
3537 );
3538
3539 Scalar::Util::weaken ($self->{root} = $self);
3540
3541 $self
2144} 3542}
2145 3543
2146sub size_request { 3544sub size_request {
2147 ($::WIDTH, $::HEIGHT) 3545 my ($self) = @_;
2148}
2149 3546
2150sub configure { 3547 ($self->{w}, $self->{h})
3548}
3549
3550sub _to_pixel {
3551 my ($coord, $size, $max) = @_;
3552
3553 $coord =
3554 $coord eq "center" ? ($max - $size) * 0.5
3555 : $coord eq "max" ? $max
3556 : $coord;
3557
3558 $coord = 0 if $coord < 0;
3559 $coord = $max - $size if $coord > $max - $size;
3560
3561 int $coord + 0.5
3562}
3563
3564sub size_allocate {
2151 my ($self, $x, $y, $w, $h) = @_; 3565 my ($self, $w, $h) = @_;
2152 3566
2153 $self->SUPER::configure ($x, $y, $w, $h);
2154
2155 for my $child (@{$self->{children}}) { 3567 for my $child ($self->children) {
2156 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3568 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2157 3569
2158 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3570 $X = $child->{force_x} if exists $child->{force_x};
2159 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3571 $Y = $child->{force_y} if exists $child->{force_y};
3572
3573 $X = _to_pixel $X, $W, $self->{w};
3574 $Y = _to_pixel $Y, $H, $self->{h};
3575
2160 $child->configure ($X, $Y, $W,$H); 3576 $child->configure ($X, $Y, $W, $H);
2161 } 3577 }
2162} 3578}
2163 3579
2164sub _topleft { 3580sub coord2local {
2165 my ($self, $x, $y) = @_; 3581 my ($self, $x, $y) = @_;
2166 3582
2167 ($x, $y) 3583 ($x, $y)
2168} 3584}
2169 3585
3586sub coord2global {
3587 my ($self, $x, $y) = @_;
3588
3589 ($x, $y)
3590}
3591
2170sub update { 3592sub update {
2171 my ($self) = @_; 3593 my ($self) = @_;
2172 3594
2173 $self->check_size; 3595 $::WANT_REFRESH++;
2174 ::refresh ();
2175} 3596}
2176 3597
2177sub add { 3598sub add {
2178 my ($self, $child) = @_; 3599 my ($self, @children) = @_;
2179 3600
2180 # integerize window positions 3601 $_->{is_toplevel} = 1
2181 $child->{x} = int $child->{x}; 3602 for @children;
2182 $child->{y} = int $child->{y};
2183 3603
2184 $self->SUPER::add ($child); 3604 $self->SUPER::add (@children);
3605}
3606
3607sub remove {
3608 my ($self, @children) = @_;
3609
3610 $self->SUPER::remove (@children);
3611
3612 delete $self->{is_toplevel}
3613 for @children;
3614
3615 while (@children) {
3616 my $w = pop @children;
3617 push @children, $w->children;
3618 $w->set_invisible;
3619 }
2185} 3620}
2186 3621
2187sub on_refresh { 3622sub on_refresh {
2188 my ($self, $id, $cb) = @_; 3623 my ($self, $id, $cb) = @_;
2189 3624
2190 $self->{refresh_hook}{$id} = $cb; 3625 $self->{refresh_hook}{$id} = $cb;
2191} 3626}
2192 3627
3628sub on_post_alloc {
3629 my ($self, $id, $cb) = @_;
3630
3631 $self->{post_alloc_hook}{$id} = $cb;
3632}
3633
2193sub draw { 3634sub draw {
2194 my ($self) = @_; 3635 my ($self) = @_;
2195 3636
2196 while (my $rcb = delete $self->{refresh_hook}) { 3637 while ($self->{refresh_hook}) {
2197 $_->() for values %$rcb; 3638 $_->()
3639 for values %{delete $self->{refresh_hook}};
2198 } 3640 }
3641
3642 if ($self->{realloc}) {
3643 my %queue;
3644 my @queue;
3645 my $widget;
3646
3647 outer:
3648 while () {
3649 if (my $realloc = delete $self->{realloc}) {
3650 for $widget (values %$realloc) {
3651 $widget->{visible} or next; # do not resize invisible widgets
3652
3653 $queue{$widget+0}++ and next; # duplicates are common
3654
3655 push @{ $queue[$widget->{visible}] }, $widget;
3656 }
3657 }
3658
3659 while () {
3660 @queue or last outer;
3661
3662 $widget = pop @{ $queue[-1] || [] }
3663 and last;
3664
3665 pop @queue;
3666 }
3667
3668 delete $queue{$widget+0};
3669
3670 my ($w, $h) = $widget->size_request;
3671
3672 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3673 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3674
3675 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3676 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3677
3678 $w = $widget->{force_w} if exists $widget->{force_w};
3679 $h = $widget->{force_h} if exists $widget->{force_h};
3680
3681 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3682 || delete $widget->{force_realloc}) {
3683 $widget->{req_w} = $w;
3684 $widget->{req_h} = $h;
3685
3686 $self->{size_alloc}{$widget+0} = $widget;
3687
3688 if (my $parent = $widget->{parent}) {
3689 $self->{realloc}{$parent+0} = $parent
3690 unless $queue{$parent+0};
3691
3692 $parent->{force_size_alloc} = 1;
3693 $self->{size_alloc}{$parent+0} = $parent;
3694 }
3695 }
3696
3697 delete $self->{realloc}{$widget+0};
3698 }
3699 }
3700
3701 while (my $size_alloc = delete $self->{size_alloc}) {
3702 my @queue = sort { $b->{visible} <=> $a->{visible} }
3703 values %$size_alloc;
3704
3705 while () {
3706 my $widget = pop @queue || last;
3707
3708 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3709
3710 $w = 0 if $w < 0;
3711 $h = 0 if $h < 0;
3712
3713 $w = int $w + 0.5;
3714 $h = int $h + 0.5;
3715
3716 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3717 $widget->{old_w} = $widget->{w};
3718 $widget->{old_h} = $widget->{h};
3719
3720 $widget->{w} = $w;
3721 $widget->{h} = $h;
3722
3723 $widget->emit (size_allocate => $w, $h);
3724 }
3725 }
3726 }
3727
3728 while ($self->{post_alloc_hook}) {
3729 $_->()
3730 for values %{delete $self->{post_alloc_hook}};
3731 }
3732
2199 3733
2200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3734 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3735 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2202 glClear GL_COLOR_BUFFER_BIT; 3736 glClear GL_COLOR_BUFFER_BIT;
2203 3737
2204 glMatrixMode GL_PROJECTION; 3738 glMatrixMode GL_PROJECTION;
2205 glLoadIdentity; 3739 glLoadIdentity;
2206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3740 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2207 glMatrixMode GL_MODELVIEW; 3741 glMatrixMode GL_MODELVIEW;
2208 glLoadIdentity; 3742 glLoadIdentity;
2209 3743
3744 {
3745 package CFClient::UI::Base;
3746
3747 ($draw_x, $draw_y, $draw_w, $draw_h) =
3748 (0, 0, $self->{w}, $self->{h});
3749 }
3750
2210 $self->_draw; 3751 $self->_draw;
2211} 3752}
2212 3753
2213############################################################################# 3754#############################################################################
2214 3755
2215package CFClient::UI; 3756package CFClient::UI;
2216 3757
2217$ROOT = new CFClient::UI::Root; 3758$ROOT = new CFClient::UI::Root;
2218$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 3759$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2219 3760
22201 37611
2221 3762

Diff Legend

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