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

Diff Legend

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