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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.315 by root, Wed Jun 28 21:17:01 2006 UTC

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

Diff Legend

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