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.200 by root, Sat May 13 00:27:09 2006 UTC vs.
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC

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

Diff Legend

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