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.199 by root, Fri May 12 15:45:42 2006 UTC vs.
Revision 1.319 by root, Sun Jul 2 21:07:26 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 (1);
258 $self->update;
259} 381}
260 382
261sub set_max_size { 383sub set_max_size {
262 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
263 385
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
265 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 }
266} 406}
267 407
268# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
269sub coord2local { 409sub coord2local {
270 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
… …
277 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
278 418
279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
280} 420}
281 421
282sub focus_in { 422sub invoke_focus_in {
283 my ($self) = @_; 423 my ($self) = @_;
284 424
285 return if $FOCUS == $self; 425 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
287 427
288 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
289 429
290 $self->emit (focus_in => $focus); 430 $self->update;
291 431
292 $focus->update if $focus; 432 0
293 $FOCUS->update;
294} 433}
295 434
296sub focus_out { 435sub invoke_focus_out {
297 my ($self) = @_; 436 my ($self) = @_;
298 437
299 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
300 439
301 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
302 441
303 $self->emit (focus_out => $focus); 442 $self->update;
304 443
305 $focus->update if $focus; #? 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
306} 445 unless $FOCUS;
307 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
308sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
309sub button_up { } 458sub invoke_button_up { 1 }
310sub key_down { } 459sub invoke_key_down { 1 }
311sub key_up { } 460sub invoke_key_up { 1 }
312 461
313sub button_down { 462sub invoke_button_down {
314 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
315 464
316 $self->focus_in; 465 $self->grab_focus;
317}
318 466
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
323sub 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
324 535
325sub draw { 536sub draw {
326 my ($self) = @_; 537 my ($self) = @_;
327 538
328 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);
329 548
330 glPushMatrix; 549 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw;
333 glPopMatrix;
334 551
335 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
336 my ($x, $y) = @$self{qw(x y)};
337
338 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
339 glEnable GL_BLEND; 554 glEnable GL_BLEND;
340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
341 glBegin GL_QUADS; 556 glBegin GL_QUADS;
342 glVertex $x , $y;
343 glVertex $x + $self->{w}, $y;
344 glVertex $x + $self->{w}, $y + $self->{h};
345 glVertex $x , $y + $self->{h};
346 glEnd;
347 glDisable GL_BLEND;
348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 557 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 558 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 559 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 560 glVertex 0 , $self->{h};
359 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;
360 glPopMatrix; 575 glPopMatrix;
361 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;
362 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
363} 581}
364 582
365sub _draw { 583sub _draw {
366 my ($self) = @_; 584 my ($self) = @_;
367 585
368 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
369} 587}
370 588
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 # TODO: req_w _does_change after ->reconfigure
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
… …
632 815
633 $ROOT->on_post_alloc ($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
… …
751package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
752 961
753our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
754 963
755sub new { 964sub new {
756 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
757 968
758 my $self; 969 my $self;
759 970
760 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
761 vertical => 1, 972 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 974 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 975 $self->{vp}->set_offset (0, $_[1]);
765 }, 976 },
766 ; 977 ;
767 978
768 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 980 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 981 slider => $slider,
771 @_, 982 %arg,
772 ); 983 );
773 984
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
777 987
778 $self 988 $self
779} 989}
780 990
781#TODO# update range on size_allocate depending on child 991#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 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}
783 1020
784############################################################################# 1021#############################################################################
785 1022
786package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
787 1024
… …
803 1040
804 if ($self->{bg}) { 1041 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
806 1043
807 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
809 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
810 1047
811 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
812 glVertex 0 , 0; 1049 glVertex 0 , 0;
813 glVertex 0 , $h; 1050 glVertex 0 , $h;
814 glVertex $w, $h; 1051 glVertex $w, $h;
… …
827 1064
828our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
829 1066
830use CFClient::OpenGL; 1067use CFClient::OpenGL;
831 1068
832my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
834 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
835 1076
836sub new { 1077sub new {
837 my $class = shift; 1078 my ($class, %arg) = @_;
838
839 # TODO: user_x, user_y, overwrite moveto?
840 1079
841 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
842 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
843 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
844 border => 0.6, 1083 border => 0.6,
845 can_events => 1, 1084 can_events => 1,
846 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
847 ); 1088 );
848 1089
849 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
850 align => 0, 1091 align => 0,
851 valign => 1, 1092 valign => 1,
852 text => $self->{title}, 1093 text => $self->{title},
853 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->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
854 1105
855 $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};
856} 1115}
857 1116
858sub border { 1117sub border {
859 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
860} 1119}
861 1120
862sub size_request { 1121sub size_request {
863 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};
864 1129
865 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
866 1131
867 ( 1132 (
868 $w + $self->border * 2, 1133 $w + $self->border * 2,
869 $h + $self->border * 2, 1134 $h + $self->border * 2,
870 ) 1135 )
871} 1136}
872 1137
873sub size_allocate { 1138sub invoke_size_allocate {
874 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
875 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
876 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
877 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
878 1151
879 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
880 if $self->{title};
881
882 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
883}
884 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
885sub button_down { 1168sub invoke_button_down {
886 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
887 1170
888 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
889 my $border = $self->border; 1172 my $border = $self->border;
890 1173
… …
903 my ($ev, $x, $y) = @_; 1186 my ($ev, $x, $y) = @_;
904 1187
905 my $dx = $ev->{x} - $ox; 1188 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
907 1190
908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1193
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
911 $self->check_size; 1195 $self->realloc;
912 }; 1196 };
913 1197
914 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
915 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
916 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
918 $self->{motion} = sub { 1202 $self->{motion} = sub {
919 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
920 1204
921 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
922 1206
923 $self->move ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
924 $self->update; 1208 # HACK: the next line is required to enforce placement
1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
925 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
926 } 1215 1
927} 1216}
928 1217
929sub button_up { 1218sub invoke_button_up {
930 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
931 1220
932 delete $self->{motion}; 1221 ! ! delete $self->{motion}
933} 1222}
934 1223
935sub mouse_motion { 1224sub invoke_mouse_motion {
936 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
937 1226
938 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
939} 1230}
940 1231
941sub _draw { 1232sub _draw {
942 my ($self) = @_; 1233 my ($self) = @_;
943 1234
1235 my $child = $self->{children}[0];
1236
944 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
946 1239
947 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
949 1242
950 my $border = $self->border; 1243 my $border = $self->border;
951 1244
952 glColor @{ $self->{border_bg} }; 1245 glColor @{ $self->{border_bg} };
953 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1246 $border[0]->draw_quad_alpha (0, 0, $w, $border);
954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1247 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1248 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1249 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
957 1250
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1251 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
959 my $bg = $tex[0]; 1252 glColor @{ $self->{bg} };
960 1253
961 # TODO: repeat texture not scale 1254 # TODO: repeat texture not scale
1255 # solve this better(?)
962 my $rep_x = $cw / $bg->{w}; 1256 $bg->{s} = $cw / $bg->{w};
963 my $rep_y = $ch / $bg->{h}; 1257 $bg->{t} = $ch / $bg->{h};
964
965 glColor @{ $self->{bg} };
966
967 $bg->{s} = $rep_x;
968 $bg->{t} = $rep_y;
969 $bg->{wrap_mode} = 1;
970 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 } 1259 }
972 1260
973 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
974 1262
975 $self->{title}->draw if $self->{title};
976
977 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
978} 1274}
979 1275
980############################################################################# 1276#############################################################################
981 1277
982package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
990sub new { 1286sub new {
991 my $class = shift; 1287 my $class = shift;
992 1288
993 $class->SUPER::new ( 1289 $class->SUPER::new (
994 col_expand => [], 1290 col_expand => [],
995 @_ 1291 @_,
996 ) 1292 )
1293}
1294
1295sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} }
997} 1297}
998 1298
999sub add { 1299sub add {
1000 my ($self, $x, $y, $child) = @_; 1300 my ($self, $x, $y, $child) = @_;
1001 1301
1002 $child->set_parent ($self); 1302 $child->set_parent ($self);
1003 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1004 1304
1005 $child->check_size; 1305 $self->realloc;
1006} 1306}
1007 1307
1008sub children { 1308sub remove {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1309 my ($self, $child) = @_;
1010}
1011 1310
1311 # TODO: not yet implemented
1312}
1313
1012# TODO: move to container class maybe? send childs a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1013sub clear { 1315sub clear {
1014 my ($self) = @_; 1316 my ($self) = @_;
1015 1317
1016 my @children = $self->children; 1318 my @children = $self->children;
1017 delete $self->{children}; 1319 delete $self->{children};
… …
1019 for (@children) { 1321 for (@children) {
1020 delete $_->{parent}; 1322 delete $_->{parent};
1021 $_->hide; 1323 $_->hide;
1022 } 1324 }
1023 1325
1024 $self->update; 1326 $self->realloc;
1025} 1327}
1026 1328
1027sub get_wh { 1329sub get_wh {
1028 my ($self) = @_; 1330 my ($self) = @_;
1029 1331
… …
1055 (sum @$ws), 1357 (sum @$ws),
1056 (sum @$hs), 1358 (sum @$hs),
1057 ) 1359 )
1058} 1360}
1059 1361
1060sub size_allocate { 1362sub invoke_size_allocate {
1061 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1062 1364
1063 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1064 1366
1065 my $req_w = sum @$ws; 1367 my $req_w = (sum @$ws) || 1;
1066 my $req_h = sum @$hs; 1368 my $req_h = (sum @$hs) || 1;
1067 1369
1068 # TODO: nicer code && do row_expand 1370 # TODO: nicer code && do row_expand
1069 my @col_expand = @{$self->{col_expand}}; 1371 my @col_expand = @{$self->{col_expand}};
1070 @col_expand = (1) x @$ws unless @col_expand; 1372 @col_expand = (1) x @$ws unless @col_expand;
1071 my $col_expand = (sum @col_expand) || 1; 1373 my $col_expand = (sum @col_expand) || 1;
… …
1097 } 1399 }
1098 1400
1099 $y += $row_h; 1401 $y += $row_h;
1100 } 1402 }
1101 1403
1404 1
1102} 1405}
1103 1406
1104sub find_widget { 1407sub find_widget {
1105 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1106 1409
… …
1125 } 1428 }
1126} 1429}
1127 1430
1128############################################################################# 1431#############################################################################
1129 1432
1433package CFClient::UI::Box;
1434
1435our @ISA = CFClient::UI::Container::;
1436
1437sub size_request {
1438 my ($self) = @_;
1439
1440 $self->{vertical}
1441 ? (
1442 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1443 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1444 )
1445 : (
1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1448 )
1449}
1450
1451sub invoke_size_allocate {
1452 my ($self, $w, $h) = @_;
1453
1454 my $space = $self->{vertical} ? $h : $w;
1455 my @children = $self->visible_children;
1456
1457 my @req;
1458
1459 if ($self->{homogeneous}) {
1460 @req = ($space / (@children || 1)) x @children;
1461 } else {
1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1463 my $req = List::Util::sum @req;
1464
1465 if ($req > $space) {
1466 # ah well, not enough space
1467 $_ *= $space / $req for @req;
1468 } else {
1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1470
1471 $space = ($space - $req) / $expand; # remaining space to give away
1472
1473 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children;
1475 }
1476 }
1477
1478 CFClient::UI::harmonize \@req;
1479
1480 my $pos = 0;
1481 for (0 .. $#children) {
1482 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1484
1485 $pos += $alloc;
1486 }
1487
1488 1
1489}
1490
1491#############################################################################
1492
1130package CFClient::UI::HBox; 1493package CFClient::UI::HBox;
1131 1494
1132# TODO: wrap into common Box base class
1133
1134our @ISA = CFClient::UI::Container::; 1495our @ISA = CFClient::UI::Box::;
1135 1496
1136sub size_request { 1497sub new {
1137 my ($self) = @_; 1498 my $class = shift;
1138 1499
1139 my @alloc = map [$_->size_request], @{$self->{children}}; 1500 $class->SUPER::new (
1140 1501 vertical => 0,
1141 ( 1502 @_,
1142 (List::Util::sum map $_->[0], @alloc),
1143 (List::Util::max map $_->[1], @alloc),
1144 ) 1503 )
1145} 1504}
1146 1505
1147sub size_allocate {
1148 my ($self, $w, $h) = @_;
1149
1150 ($h, $w) = ($w, $h);
1151
1152 my $children = $self->{children};
1153
1154 my @h = map $_->{req_w}, @$children;
1155
1156 my $req_h = List::Util::sum @h;
1157
1158 if ($req_h > $h) {
1159 # ah well, not enough space
1160 $_ *= $h / $req_h for @h;
1161 } else {
1162 my $exp = List::Util::sum map $_->{expand}, @$children;
1163 $exp ||= 1;
1164
1165 for (0 .. $#$children) {
1166 my $child = $children->[$_];
1167
1168 my $alloc_h = $h[$_];
1169 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1170 $h[$_] = $alloc_h;
1171 }
1172 }
1173
1174 CFClient::UI::harmonize \@h;
1175
1176 my $y = 0;
1177 for (0 .. $#$children) {
1178 my $child = $children->[$_];
1179 my $h = $h[$_];
1180 $child->configure ($y, 0, $h, $w);
1181
1182 $y += $h;
1183 }
1184
1185 1
1186}
1187
1188############################################################################# 1506#############################################################################
1189 1507
1190package CFClient::UI::VBox; 1508package CFClient::UI::VBox;
1191 1509
1192# TODO: wrap into common Box base class
1193
1194our @ISA = CFClient::UI::Container::; 1510our @ISA = CFClient::UI::Box::;
1195 1511
1196sub size_request { 1512sub new {
1197 my ($self) = @_; 1513 my $class = shift;
1198 1514
1199 my @alloc = map [$_->size_request], @{$self->{children}}; 1515 $class->SUPER::new (
1200 1516 vertical => 1,
1201 ( 1517 @_,
1202 (List::Util::max map $_->[0], @alloc),
1203 (List::Util::sum map $_->[1], @alloc),
1204 ) 1518 )
1205} 1519}
1206 1520
1207sub size_allocate {
1208 my ($self, $w, $h) = @_;
1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1212 my $children = $self->{children};
1213
1214 my @h = map $_->{req_h}, @$children;
1215
1216 my $req_h = List::Util::sum @h;
1217
1218 if ($req_h > $h) {
1219 # ah well, not enough space
1220 $_ *= $h / $req_h for @h;
1221 } else {
1222 my $exp = List::Util::sum map $_->{expand}, @$children;
1223 $exp ||= 1;
1224
1225 for (0 .. $#$children) {
1226 my $child = $children->[$_];
1227
1228 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1229 }
1230 }
1231
1232 CFClient::UI::harmonize \@h;
1233
1234 my $y = 0;
1235 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_];
1238 $child->configure (0, $y, $w, $h);
1239
1240 $y += $h;
1241 }
1242
1243 1
1244}
1245
1246############################################################################# 1521#############################################################################
1247 1522
1248package CFClient::UI::Label; 1523package CFClient::UI::Label;
1249 1524
1250our @ISA = CFClient::UI::Base::; 1525our @ISA = CFClient::UI::DrawBG::;
1251 1526
1252use CFClient::OpenGL; 1527use CFClient::OpenGL;
1253 1528
1254sub new { 1529sub new {
1255 my ($class, %arg) = @_; 1530 my ($class, %arg) = @_;
1256 1531
1257 my $self = $class->SUPER::new ( 1532 my $self = $class->SUPER::new (
1258 fg => [1, 1, 1], 1533 fg => [1, 1, 1],
1534 #bg => none
1535 #active_bg => none
1259 #font => default_font 1536 #font => default_font
1260 #text => initial text 1537 #text => initial text
1261 #markup => initial narkup 1538 #markup => initial narkup
1539 #max_w => maximum pixel width
1540 ellipsise => 3, # end
1262 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout),
1263 fontsize => 1, 1542 fontsize => 1,
1264 align => -1, 1543 align => -1,
1265 valign => -1, 1544 valign => -1,
1266 padding => 2, 1545 padding_x => 2,
1546 padding_y => 2,
1267 can_events => 0, 1547 can_events => 0,
1268 %arg 1548 %arg
1269 ); 1549 );
1270 1550
1271 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
… …
1281 } 1561 }
1282 1562
1283 $self 1563 $self
1284} 1564}
1285 1565
1286sub escape { 1566sub escape($) {
1287 local $_ = $_[1]; 1567 local $_ = $_[0];
1288 1568
1289 s/&/&amp;/g; 1569 s/&/&amp;/g;
1290 s/>/&gt;/g; 1570 s/>/&gt;/g;
1291 s/</&lt;/g; 1571 s/</&lt;/g;
1292 1572
1293 $_[1] 1573 $_
1294} 1574}
1295 1575
1296sub update { 1576sub update {
1297 my ($self) = @_; 1577 my ($self) = @_;
1298 1578
1299 delete $self->{texture}; 1579 delete $self->{texture};
1300 $self->SUPER::update; 1580 $self->SUPER::update;
1301} 1581}
1302 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1303sub set_text { 1590sub set_text {
1304 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1305 1592
1306 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1307 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1308 1595
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1310 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1311 1598
1599 delete $self->{size_req};
1600 $self->realloc;
1312 $self->update; 1601 $self->update;
1313 $self->check_size;
1314} 1602}
1315 1603
1316sub set_markup { 1604sub set_markup {
1317 my ($self, $markup) = @_; 1605 my ($self, $markup) = @_;
1318 1606
… …
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1610 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323 1611
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1326 1614
1615 delete $self->{size_req};
1616 $self->realloc;
1327 $self->update; 1617 $self->update;
1328 $self->check_size;
1329} 1618}
1330 1619
1331sub size_request { 1620sub size_request {
1332 my ($self) = @_; 1621 my ($self) = @_;
1333 1622
1623 $self->{size_req} ||= do {
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1629
1338 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1339 1631
1340 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1341 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1342 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1635
1344 my ($w2, $h2) = $self->{template}->size; 1636 my ($w2, $h2) = $self->{template}->size;
1345 1637
1346 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1347 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1640 }
1641
1642 [$w, $h]
1348 } 1643 };
1349 1644
1350 ( 1645 @{ $self->{size_req} }
1351 $w + $self->{padding} * 2,
1352 $h + $self->{padding} * 2,
1353 )
1354} 1646}
1355 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1356sub size_allocate { 1652sub invoke_size_allocate {
1357 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1358 1654
1655 delete $self->{ox};
1656
1359 delete $self->{texture}; 1657 delete $self->{texture}
1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1360} 1661}
1361 1662
1362sub set_fontsize { 1663sub set_fontsize {
1363 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1364 1665
1365 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1366 delete $self->{texture}; 1668 delete $self->{texture};
1367 1669
1368 $self->update; 1670 $self->realloc;
1369 $self->check_size; 1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1370} 1679}
1371 1680
1372sub _draw { 1681sub _draw {
1373 my ($self) = @_; 1682 my ($self) = @_;
1683
1684 $self->SUPER::_draw; # draw background, if applicable
1374 1685
1375 my $tex = $self->{texture} ||= do { 1686 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 1687 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1688 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 1693
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1694 new_from_layout CFClient::Texture $self->{layout}
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1392 }; 1695 };
1393 1696
1697 unless (exists $self->{ox}) {
1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1700 : ($self->{w} - $tex->{w}) * 0.5);
1701
1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1704 : ($self->{h} - $tex->{h}) * 0.5);
1705 };
1706
1394 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1396 1711
1397 if ($tex->{format} == GL_ALPHA) { 1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1398 glColor @{$self->{fg}}; 1714 glColor @{$self->{fg}};
1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1400 } else { 1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1402 } 1719 }
1403 1720
1404 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1405} 1722}
1406 1723
… …
1422 active_fg => [0, 0, 0], 1739 active_fg => [0, 0, 0],
1423 can_hover => 1, 1740 can_hover => 1,
1424 can_focus => 1, 1741 can_focus => 1,
1425 valign => 0, 1742 valign => 0,
1426 can_events => 1, 1743 can_events => 1,
1744 #text => ...
1745 #hidden => "*",
1427 @_ 1746 @_
1428 ) 1747 )
1429} 1748}
1430 1749
1431sub _set_text { 1750sub _set_text {
… …
1433 1752
1434 delete $self->{cur_h}; 1753 delete $self->{cur_h};
1435 1754
1436 return if $self->{text} eq $text; 1755 return if $self->{text} eq $text;
1437 1756
1438 delete $self->{texture};
1439
1440 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1441 $self->{text} = $text; 1758 $self->{text} = $text;
1442 1759
1443 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1762 delete $self->{size_req};
1445 1763
1446 $self->emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1765
1766 $self->realloc;
1767 $self->update;
1447} 1768}
1448 1769
1449sub set_text { 1770sub set_text {
1450 my ($self, $text) = @_; 1771 my ($self, $text) = @_;
1451 1772
1452 $self->{cursor} = length $text; 1773 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 1774 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456} 1775}
1457 1776
1458sub get_text { 1777sub get_text {
1459 $_[0]{text} 1778 $_[0]{text}
1460} 1779}
… …
1465 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1466 1785
1467 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1468} 1787}
1469 1788
1470sub size_allocate {
1471 my ($self, $w, $h) = @_;
1472
1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474}
1475
1476sub key_down { 1789sub invoke_key_down {
1477 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1478 1791
1479 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1480 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1481 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
1482 1795
1483 my $text = $self->get_text; 1796 my $text = $self->get_text;
1484 1797
1485 if ($sym == 8) { 1798 if ($uni == 8) {
1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1799 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1487 } elsif ($sym == 127) { 1800 } elsif ($uni == 127) {
1488 substr $text, $self->{cursor}, 1, ""; 1801 substr $text, $self->{cursor}, 1, "";
1489 } elsif ($sym == CFClient::SDLK_LEFT) { 1802 } elsif ($sym == CFClient::SDLK_LEFT) {
1490 --$self->{cursor} if $self->{cursor}; 1803 --$self->{cursor} if $self->{cursor};
1491 } elsif ($sym == CFClient::SDLK_RIGHT) { 1804 } elsif ($sym == CFClient::SDLK_RIGHT) {
1492 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1805 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1493 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1494 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1495 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1496 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1497 } elsif ($sym == 27) { 1810 } elsif ($uni == 27) {
1498 $self->emit ('escape'); 1811 $self->emit ('escape');
1499 } elsif ($uni) { 1812 } elsif ($uni) {
1500 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else {
1815 return 0;
1501 } 1816 }
1502 1817
1503 $self->_set_text ($text); 1818 $self->_set_text ($text);
1504 $self->update;
1505}
1506 1819
1820 $self->realloc;
1821
1822 1
1823}
1824
1507sub focus_in { 1825sub invoke_focus_in {
1508 my ($self) = @_; 1826 my ($self) = @_;
1509 1827
1510 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1511 1829
1512 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1513} 1831}
1514 1832
1515sub button_down { 1833sub invoke_button_down {
1516 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1517 1835
1518 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1519 1837
1520 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1521 1839
1522 # byte-index to char-index 1840 # byte-index to char-index
1523 my $text = $self->{text}; 1841 my $text = $self->{text};
1524 utf8::encode $text; 1842 utf8::encode $text;
1525 $self->{cursor} = length substr $text, 0, $idx; 1843 $self->{cursor} = length substr $text, 0, $idx;
1526 1844
1527 $self->_set_text ($self->{text}); 1845 $self->_set_text ($self->{text});
1528 $self->update; 1846 $self->update;
1847
1848 1
1529} 1849}
1530 1850
1531sub mouse_motion { 1851sub invoke_mouse_motion {
1532 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1533# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1854
1855 1
1534} 1856}
1535 1857
1536sub _draw { 1858sub _draw {
1537 my ($self) = @_; 1859 my ($self) = @_;
1538 1860
1539 local $self->{fg} = $self->{fg}; 1861 local $self->{fg} = $self->{fg};
1540 1862
1541 if ($FOCUS == $self) { 1863 if ($FOCUS == $self) {
1542 glColor @{$self->{active_bg}}; 1864 glColor_premultiply @{$self->{active_bg}};
1543 $self->{fg} = $self->{active_fg}; 1865 $self->{fg} = $self->{active_fg};
1544 } else { 1866 } else {
1545 glColor @{$self->{bg}}; 1867 glColor_premultiply @{$self->{bg}};
1546 } 1868 }
1547 1869
1548 glEnable GL_BLEND; 1870 glEnable GL_BLEND;
1549 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1871 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1550 glBegin GL_QUADS; 1872 glBegin GL_QUADS;
1551 glVertex 0 , 0; 1873 glVertex 0 , 0;
1552 glVertex 0 , $self->{h}; 1874 glVertex 0 , $self->{h};
1553 glVertex $self->{w}, $self->{h}; 1875 glVertex $self->{w}, $self->{h};
1554 glVertex $self->{w}, 0; 1876 glVertex $self->{w}, 0;
… …
1579 1901
1580our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1581 1903
1582use CFClient::OpenGL; 1904use CFClient::OpenGL;
1583 1905
1584sub key_down { 1906sub invoke_key_down {
1585 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1586 1908
1587 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1588 1910
1589 if ($sym == 13) { 1911 if ($sym == 13) {
1590 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1591 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1592 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1594 $self->emit (activate => $txt); 1917 $self->emit (activate => $txt);
1595 $self->update; 1918 $self->update;
1596 1919
… …
1615 } else { 1938 } else {
1616 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1617 } 1940 }
1618 1941
1619 } else { 1942 } else {
1620 $self->SUPER::key_down ($ev); 1943 return $self->SUPER::invoke_key_down ($ev)
1944 }
1945
1621 } 1946 1
1622
1623} 1947}
1624 1948
1625############################################################################# 1949#############################################################################
1626 1950
1627package CFClient::UI::Button; 1951package CFClient::UI::Button;
… …
1636 1960
1637sub new { 1961sub new {
1638 my $class = shift; 1962 my $class = shift;
1639 1963
1640 $class->SUPER::new ( 1964 $class->SUPER::new (
1641 padding => 4, 1965 padding_x => 4,
1966 padding_y => 4,
1642 fg => [1, 1, 1], 1967 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 1968 active_fg => [0, 0, 1],
1645 can_hover => 1, 1969 can_hover => 1,
1646 align => 0, 1970 align => 0,
1647 valign => 0, 1971 valign => 0,
1648 can_events => 1, 1972 can_events => 1,
1649 @_ 1973 @_
1650 ) 1974 )
1651} 1975}
1652 1976
1653sub button_up { 1977sub invoke_button_up {
1654 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1655 1979
1980 $self->emit ("activate")
1656 if ($x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1657 && $y >= 0 && $y < $self->{h}) { 1982 && $y >= 0 && $y < $self->{h};
1658 $self->emit ("activate"); 1983
1659 } 1984 1
1660} 1985}
1661 1986
1662sub _draw { 1987sub _draw {
1663 my ($self) = @_; 1988 my ($self) = @_;
1664 1989
1665 local $self->{fg} = $self->{fg}; 1990 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1666
1667 if ($GRAB == $self) {
1668 $self->{fg} = $self->{active_fg};
1669 }
1670 1991
1671 glEnable GL_TEXTURE_2D; 1992 glEnable GL_TEXTURE_2D;
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1673 glColor 0, 0, 0, 1; 1994 glColor 0, 0, 0, 1;
1674 1995
… …
1679 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
1680} 2001}
1681 2002
1682############################################################################# 2003#############################################################################
1683 2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
2037}
2038
2039#############################################################################
2040
1684package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
1685 2042
1686our @ISA = CFClient::UI::DrawBG::; 2043our @ISA = CFClient::UI::DrawBG::;
1687 2044
1688my @tex = 2045my @tex =
… …
1693 2050
1694sub new { 2051sub new {
1695 my $class = shift; 2052 my $class = shift;
1696 2053
1697 $class->SUPER::new ( 2054 $class->SUPER::new (
1698 padding => 2, 2055 padding_x => 2,
2056 padding_y => 2,
1699 fg => [1, 1, 1], 2057 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 2058 active_fg => [1, 1, 0],
2059 bg => [0, 0, 0, 0.2],
2060 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 2061 state => 0,
1702 can_hover => 1, 2062 can_hover => 1,
1703 @_ 2063 @_
1704 ) 2064 )
1705} 2065}
1706 2066
1707sub size_request { 2067sub size_request {
1708 my ($self) = @_; 2068 my ($self) = @_;
1709 2069
1710 ($self->{padding} * 2 + 6) x 2 2070 (6) x 2
1711} 2071}
1712 2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
1713sub button_down { 2081sub invoke_button_down {
1714 my ($self, $ev, $x, $y) = @_; 2082 my ($self, $ev, $x, $y) = @_;
1715 2083
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1718 $self->{state} = !$self->{state}; 2086 $self->toggle;
1719 $self->emit (changed => $self->{state}); 2087 } else {
2088 return 0
2089 }
2090
1720 } 2091 1
1721} 2092}
1722 2093
1723sub _draw { 2094sub _draw {
1724 my ($self) = @_; 2095 my ($self) = @_;
1725 2096
1726 $self->SUPER::_draw; 2097 $self->SUPER::_draw;
1727 2098
1728 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2099 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1729 2100
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2101 my ($w, $h) = @$self{qw(w h)};
2102
2103 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1731 2104
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2105 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 2106
1734 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2107 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735 2108
… …
1743package CFClient::UI::Image; 2116package CFClient::UI::Image;
1744 2117
1745our @ISA = CFClient::UI::Base::; 2118our @ISA = CFClient::UI::Base::;
1746 2119
1747use CFClient::OpenGL; 2120use CFClient::OpenGL;
1748use Carp qw/confess/;
1749 2121
1750our %loaded_images; 2122our %texture_cache;
1751 2123
1752sub new { 2124sub new {
1753 my $class = shift; 2125 my $class = shift;
1754 2126
1755 my $self = $class->SUPER::new (can_events => 0, @_); 2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
1756 2131
1757 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
1758 2134
1759 $loaded_images{$self->{image}} ||= 2135 $self->{tex} = $texture_cache{$self->{path}} ||=
1760 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1761 2137
1762 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2138 Scalar::Util::weaken $texture_cache{$self->{path}};
1763 2139
1764 Scalar::Util::weaken $loaded_images{$self->{image}}; 2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1765
1766 $self->{aspect} = $tex->{w} / $tex->{h};
1767 2141
1768 $self 2142 $self
1769} 2143}
1770 2144
1771sub size_request { 2145sub size_request {
1772 my ($self) = @_; 2146 my ($self) = @_;
1773 2147
1774 ($self->{tex}->{w}, $self->{tex}->{h}) 2148 ($self->{tex}{w}, $self->{tex}{h})
1775} 2149}
1776 2150
1777sub _draw { 2151sub _draw {
1778 my ($self) = @_; 2152 my ($self) = @_;
1779 2153
… …
1888 my $ycut1 = max 0, min 1, $ycut; 2262 my $ycut1 = max 0, min 1, $ycut;
1889 my $ycut2 = max 0, min 1, $ycut - 1; 2263 my $ycut2 = max 0, min 1, $ycut - 1;
1890 2264
1891 my $h1 = $self->{h} * (1 - $ycut1); 2265 my $h1 = $self->{h} * (1 - $ycut1);
1892 my $h2 = $self->{h} * (1 - $ycut2); 2266 my $h2 = $self->{h} * (1 - $ycut2);
2267 my $h3 = $self->{h};
2268
2269 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1893 2270
1894 glEnable GL_BLEND; 2271 glEnable GL_BLEND;
1895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2272 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2273 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1896 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
1897 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1898 2276
1899 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2277 glBindTexture GL_TEXTURE_2D, $t1->{name};
1900 glBegin GL_QUADS; 2278 glBegin GL_QUADS;
… …
1915 2293
1916 if ($t3) { 2294 if ($t3) {
1917 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2295 glBindTexture GL_TEXTURE_2D, $t3->{name};
1918 glBegin GL_QUADS; 2296 glBegin GL_QUADS;
1919 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2297 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1920 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2298 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1921 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2299 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1922 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2300 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1923 glEnd; 2301 glEnd;
1924 } 2302 }
1925 2303
1926 glDisable GL_BLEND; 2304 glDisable GL_BLEND;
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2367 qw(s1_slider.png s1_slider_bg.png);
1990 2368
1991sub new { 2369sub new {
1992 my $class = shift; 2370 my $class = shift;
1993 2371
1994 # range [value, low, high, page] 2372 # range [value, low, high, page, unit]
1995 2373
1996 # TODO: 0-width page 2374 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2375 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2376 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2377 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 2378 fg => [1, 1, 1],
2001 active_fg => [0, 0, 0], 2379 active_fg => [0, 0, 0],
2380 bg => [0, 0, 0, 0.2],
2381 active_bg => [1, 1, 1, 0.5],
2002 range => [0, 0, 100, 10], 2382 range => [0, 0, 100, 10, 0],
2003 req_w => $::WIDTH / 80, 2383 min_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2384 min_h => $::WIDTH / 80,
2005 vertical => 0, 2385 vertical => 0,
2006 can_hover => 1, 2386 can_hover => 1,
2007 inner_pad => 5, 2387 inner_pad => 0.02,
2008 @_ 2388 @_
2009 ); 2389 );
2010 2390
2391 $self->set_value ($self->{range}[0]);
2392 $self->update;
2393
2011 $self 2394 $self
2012} 2395}
2013 2396
2397sub set_range {
2398 my ($self, $range) = @_;
2399
2400 ($range, $self->{range}) = ($self->{range}, $range);
2401
2402 if ("@$range" ne "@{$self->{range}}") {
2403 $self->update;
2404 $self->set_value ($self->{range}[0]);
2405 }
2406}
2407
2408sub set_value {
2409 my ($self, $value) = @_;
2410
2411 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2412
2413 $hi = $lo + 1 if $hi <= $lo;
2414
2415 $page = $hi - $lo if $page > $hi - $lo;
2416
2417 $value = $lo if $value < $lo;
2418 $value = $hi - $page if $value > $hi - $page;
2419
2420 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2421 if $unit;
2422
2423 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2424
2425 if ($value != $old_value) {
2426 $self->emit (changed => $value);
2427 $self->update;
2428 }
2429}
2430
2014sub size_request { 2431sub size_request {
2015 my ($self) = @_; 2432 my ($self) = @_;
2016 2433
2017 my $w = $self->{req_w}; 2434 ($self->{req_w}, $self->{req_h})
2018 my $h = $self->{req_h};
2019
2020 $self->{vertical} ? ($h, $w) : ($w, $h)
2021} 2435}
2022 2436
2023sub button_down { 2437sub invoke_button_down {
2024 my ($self, $ev, $x, $y) = @_; 2438 my ($self, $ev, $x, $y) = @_;
2025 2439
2026 $self->SUPER::button_down ($ev, $x, $y); 2440 $self->SUPER::invoke_button_down ($ev, $x, $y);
2441
2442 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2443
2027 $self->mouse_motion ($ev, $x, $y); 2444 $self->invoke_mouse_motion ($ev, $x, $y)
2028} 2445}
2029 2446
2030sub mouse_motion { 2447sub invoke_mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2448 my ($self, $ev, $x, $y) = @_;
2032 2449
2033 if ($GRAB == $self) { 2450 if ($GRAB == $self) {
2451 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2452
2453 my (undef, $lo, $hi, $page) = @{$self->{range}};
2454
2455 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2456
2457 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2458 } else {
2459 return 0;
2460 }
2461
2462 1
2463}
2464
2465sub update {
2466 my ($self) = @_;
2467
2468 delete $self->{knob_w};
2469 $self->SUPER::update;
2470}
2471
2472sub _draw {
2473 my ($self) = @_;
2474
2475 unless ($self->{knob_w}) {
2476 $self->set_value ($self->{range}[0]);
2477
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2478 my ($value, $lo, $hi, $page) = @{$self->{range}};
2479 my $range = ($hi - $page - $lo) || 1e-100;
2035 2480
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2481 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037 2482
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2483 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2484 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040 2485
2041 $x -= $inner_pad_px; # substract the padding 2486 $value = ($value - $lo) / $range;
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2487 $value = $value * $self->{scale} + $self->{offset};
2043 $x = $lo if $x < $lo;
2044 $x = $hi - $page if $x > $hi - $page;
2045 $self->{range}[0] = $x;
2046 2488
2047 $self->emit (changed => $x); 2489 $self->{knob_x} = $value - $knob_w * 0.5;
2048 $self->update; 2490 $self->{knob_w} = $knob_w;
2049 } 2491 }
2050}
2051
2052# the inner_* stuff is for generating a padding for the slider handle,
2053# so that the handle doesn't leave the texture. This calculation isn't 100%
2054# correct propably, but it does the job for now
2055sub _calc_inner_pad_px {
2056 my ($self, $w) = @_;
2057 ($w / 100) * $self->{inner_pad} # % to pixels
2058}
2059
2060sub _draw {
2061 my ($self) = @_;
2062 2492
2063 $self->SUPER::_draw (); 2493 $self->SUPER::_draw ();
2064 2494
2065 my ($w, $h) = @$self{qw(w h)}; 2495 glScale $self->{w}, $self->{h};
2066 2496
2067 if ($self->{vertical}) { 2497 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2498 # draw a vertical slider like a rotated horizontal slider
2069 2499
2500 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 2501 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2502 }
2075 2503
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2504 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2505 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2506
2079 my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081 $hi = $value + 1 if $lo == $hi;
2082
2083 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086 $page = int $page * $inner_w / ($hi - $lo);
2087 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089 $w -= $page;
2090 $page &= ~1;
2091 glTranslate $page * 0.5, 0, 0;
2092 $page ||= 2;
2093
2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097 glEnable GL_TEXTURE_2D; 2507 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2508 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2509
2100 # draw background 2510 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2511 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2512
2103 # draw handle 2513 # draw handle
2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2514 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2105 2515
2106 glDisable GL_TEXTURE_2D; 2516 glDisable GL_TEXTURE_2D;
2107} 2517}
2108 2518
2109############################################################################# 2519#############################################################################
2110 2520
2521package CFClient::UI::ValSlider;
2522
2523our @ISA = CFClient::UI::HBox::;
2524
2525sub new {
2526 my ($class, %arg) = @_;
2527
2528 my $range = delete $arg{range};
2529
2530 my $self = $class->SUPER::new (
2531 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2532 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2533 to_value => sub { shift },
2534 from_value => sub { shift },
2535 %arg,
2536 );
2537
2538 $self->{slider}->connect (changed => sub {
2539 my ($self, $value) = @_;
2540 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2541 $self->{parent}->emit (changed => $value);
2542 });
2543
2544# $self->{entry}->connect (changed => sub {
2545# my ($self, $value) = @_;
2546# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2547# $self->{parent}->emit (changed => $value);
2548# });
2549
2550 $self->add ($self->{slider}, $self->{entry});
2551
2552 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2553
2554 $self
2555}
2556
2557sub set_range { shift->{slider}->set_range (@_) }
2558sub set_value { shift->{slider}->set_value (@_) }
2559
2560#############################################################################
2561
2111package CFClient::UI::TextView; 2562package CFClient::UI::TextScroller;
2112 2563
2113our @ISA = CFClient::UI::HBox::; 2564our @ISA = CFClient::UI::HBox::;
2114 2565
2115use CFClient::OpenGL; 2566use CFClient::OpenGL;
2116 2567
… …
2118 my $class = shift; 2569 my $class = shift;
2119 2570
2120 my $self = $class->SUPER::new ( 2571 my $self = $class->SUPER::new (
2121 fontsize => 1, 2572 fontsize => 1,
2122 can_events => 0, 2573 can_events => 0,
2574 indent => 0,
2123 #font => default_font 2575 #font => default_font
2124 @_, 2576 @_,
2125 2577
2126 layout => (new CFClient::Layout 1), 2578 layout => (new CFClient::Layout 1),
2127 par => [], 2579 par => [],
… …
2142 2594
2143 $self->{fontsize} = $fontsize; 2595 $self->{fontsize} = $fontsize;
2144 $self->reflow; 2596 $self->reflow;
2145} 2597}
2146 2598
2147sub text_height { 2599sub size_request {
2600 my ($self) = @_;
2601
2602 my ($empty, $slider) = @{ $self->{children} };
2603
2604 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request
2606}
2607
2608sub invoke_size_allocate {
2609 my ($self, $w, $h) = @_;
2610
2611 my ($empty, $slider, @other) = @{ $self->{children} };
2612 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2613
2614 $self->{layout}->set_font ($self->{font}) if $self->{font};
2615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2616 $self->{layout}->set_width ($empty->{w});
2617 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2618
2619 $self->reflow;
2620
2621 local $self->{children} = [$empty, $slider];
2622 $self->SUPER::invoke_size_allocate ($w, $h)
2623}
2624
2625sub get_layout {
2148 my ($self, $text) = @_; 2626 my ($self, $para) = @_;
2149 2627
2150 my $layout = $self->{layout}; 2628 my $layout = $self->{layout};
2151 2629
2630 $layout->set_font ($self->{font}) if $self->{font};
2631 $layout->set_foreground (@{$para->{fg}});
2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2632 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153 $layout->set_width ($self->{children}[0]{w}); 2633 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2634 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2154 $layout->set_markup ($text); 2635 $layout->set_markup ($para->{markup});
2636
2637 $layout->set_shapes (
2638 map
2639 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2640 @{$para->{widget}}
2155 2641 );
2156 ($layout->size)[1] 2642
2643 $layout
2157} 2644}
2158 2645
2159sub reflow { 2646sub reflow {
2160 my ($self) = @_; 2647 my ($self) = @_;
2161 2648
2162 $self->{need_reflow}++; 2649 $self->{need_reflow}++;
2163 $self->update; 2650 $self->update;
2164} 2651}
2165 2652
2166sub size_allocate { 2653sub set_offset {
2654 my ($self, $offset) = @_;
2655
2656 # todo: base offset on lines or so, not on pixels
2657 $self->{children}[1]->set_value ($offset);
2658}
2659
2660sub clear {
2167 my ($self, $w, $h) = @_; 2661 my ($self) = @_;
2168 2662
2169 $self->SUPER::size_allocate ($w, $h); 2663 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other;
2170 2665
2171 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2666 $self->{par} = [];
2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2667 $self->{height} = 0;
2173 $self->{layout}->set_width ($self->{children}[0]{w}); 2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2174
2175 $self->reflow;
2176} 2669}
2177 2670
2178sub add_paragraph { 2671sub add_paragraph {
2179 my ($self, $color, $text) = @_; 2672 my ($self, $color, $para, $indent) = @_;
2180 2673
2181 #TODO: intelligently "reformat" paragraph 2674 my ($text, @w) = ref $para ? @$para : $para;
2182 2675
2183 my $height = $self->text_height ($text); 2676 $para = {
2677 w => 1e10,
2678 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2683 };
2184 2684
2185 $self->{height} += $height; 2685 $self->add (@w) if @w;
2686 push @{$self->{par}}, $para;
2186 2687
2187 push @{$self->{par}}, [$height, $color, $text]; 2688 $self->{need_reflow}++;
2689 $self->update;
2690}
2188 2691
2189 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2692sub scroll_to_bottom {
2190 $self->{children}[1]->update; 2693 my ($self) = @_;
2694
2695 $self->{scroll_to_bottom} = 1;
2696 $self->update;
2191} 2697}
2192 2698
2193sub update { 2699sub update {
2194 my ($self) = @_; 2700 my ($self) = @_;
2195 2701
… …
2197 2703
2198 return unless $self->{h} > 0; 2704 return unless $self->{h} > 0;
2199 2705
2200 delete $self->{texture}; 2706 delete $self->{texture};
2201 2707
2202 $ROOT->on_post_alloc ($self, sub { 2708 $ROOT->on_post_alloc ($self => sub {
2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2710
2203 if (delete $self->{need_reflow}) { 2711 if (delete $self->{need_reflow}) {
2204 my $height = 0; 2712 my $height = 0;
2205 2713
2206 $height += $_->[0] = $self->text_height ($_->[2])
2207 for @{$self->{par}}; 2714 for my $para (@{$self->{par}}) {
2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2716 my $layout = $self->get_layout ($para);
2717 my ($w, $h) = $layout->size;
2718
2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2722 }
2723
2724 $height += $para->{h};
2725 }
2208 2726
2209 $self->{height} = $height; 2727 $self->{height} = $height;
2210 2728
2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2212 2730
2213 delete $self->{texture}; 2731 delete $self->{texture};
2214 } 2732 }
2215 2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2217 glClearColor 0, 0, 0, 0; 2739 glClearColor 0, 0, 0, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 2740 glClear GL_COLOR_BUFFER_BIT;
2219 2741
2220 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223 my $top = int $self->{children}[1]{range}[0]; 2742 my $top = int $self->{children}[1]{range}[0];
2224 2743
2225 my $y0 = $top; 2744 my $y0 = $top;
2226 my $y1 = $top + $self->{h}; 2745 my $y1 = $top + $H;
2227 2746
2228 my $y = 0; 2747 my $y = 0;
2229 2748
2230 my $layout = $self->{layout}; 2749 glEnable GL_BLEND;
2750 #TODO# not correct in windows where rgba is forced off
2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2231 2752
2232 $layout->set_font ($self->{font}) if $self->{font};
2233
2234 for my $par (@{$self->{par}}) { 2753 for my $para (@{$self->{par}}) {
2235 my $h = $par->[0]; 2754 my $h = $para->{h};
2236 2755
2237 if ($y0 < $y + $h && $y < $y1) { 2756 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2239 $layout->set_markup ($par->[2]);
2240 2757
2241 my ($W, $H) = $layout->size; 2758 my $layout = $self->get_layout ($para);
2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2759
2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762 glRasterPos $para->{indent}, $y - $y0;
2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764
2765 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes;
2767
2768 glDisable GL_BLEND;
2769 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, ();
2771
2772 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0;
2774
2775 $_->draw;
2776 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 }
2243 } 2780 }
2244 2781
2245 $y += $h; 2782 $y += $h;
2246 } 2783 }
2247 2784
2248 glDisable GL_TEXTURE_2D; 2785 glDisable GL_BLEND;
2249 }; 2786 };
2250 }); 2787 });
2251} 2788}
2252 2789
2790sub reconfigure {
2791 my ($self) = @_;
2792
2793 $self->SUPER::reconfigure;
2794
2795 $_->{w} = 1e10 for @{ $self->{par} };
2796 $self->reflow;
2797}
2798
2253sub _draw { 2799sub _draw {
2254 my ($self) = @_; 2800 my ($self) = @_;
2255 2801
2256 glEnable GL_TEXTURE_2D; 2802 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 2804 glColor 0, 0, 0, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2805 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2260 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2261 2807
2262 $self->{children}[1]->draw; 2808 $self->{children}[1]->draw;
2263
2264} 2809}
2265 2810
2266############################################################################# 2811#############################################################################
2267 2812
2268package CFClient::UI::Animator; 2813package CFClient::UI::Animator;
… …
2313 2858
2314sub new { 2859sub new {
2315 my $class = shift; 2860 my $class = shift;
2316 2861
2317 my $self = $class->SUPER::new ( 2862 my $self = $class->SUPER::new (
2318 state => 0, 2863 state => 0,
2319 connect_activate => \&toggle_flopper, 2864 on_activate => \&toggle_flopper,
2320 @_ 2865 @_
2321 ); 2866 );
2322 2867
2323 if ($self->{state}) {
2324 $self->{state} = 0;
2325 $self->toggle_flopper;
2326 }
2327
2328 $self 2868 $self
2329} 2869}
2330 2870
2331sub toggle_flopper { 2871sub toggle_flopper {
2332 my ($self) = @_; 2872 my ($self) = @_;
2333 2873
2334 # TODO: use animation 2874 $self->{other}->toggle_visibility;
2335 if ($self->{state} = !$self->{state}) {
2336 $CFClient::UI::ROOT->add ($self->{other});
2337 $self->{other}->move ($self->coord2global (0, $self->{h}));
2338 $self->emit ("open");
2339 } else {
2340 $CFClient::UI::ROOT->remove ($self->{other});
2341 $self->emit ("close");
2342 }
2343
2344 $self->emit (changed => $self->{state});
2345} 2875}
2346 2876
2347############################################################################# 2877#############################################################################
2348 2878
2349package CFClient::UI::Tooltip; 2879package CFClient::UI::Tooltip;
… …
2362} 2892}
2363 2893
2364sub set_tooltip_from { 2894sub set_tooltip_from {
2365 my ($self, $widget) = @_; 2895 my ($self, $widget) = @_;
2366 2896
2897 my $tooltip = $widget->{tooltip};
2898
2899 if ($ENV{CFPLUS_DEBUG} & 2) {
2900 $tooltip .= "\n\n" . (ref $widget) . "\n"
2901 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2902 . "req $widget->{req_w} $widget->{req_h}\n"
2903 . "visible $widget->{visible}";
2904 }
2905
2906 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//;
2908
2367 $self->add (new CFClient::UI::Label 2909 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip}, 2910 markup => $tooltip,
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 2912 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 2913 fg => [0, 0, 0, 1],
2914 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 2915 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 2916 );
2374} 2917}
2375 2918
2376sub size_request { 2919sub size_request {
2377 my ($self) = @_; 2920 my ($self) = @_;
… …
2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2380 2923
2381 ($w + 4, $h + 4) 2924 ($w + 4, $h + 4)
2382} 2925}
2383 2926
2384sub size_allocate { 2927sub invoke_size_allocate {
2385 my ($self, $w, $h) = @_; 2928 my ($self, $w, $h) = @_;
2386 2929
2387 $self->SUPER::size_allocate ($w - 4, $h - 4); 2930 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2931}
2932
2933sub invoke_visibility_change {
2934 my ($self, $visible) = @_;
2935
2936 return unless $visible;
2937
2938 $self->{root}->on_post_alloc ("move_$self" => sub {
2939 my $widget = $self->{owner}
2940 or return;
2941
2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943
2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945 if $x + $self->{w} > $self->{root}{w};
2946
2947 $self->move_abs ($x, $y);
2948 });
2388} 2949}
2389 2950
2390sub _draw { 2951sub _draw {
2391 my ($self) = @_; 2952 my ($self) = @_;
2392 2953
… …
2409 glVertex $w, $h; 2970 glVertex $w, $h;
2410 glVertex $w, 0; 2971 glVertex $w, 0;
2411 glEnd; 2972 glEnd;
2412 2973
2413 glTranslate 2 - 0.375, 2 - 0.375; 2974 glTranslate 2 - 0.375, 2 - 0.375;
2975
2414 $self->SUPER::_draw; 2976 $self->SUPER::_draw;
2415} 2977}
2416 2978
2417############################################################################# 2979#############################################################################
2418 2980
… …
2423use CFClient::OpenGL; 2985use CFClient::OpenGL;
2424 2986
2425sub new { 2987sub new {
2426 my $class = shift; 2988 my $class = shift;
2427 2989
2428 $class->SUPER::new ( 2990 my $self = $class->SUPER::new (
2429 aspect => 1, 2991 aspect => 1,
2992 can_events => 0,
2430 @_, 2993 @_,
2431 ) 2994 );
2995
2996 if ($self->{anim} && $self->{animspeed}) {
2997 Scalar::Util::weaken (my $widget = $self);
2998
2999 $self->{timer} = Event->timer (
3000 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3001 hard => 1,
3002 interval => $self->{animspeed},
3003 cb => sub {
3004 ++$widget->{frame};
3005 $widget->update;
3006 },
3007 );
3008 }
3009
3010 $self
2432} 3011}
2433 3012
2434sub size_request { 3013sub size_request {
2435 (32, 8) 3014 (32, 8)
2436} 3015}
2437 3016
3017sub update {
3018 my ($self) = @_;
3019
3020 return unless $self->{visible};
3021
3022 $self->SUPER::update;
3023}
3024
2438sub _draw { 3025sub _draw {
2439 my ($self) = @_; 3026 my ($self) = @_;
2440 3027
2441 return unless $::CONN;#d# manage and cache textures differently 3028 return unless $::CONN;
3029
3030 my $face;
3031
3032 if ($self->{frame}) {
3033 my $anim = $::CONN->{anim}[$self->{anim}];
3034
3035 $face = $anim->[ $self->{frame} % @$anim ]
3036 if $anim && @$anim;
3037 }
3038
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3039 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443 3040
2444 # TODO animation
2445 if ($tex) { 3041 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 3042 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 3044 glColor 0, 0, 0, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3045 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 3046 glDisable GL_TEXTURE_2D;
2451 } 3047 }
2452} 3048}
2453 3049
3050sub destroy {
3051 my ($self) = @_;
3052
3053 $self->{timer}->cancel
3054 if $self->{timer};
3055
3056 $self->SUPER::destroy;
3057}
3058
2454############################################################################# 3059#############################################################################
2455 3060
2456package CFClient::UI::InventoryItem; 3061package CFClient::UI::Buttonbar;
2457 3062
2458our @ISA = CFClient::UI::HBox::; 3063our @ISA = CFClient::UI::HBox::;
2459 3064
2460sub new { 3065# TODO: should actualyl wrap buttons and other goodies.
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_;
2539
2540 $self->{scrolled}->clear;
2541 return unless $items;
2542
2543 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2544
2545 $self->{real_items} = \@items;
2546
2547 for my $item (@items) {
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2553 }
2554
2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556}
2557
2558sub size_request {
2559 my ($self) = @_;
2560 ($self->{req_w}, $self->{req_h});
2561}
2562 3066
2563############################################################################# 3067#############################################################################
2564 3068
2565package CFClient::UI::Menu; 3069package CFClient::UI::Menu;
2566 3070
… …
2578 ); 3082 );
2579 3083
2580 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3084 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2581 3085
2582 for my $item (@{ $self->{items} }) { 3086 for my $item (@{ $self->{items} }) {
2583 my ($widget, $cb) = @$item; 3087 my ($widget, $cb, $tooltip) = @$item;
2584 3088
2585 # handle various types of items, only text for now 3089 # handle various types of items, only text for now
2586 if (!ref $widget) { 3090 if (!ref $widget) {
2587 $widget = new CFClient::UI::Label 3091 $widget = new CFClient::UI::Label
2588 can_hover => 1, 3092 can_hover => 1,
2589 can_events => 1, 3093 can_events => 1,
2590 text => $widget; 3094 markup => $widget,
3095 tooltip => $tooltip
2591 } 3096 }
2592 3097
2593 $self->{item}{$widget} = $item; 3098 $self->{item}{$widget} = $item;
2594 3099
2595 $self->{vbox}->add ($widget); 3100 $self->{vbox}->add ($widget);
… …
2607 # maybe save $GRAB? must be careful about events... 3112 # maybe save $GRAB? must be careful about events...
2608 $GRAB = $self; 3113 $GRAB = $self;
2609 $self->{button} = $ev->{button}; 3114 $self->{button} = $ev->{button};
2610 3115
2611 $self->show; 3116 $self->show;
2612 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3117 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2613} 3118}
2614 3119
2615sub mouse_motion { 3120sub invoke_mouse_motion {
2616 my ($self, $ev, $x, $y) = @_; 3121 my ($self, $ev, $x, $y) = @_;
2617 3122
2618 # TODO: should use vbox->find_widget or so 3123 # TODO: should use vbox->find_widget or so
2619 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3124 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2620 $self->{hover} = $self->{item}{$HOVER}; 3125 $self->{hover} = $self->{item}{$HOVER};
2621}
2622 3126
3127 0
3128}
3129
2623sub button_up { 3130sub invoke_button_up {
2624 my ($self, $ev, $x, $y) = @_; 3131 my ($self, $ev, $x, $y) = @_;
2625 3132
2626 if ($ev->{button} == $self->{button}) { 3133 if ($ev->{button} == $self->{button}) {
2627 undef $GRAB; 3134 undef $GRAB;
2628 $self->hide; 3135 $self->hide;
2629 3136
2630 $self->emit ("popdown"); 3137 $self->emit ("popdown");
2631 $self->{hover}[1]->() if $self->{hover}; 3138 $self->{hover}[1]->() if $self->{hover};
3139 } else {
3140 return 0
3141 }
3142
2632 } 3143 1
2633} 3144}
2634 3145
2635############################################################################# 3146#############################################################################
2636 3147
3148package CFClient::UI::Multiplexer;
3149
3150our @ISA = CFClient::UI::Container::;
3151
3152sub new {
3153 my $class = shift;
3154
3155 my $self = $class->SUPER::new (
3156 @_,
3157 );
3158
3159 $self->{current} = $self->{children}[0]
3160 if @{ $self->{children} };
3161
3162 $self
3163}
3164
3165sub add {
3166 my ($self, @widgets) = @_;
3167
3168 $self->SUPER::add (@widgets);
3169
3170 $self->{current} = $self->{children}[0]
3171 if @{ $self->{children} };
3172}
3173
3174sub get_current_page {
3175 my ($self) = @_;
3176
3177 $self->{current}
3178}
3179
3180sub set_current_page {
3181 my ($self, $page_or_widget) = @_;
3182
3183 my $widget = ref $page_or_widget
3184 ? $page_or_widget
3185 : $self->{children}[$page_or_widget];
3186
3187 $self->{current} = $widget;
3188 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3189
3190 $self->emit (page_changed => $self->{current});
3191
3192 $self->realloc;
3193}
3194
3195sub visible_children {
3196 $_[0]{current}
3197}
3198
3199sub size_request {
3200 my ($self) = @_;
3201
3202 $self->{current}->size_request
3203}
3204
3205sub invoke_size_allocate {
3206 my ($self, $w, $h) = @_;
3207
3208 $self->{current}->configure (0, 0, $w, $h);
3209
3210 1
3211}
3212
3213sub _draw {
3214 my ($self) = @_;
3215
3216 $self->{current}->draw;
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::Notebook;
3222
3223our @ISA = CFClient::UI::VBox::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (
3229 buttonbar => (new CFClient::UI::Buttonbar),
3230 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3231 # filter => # will be put between multiplexer and $self
3232 @_,
3233 );
3234
3235 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3236 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3237
3238 $self
3239}
3240
3241sub add {
3242 my ($self, $title, $widget, $tooltip) = @_;
3243
3244 Scalar::Util::weaken $self;
3245
3246 $self->{buttonbar}->add (new CFClient::UI::Button
3247 markup => $title,
3248 tooltip => $tooltip,
3249 on_activate => sub { $self->set_current_page ($widget) },
3250 );
3251
3252 $self->{multiplexer}->add ($widget);
3253}
3254
3255sub get_current_page {
3256 my ($self) = @_;
3257
3258 $self->{multiplexer}->get_current_page
3259}
3260
3261sub set_current_page {
3262 my ($self, $page) = @_;
3263
3264 $self->{multiplexer}->set_current_page ($page);
3265 $self->emit (page_changed => $self->{multiplexer}{current});
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::Combobox;
3271
3272use utf8;
3273
3274our @ISA = CFClient::UI::Button::;
3275
3276sub new {
3277 my $class = shift;
3278
3279 my $self = $class->SUPER::new (
3280 options => [], # [value, title, longdesc], ...
3281 value => undef,
3282 @_,
3283 );
3284
3285 $self->_set_value ($self->{value});
3286
3287 $self
3288}
3289
3290sub invoke_button_down {
3291 my ($self, $ev) = @_;
3292
3293 my @menu_items;
3294
3295 for (@{ $self->{options} }) {
3296 my ($value, $title, $tooltip) = @$_;
3297
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 }
3300
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302}
3303
3304sub _set_value {
3305 my ($self, $value) = @_;
3306
3307 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3308 or return;
3309
3310 $self->{value} = $item->[0];
3311 $self->set_markup ("$item->[1] ⇓");
3312 $self->set_tooltip ($item->[2]);
3313}
3314
3315sub set_value {
3316 my ($self, $value) = @_;
3317
3318 return unless $self->{value} ne $value;
3319
3320 $self->_set_value ($value);
3321 $self->emit (changed => $value);
3322}
3323
3324#############################################################################
3325
2637package CFClient::UI::Statusbox; 3326package CFClient::UI::Statusbox;
2638 3327
2639our @ISA = CFClient::UI::VBox::; 3328our @ISA = CFClient::UI::VBox::;
2640 3329
3330sub new {
3331 my $class = shift;
3332
3333 my $self = $class->SUPER::new (
3334 fontsize => 0.8,
3335 @_,
3336 );
3337
3338 Scalar::Util::weaken (my $this = $self);
3339
3340 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341
3342 $self
3343}
3344
2641sub reorder { 3345sub reorder {
2642 my ($self) = @_; 3346 my ($self) = @_;
2643 my $NOW = time; 3347 my $NOW = Time::HiRes::time;
3348
3349 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} };
2644 3353
2645 while (my ($k, $v) = each %{ $self->{item} }) { 3354 while (my ($k, $v) = each %{ $self->{item} }) {
2646 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3355 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2647 } 3356 }
2648 3357
… …
2651 my @items = sort { 3360 my @items = sort {
2652 $a->{pri} <=> $b->{pri} 3361 $a->{pri} <=> $b->{pri}
2653 or $b->{id} <=> $a->{id} 3362 or $b->{id} <=> $a->{id}
2654 } values %{ $self->{item} }; 3363 } values %{ $self->{item} };
2655 3364
3365 $self->{timer}->interval (1);
3366
2656 my $count = 10 + 1; 3367 my $count = 10 + 1;
2657 for my $item (@items) { 3368 for my $item (@items) {
2658 last unless --$count; 3369 last unless --$count;
2659 3370
2660 push @widgets, $item->{label} ||= do { 3371 my $label = $item->{label} ||= do {
2661 # TODO: doesn't handle markup well (read as: at all) 3372 # TODO: doesn't handle markup well (read as: at all)
2662 my $short = $item->{count} > 1 3373 my $short = $item->{count} > 1
2663 ? "<b>$item->{count} ×</b> $item->{text}" 3374 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text}; 3375 : $item->{text};
2665 3376
2666 for ($short) { 3377 for ($short) {
2667 s/^\s+//; 3378 s/^\s+//;
2668 s/\012.*/…/s; 3379 s/\s+/ /g;
2669 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length;
2671 } 3380 }
2672 3381
2673 new CFClient::UI::Label 3382 new CFClient::UI::Label
2674 markup => $short, 3383 markup => $short,
2675 tooltip => $item->{tooltip}, 3384 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP, 3385 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67, 3386 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize}, 3387 fontsize => $item->{fontsize} || $self->{fontsize},
2679 color => $item->{color}, 3388 max_w => $::WIDTH * 0.44,
3389 fg => [@{ $item->{fg} }],
2680 can_events => 1, 3390 can_events => 1,
2681 can_hover => 1 3391 can_hover => 1
2682 }; 3392 };
3393
3394 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3395 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3396 $label->update;
3397 $label->set_max_size (undef, $label->{req_h} * $diff)
3398 if $diff < 1;
3399 $self->{timer}->interval (1/30);
3400 } else {
3401 $label->{fg}[3] = $item->{fg}[3] || 1;
3402 }
3403
3404 push @widgets, $label;
2683 } 3405 }
2684 3406
2685 $self->clear; 3407 $self->clear;
2686 $self->SUPER::add (reverse @widgets); 3408 $self->SUPER::add (reverse @widgets);
2687} 3409}
… …
2690 my ($self, $text, %arg) = @_; 3412 my ($self, $text, %arg) = @_;
2691 3413
2692 $text =~ s/^\s+//; 3414 $text =~ s/^\s+//;
2693 $text =~ s/\s+$//; 3415 $text =~ s/\s+$//;
2694 3416
3417 return unless $text;
3418
2695 my $timeout = time + ((delete $arg{timeout}) || 60); 3419 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2696 3420
2697 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3421 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2698 3422
2699 if (my $item = $self->{item}{$group}) { 3423 if (my $item = $self->{item}{$group}) {
2700 if ($item->{text} eq $text) { 3424 if ($item->{text} eq $text) {
2701 $item->{count}++; 3425 $item->{count}++;
2702 } else { 3426 } else {
2703 $item->{count} = 1; 3427 $item->{count} = 1;
2704 $item->{text} = $item->{tooltip} = $text; 3428 $item->{text} = $item->{tooltip} = $text;
2705 } 3429 }
2706 $item->{id} = ++$self->{id}; 3430 $item->{id} += 0.2;#d#
2707 $item->{timeout} = $timeout; 3431 $item->{timeout} = $timeout;
2708 delete $item->{label}; 3432 delete $item->{label};
2709 } else { 3433 } else {
2710 $self->{item}{$group} = { 3434 $self->{item}{$group} = {
2711 id => ++$self->{id}, 3435 id => ++$self->{id},
2712 text => $text, 3436 text => $text,
2713 timeout => $timeout, 3437 timeout => $timeout,
2714 tooltip => $text, 3438 tooltip => $text,
2715 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8], 3439 fg => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0, 3440 pri => 0,
2718 count => 1, 3441 count => 1,
2719 %arg, 3442 %arg,
2720 }; 3443 };
2721 } 3444 }
2722 3445
3446 $ROOT->on_refresh (reorder => sub {
3447 $self->reorder;
3448 });
3449}
3450
3451sub reconfigure {
3452 my ($self) = @_;
3453
3454 delete $_->{label}
3455 for values %{ $self->{item} || {} };
3456
2723 $self->reorder; 3457 $self->reorder;
3458 $self->SUPER::reconfigure;
3459}
3460
3461sub destroy {
3462 my ($self) = @_;
3463
3464 $self->{timer}->cancel;
3465
3466 $self->SUPER::destroy;
2724} 3467}
2725 3468
2726############################################################################# 3469#############################################################################
2727 3470
2728package CFClient::UI::Root; 3471package CFClient::UI::Inventory;
2729 3472
2730our @ISA = CFClient::UI::Container::; 3473our @ISA = CFClient::UI::Table::;
2731
2732use CFClient::OpenGL;
2733 3474
2734sub new { 3475sub new {
2735 my $class = shift; 3476 my $class = shift;
2736 3477
2737 $class->SUPER::new ( 3478 my $self = $class->SUPER::new (
3479 col_expand => [0, 1, 0],
3480 @_,
3481 );
3482
3483 $self
3484}
3485
3486sub set_items {
3487 my ($self, $items) = @_;
3488
3489 $self->clear;
3490 return unless $items;
3491
3492 my @items = sort {
3493 ($a->{type} <=> $b->{type})
3494 or ($a->{name} cmp $b->{name})
3495 } values %$items;
3496
3497 $self->{real_items} = \@items;
3498
3499 my $row = 0;
3500 for my $item (@items) {
3501 CFClient::Item::update_widgets $item;
3502
3503 $self->add (0, $row, $item->{face_widget});
3504 $self->add (1, $row, $item->{desc_widget});
3505 $self->add (2, $row, $item->{weight_widget});
3506
3507 $row++;
3508 }
3509}
3510
3511#############################################################################
3512
3513package CFClient::UI::SpellList;
3514
3515our @ISA = CFClient::UI::Table::;
3516
3517sub new {
3518 my $class = shift;
3519
3520 my $self = $class->SUPER::new (
3521 binding => [],
3522 commands => [],
2738 @_, 3523 @_,
2739 ) 3524 )
2740} 3525}
2741 3526
2742sub configure { 3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2743 my ($self, $x, $y, $w, $h) = @_;
2744 3528
2745 $self->{w} = $w; 3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2746 $self->{h} = $h; 3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2747} 3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2748 3539
2749sub check_size { 3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3612sub add_spell {
2750 my ($self) = @_; 3613 my ($self, $spell) = @_;
2751 3614
2752 $self->size_allocate ($self->{w}, $self->{h}) 3615 $self->{spell}->{$spell->{name}} = $spell;
2753 if $self->{w}; 3616 $self->rebuild_spell_list;
3617}
3618
3619sub remove_spell {
3620 my ($self, $spell) = @_;
3621
3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3633#############################################################################
3634
3635package CFClient::UI::Root;
3636
3637our @ISA = CFClient::UI::Container::;
3638
3639use List::Util qw(min max);
3640
3641use CFClient::OpenGL;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 visible => 1,
3648 @_,
3649 );
3650
3651 Scalar::Util::weaken ($self->{root} = $self);
3652
3653 $self
2754} 3654}
2755 3655
2756sub size_request { 3656sub size_request {
2757 my ($self) = @_; 3657 my ($self) = @_;
2758 3658
2759 ($self->{w}, $self->{h}) 3659 ($self->{w}, $self->{h})
2760} 3660}
2761 3661
3662sub _to_pixel {
3663 my ($coord, $size, $max) = @_;
3664
3665 $coord =
3666 $coord eq "center" ? ($max - $size) * 0.5
3667 : $coord eq "max" ? $max
3668 : $coord;
3669
3670 $coord = 0 if $coord < 0;
3671 $coord = $max - $size if $coord > $max - $size;
3672
3673 int $coord + 0.5
3674}
3675
2762sub size_allocate { 3676sub invoke_size_allocate {
2763 my ($self, $w, $h) = @_; 3677 my ($self, $w, $h) = @_;
2764
2765 my $old_w = $self->{old_w};
2766 my $old_h = $self->{old_h};
2767
2768 if ($old_w && $old_h) {
2769 for my $child ($self->children) {
2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2780 3678
2781 for my $child ($self->children) { 3679 for my $child ($self->children) {
2782 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3680 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2783 3681
2784 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3682 $X = $child->{force_x} if exists $child->{force_x};
2785 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3683 $Y = $child->{force_y} if exists $child->{force_y};
3684
3685 $X = _to_pixel $X, $W, $self->{w};
3686 $Y = _to_pixel $Y, $H, $self->{h};
3687
2786 $child->configure ($X, $Y, $W, $H); 3688 $child->configure ($X, $Y, $W, $H);
2787 } 3689 }
2788 3690
2789 $self->{old_w} = $w; 3691 1
2790 $self->{old_h} = $h;
2791} 3692}
2792 3693
2793sub coord2local { 3694sub coord2local {
2794 my ($self, $x, $y) = @_; 3695 my ($self, $x, $y) = @_;
2795 3696
… …
2803} 3704}
2804 3705
2805sub update { 3706sub update {
2806 my ($self) = @_; 3707 my ($self) = @_;
2807 3708
2808 $self->check_size;
2809 $::WANT_REFRESH++; 3709 $::WANT_REFRESH++;
2810} 3710}
2811 3711
2812sub add { 3712sub add {
2813 my ($self, $child) = @_; 3713 my ($self, @children) = @_;
2814 3714
2815 # integerise window positions 3715 $_->{is_toplevel} = 1
2816 $child->{x} = int $child->{x}; 3716 for @children;
2817 $child->{y} = int $child->{y};
2818 3717
2819 $self->SUPER::add ($child); 3718 $self->SUPER::add (@children);
3719}
3720
3721sub remove {
3722 my ($self, @children) = @_;
3723
3724 $self->SUPER::remove (@children);
3725
3726 delete $self->{is_toplevel}
3727 for @children;
3728
3729 while (@children) {
3730 my $w = pop @children;
3731 push @children, $w->children;
3732 $w->set_invisible;
3733 }
2820} 3734}
2821 3735
2822sub on_refresh { 3736sub on_refresh {
2823 my ($self, $id, $cb) = @_; 3737 my ($self, $id, $cb) = @_;
2824 3738
… …
2837 while ($self->{refresh_hook}) { 3751 while ($self->{refresh_hook}) {
2838 $_->() 3752 $_->()
2839 for values %{delete $self->{refresh_hook}}; 3753 for values %{delete $self->{refresh_hook}};
2840 } 3754 }
2841 3755
2842 if ($self->{check_size}) { 3756 if ($self->{realloc}) {
2843 my @queue = ([], []); 3757 my %queue;
3758 my @queue;
3759 my $widget;
2844 3760
2845 for (;;) { 3761 outer:
2846 if ($self->{check_size}) { 3762 while () {
2847 # heuristic: check containers last 3763 if (my $realloc = delete $self->{realloc}) {
2848 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3764 for $widget (values %$realloc) {
2849 for values %{delete $self->{check_size}} 3765 $widget->{visible} or next; # do not resize invisible widgets
3766
3767 $queue{$widget+0}++ and next; # duplicates are common
3768
3769 push @{ $queue[$widget->{visible}] }, $widget;
3770 }
2850 } 3771 }
2851 3772
2852 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3773 while () {
3774 @queue or last outer;
2853 3775
2854 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3776 $widget = pop @{ $queue[-1] || [] }
2855 ? @$widget{qw(user_w user_h)} 3777 and last;
2856 : $widget->size_request;
2857
2858 if (delete $widget->{force_alloc}
2859 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2860 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2861 3778
3779 pop @queue;
3780 }
3781
3782 delete $queue{$widget+0};
3783
3784 my ($w, $h) = $widget->size_request;
3785
3786 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3787 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3788
3789 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3790 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3791
3792 $w = $widget->{force_w} if exists $widget->{force_w};
3793 $h = $widget->{force_h} if exists $widget->{force_h};
3794
3795 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3796 || delete $widget->{force_realloc}) {
2862 $widget->{req_w} = $w; 3797 $widget->{req_w} = $w;
2863 $widget->{req_h} = $h; 3798 $widget->{req_h} = $h;
2864 3799
2865 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3800 $self->{size_alloc}{$widget+0} = $widget;
2866 3801
2867 $widget->{parent}->check_size
2868 if $widget->{parent}; 3802 if (my $parent = $widget->{parent}) {
3803 $self->{realloc}{$parent+0} = $parent
3804 unless $queue{$parent+0};
3805
3806 $parent->{force_size_alloc} = 1;
3807 $self->{size_alloc}{$parent+0} = $parent;
3808 }
2869 } 3809 }
3810
3811 delete $self->{realloc}{$widget+0};
2870 } 3812 }
2871 } 3813 }
2872 3814
2873 while ($self->{size_alloc}) { 3815 while (my $size_alloc = delete $self->{size_alloc}) {
2874 for (values %{delete $self->{size_alloc}}) { 3816 my @queue = sort { $b->{visible} <=> $a->{visible} }
2875 my ($widget, $w, $h) = @$_; 3817 values %$size_alloc;
3818
3819 while () {
3820 my $widget = pop @queue || last;
3821
3822 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2876 3823
2877 $w = 0 if $w < 0; 3824 $w = 0 if $w < 0;
2878 $h = 0 if $h < 0; 3825 $h = 0 if $h < 0;
2879 3826
3827 $w = int $w + 0.5;
3828 $h = int $h + 0.5;
3829
3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w};
3832 $widget->{old_h} = $widget->{h};
3833
2880 $widget->{w} = $w; 3834 $widget->{w} = $w;
2881 $widget->{h} = $h; 3835 $widget->{h} = $h;
2882 $widget->size_allocate ($w, $h); 3836
2883 $widget->emit (size_allocate => $w, $h); 3837 $widget->emit (size_allocate => $w, $h);
3838 }
2884 } 3839 }
2885 } 3840 }
2886 3841
2887 while ($self->{post_alloc_hook}) { 3842 while ($self->{post_alloc_hook}) {
2888 $_->() 3843 $_->()
2889 for values %{delete $self->{post_alloc_hook}}; 3844 for values %{delete $self->{post_alloc_hook}};
2890 } 3845 }
2891 3846
3847
2892 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3848 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2893 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3849 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2894 glClear GL_COLOR_BUFFER_BIT; 3850 glClear GL_COLOR_BUFFER_BIT;
2895 3851
2896 glMatrixMode GL_PROJECTION; 3852 glMatrixMode GL_PROJECTION;
2897 glLoadIdentity; 3853 glLoadIdentity;
2898 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2899 glMatrixMode GL_MODELVIEW; 3855 glMatrixMode GL_MODELVIEW;
2900 glLoadIdentity; 3856 glLoadIdentity;
2901 3857
3858 {
3859 package CFClient::UI::Base;
3860
3861 ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h});
3863 }
3864
2902 $self->_draw; 3865 $self->_draw;
2903} 3866}
2904 3867
2905############################################################################# 3868#############################################################################
2906 3869
2907package CFClient::UI; 3870package CFClient::UI;
2908 3871
2909$ROOT = new CFClient::UI::Root; 3872$ROOT = new CFClient::UI::Root;
2910$TOOLTIP = new CFClient::UI::Tooltip; 3873$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2911 3874
29121 38751
2913 3876

Diff Legend

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