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

Diff Legend

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