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.220 by root, Mon May 22 03:28:55 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
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 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;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 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
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
166 } 190 }
167
168 $widget->reconfigure;
169 } 191 }
192
193 reconfigure_widgets;
170} 194}
171 195
172############################################################################# 196#############################################################################
173 197
174package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
212 return if $self->{parent}; 250 return if $self->{parent};
213 251
214 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
215} 253}
216 254
217sub hide { 255sub set_visible {
218 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};
219 279
220 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
221 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
222 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
223 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
224 if $self->{parent}; 313 if $self->{parent};
225} 314}
226 315
227sub move { 316sub move_abs {
228 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
229 318
230 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
231 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
232 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
233 322
234 $self->update; 323 $self->update;
235} 324}
236 325
237sub set_size { 326sub set_size {
238 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
239 328
240 $self->{user_w} = $w; 329 $self->{force_w} = $w;
241 $self->{user_h} = $h; 330 $self->{force_h} = $h;
242 331
243 $self->check_size; 332 $self->realloc;
244} 333}
245 334
246sub size_request { 335sub size_request {
247 require Carp; 336 require Carp;
248 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
250 339
251sub configure { 340sub configure {
252 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
253 342
254 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
255 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
256 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
257 348
258 # use alignment to adjust x, y 349 # use alignment to adjust x, y
259 350
260 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
261 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
262
263 ($w, $h) = ($w2, $h2);
264 } 353 }
265 354
266 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
267 $self->{x} = $x; 356 $self->{x} = $x;
268 $self->{y} = $y; 357 $self->{y} = $y;
269 $self->update; 358 $self->update;
270 } 359 }
271 360
272 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
273 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
274 }
275}
276 363
277sub size_allocate { 364 $self->{alloc_w} = $w;
278 # nothing to be done 365 $self->{alloc_h} = $h;
279}
280 366
281sub reconfigure { 367 $self->{root}{size_alloc}{$self+0} = $self;
282 my ($self) = @_; 368 }
283
284 $self->check_size (1);
285 $self->update;
286} 369}
287 370
288sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
289} 377}
290 378
291sub set_max_size { 379sub set_max_size {
292 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
293 381
294 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
295 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
296} 386}
297 387
298sub set_tooltip { 388sub set_tooltip {
299 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
300 390
391 $tooltip =~ s/^\s+//;
392 $tooltip =~ s/\s+$//;
393
394 return if $self->{tooltip} eq $tooltip;
395
301 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
302 397
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
305 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
306 } 401 }
307} 402}
308 403
309# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
310sub coord2local { 405sub coord2local {
… …
318 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
319 414
320 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
321} 416}
322 417
323sub focus_in { 418sub invoke_focus_in {
324 my ($self) = @_; 419 my ($self) = @_;
325 420
326 return if $FOCUS == $self; 421 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
328 423
329 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
330 425
331 $self->emit (focus_in => $focus);
332
333 $focus->update if $focus; 426 $focus->update if $focus;
334 $FOCUS->update; 427 $FOCUS->update;
335}
336 428
429 0
430}
431
337sub focus_out { 432sub invoke_focus_out {
338 my ($self) = @_; 433 my ($self) = @_;
339 434
340 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
341 436
342 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
343 438
344 $self->emit (focus_out => $focus);
345
346 $focus->update if $focus; #? 439 $focus->update if $focus; #?
347}
348 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
349sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
350sub button_up { } 454sub invoke_button_up { 1 }
351sub key_down { } 455sub invoke_key_down { 1 }
352sub key_up { } 456sub invoke_key_up { 1 }
353 457
354sub button_down { 458sub invoke_button_down {
355 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
356 460
357 $self->focus_in; 461 $self->grab_focus;
358}
359 462
360sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
361sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
362sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
363sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
364sub 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
365 531
366sub draw { 532sub draw {
367 my ($self) = @_; 533 my ($self) = @_;
368 534
369 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);
370 546
371 glPushMatrix; 547 glPushMatrix;
372 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
373 $self->_draw;
374 glPopMatrix;
375 549
376 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
377 my ($x, $y) = @$self{qw(x y)};
378
379 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
380 glEnable GL_BLEND; 552 glEnable GL_BLEND;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
382 glBegin GL_QUADS; 554 glBegin GL_QUADS;
383 glVertex $x , $y;
384 glVertex $x + $self->{w}, $y;
385 glVertex $x + $self->{w}, $y + $self->{h};
386 glVertex $x , $y + $self->{h};
387 glEnd;
388 glDisable GL_BLEND;
389 }
390
391 if ($ENV{PCLIENT_DEBUG}) {
392 glPushMatrix;
393 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0; 555 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 556 glVertex $self->{w}, 0;
398 glVertex $self->{w}, $self->{h}; 557 glVertex $self->{w}, $self->{h};
399 glVertex 0 , $self->{h}; 558 glVertex 0 , $self->{h};
400 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;
401 glPopMatrix; 573 glPopMatrix;
402 #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;
403 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
404} 579}
405 580
406sub _draw { 581sub _draw {
407 my ($self) = @_; 582 my ($self) = @_;
408 583
409 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
410} 585}
411 586
412sub find_widget {
413 my ($self, $x, $y) = @_;
414
415 return () unless $self->{can_events};
416
417 return $self
418 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
419 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
420
421 ()
422}
423
424sub set_parent {
425 my ($self, $parent) = @_;
426
427 Scalar::Util::weaken ($self->{parent} = $parent);
428
429 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size
431 unless exists $self->{req_w};
432}
433
434sub check_size {
435 my ($self, $forced) = @_;
436
437 $self->{force_alloc} = 1 if $forced;
438 $CFClient::UI::ROOT->{check_size}{$self} = $self;
439}
440
441sub update {
442 my ($self) = @_;
443
444 $self->{parent}->update
445 if $self->{parent};
446}
447
448sub connect {
449 my ($self, $signal, $cb) = @_;
450
451 push @{ $self->{signal_cb}{$signal} }, $cb;
452}
453
454sub emit {
455 my ($self, $signal, @args) = @_;
456
457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
458}
459
460sub DESTROY { 587sub DESTROY {
461 my ($self) = @_; 588 my ($self) = @_;
462 589
463 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
464 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
465} 594}
466 595
467############################################################################# 596#############################################################################
468 597
469package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
494 623
495 if ($color && (@$color < 4 || $color->[3])) { 624 if ($color && (@$color < 4 || $color->[3])) {
496 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
497 626
498 glEnable GL_BLEND; 627 glEnable GL_BLEND;
499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
500 glColor @$color; 629 glColor_premultiply @$color;
501 630
502 glBegin GL_QUADS; 631 glBegin GL_QUADS;
503 glVertex 0 , 0; 632 glVertex 0 , 0;
504 glVertex 0 , $h; 633 glVertex 0 , $h;
505 glVertex $w, $h; 634 glVertex $w, $h;
… …
520 my ($class, %arg) = @_; 649 my ($class, %arg) = @_;
521 $class->SUPER::new (can_events => 0, %arg); 650 $class->SUPER::new (can_events => 0, %arg);
522} 651}
523 652
524sub size_request { 653sub size_request {
525 (0, 0) 654 my ($self) = @_;
655
656 ($self->{w} + 0, $self->{h} + 0)
526} 657}
527 658
528sub draw { } 659sub draw { }
529 660
530############################################################################# 661#############################################################################
… …
534our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
535 666
536sub new { 667sub new {
537 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
538 669
539 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
540 671
541 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
542 children => [], 673 children => [],
543 can_events => 0, 674 can_events => 0,
544 %arg, 675 %arg,
545 ); 676 );
677
546 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
547 680
548 $self 681 $self
549} 682}
550 683
551sub add { 684sub add {
… …
559 $self->{children} = [ 692 $self->{children} = [
560 sort { $a->{z} <=> $b->{z} } 693 sort { $a->{z} <=> $b->{z} }
561 @{$self->{children}}, @widgets 694 @{$self->{children}}, @widgets
562 ]; 695 ];
563 696
564 $self->check_size (1); 697 $self->realloc;
565 $self->update;
566} 698}
567 699
568sub children { 700sub children {
569 @{ $_[0]{children} } 701 @{ $_[0]{children} }
570} 702}
… …
575 delete $child->{parent}; 707 delete $child->{parent};
576 $child->hide; 708 $child->hide;
577 709
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 710 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 711
580 $self->check_size; 712 $self->realloc;
581 $self->update;
582} 713}
583 714
584sub clear { 715sub clear {
585 my ($self) = @_; 716 my ($self) = @_;
586 717
… …
590 for (@$children) { 721 for (@$children) {
591 delete $_->{parent}; 722 delete $_->{parent};
592 $_->hide; 723 $_->hide;
593 } 724 }
594 725
595 $self->check_size; 726 $self->realloc;
596 $self->update;
597} 727}
598 728
599sub find_widget { 729sub find_widget {
600 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
601 731
602 $x -= $self->{x}; 732 $x -= $self->{x};
603 $y -= $self->{y}; 733 $y -= $self->{y};
604 734
605 my $res; 735 my $res;
606 736
607 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
608 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
609 and return $res; 739 and return $res;
610 } 740 }
611 741
612 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
633} 763}
634 764
635sub add { 765sub add {
636 my ($self, $child) = @_; 766 my ($self, $child) = @_;
637 767
638 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
639
640 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
641} 770}
642 771
643sub remove { 772sub remove {
644 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
653 782
654sub size_request { 783sub size_request {
655 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
656} 785}
657 786
658sub size_allocate { 787sub invoke_size_allocate {
659 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
660 789
661 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
662} 793}
663 794
664############################################################################# 795#############################################################################
796
797# back-buffered drawing area
665 798
666package CFClient::UI::Window; 799package CFClient::UI::Window;
667 800
668our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
669 802
… …
680 813
681 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
682 $self->SUPER::update; 815 $self->SUPER::update;
683} 816}
684 817
685sub size_allocate { 818sub invoke_size_allocate {
686 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
687 820
688 $self->SUPER::size_allocate ($w, $h);
689 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
690} 824}
691 825
692sub _render { 826sub _render {
827 my ($self) = @_;
828
693 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
694} 830}
695 831
696sub render_child { 832sub render_child {
697 my ($self) = @_; 833 my ($self) = @_;
698 834
699 $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 {
700 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
701 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
702 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
703 $self->_render; 846 $self->_render;
704 }; 847 };
705} 848}
706 849
707sub _draw { 850sub _draw {
708 my ($self) = @_; 851 my ($self) = @_;
709 852
710 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
711 854
712 my $tex = $self->{texture} 855 my $tex = $self->{texture}
713 or return; 856 or return;
714 857
715 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
717 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
718 861
719 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
720 863
721 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
722} 865}
… …
725 868
726package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
727 870
728our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
729 872
873sub new {
874 my $class = shift;
875
876 $class->SUPER::new (
877 scroll_x => 0,
878 scroll_y => 1,
879 @_,
880 )
881}
882
730sub size_request { 883sub size_request {
731 my ($self) = @_; 884 my ($self) = @_;
732 885
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 887
736 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
737} 889 $h = 10 if $self->{scroll_y};
738 890
891 ($w, $h)
892}
893
739sub size_allocate { 894sub invoke_size_allocate {
740 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
741 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);
742 $self->update; 903 $self->update;
904
905 1
743} 906}
744 907
745sub set_offset { 908sub set_offset {
746 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
747 910
… …
780} 943}
781 944
782sub _render { 945sub _render {
783 my ($self) = @_; 946 my ($self) = @_;
784 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
785 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
786 952
787 $self->SUPER::_render; 953 $self->SUPER::_render;
788} 954}
789 955
… …
792package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
793 959
794our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
795 961
796sub new { 962sub new {
797 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
798 966
799 my $self; 967 my $self;
800 968
801 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
802 vertical => 1, 970 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 972 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 973 $self->{vp}->set_offset (0, $_[1]);
806 }, 974 },
807 ; 975 ;
808 976
809 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
811 slider => $slider, 979 slider => $slider,
812 @_, 980 %arg,
813 ); 981 );
814 982
815 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
818 985
819 $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)
820} 1012}
821 1013
822#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 1015# update viewport offset on scroll
824 1016
… …
844 1036
845 if ($self->{bg}) { 1037 if ($self->{bg}) {
846 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
847 1039
848 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
849 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
850 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
851 1043
852 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
853 glVertex 0 , 0; 1045 glVertex 0 , 0;
854 glVertex 0 , $h; 1046 glVertex 0 , $h;
855 glVertex $w, $h; 1047 glVertex $w, $h;
… …
868 1060
869our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
870 1062
871use CFClient::OpenGL; 1063use CFClient::OpenGL;
872 1064
873my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
874 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
875 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);
876 1072
877sub new { 1073sub new {
878 my $class = shift; 1074 my ($class, %arg) = @_;
879
880 # TODO: user_x, user_y, overwrite moveto?
881 1075
882 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1079 border => 0.6,
886 toplevel => 1,
887 can_events => 1, 1080 can_events => 1,
888 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
889 ); 1084 );
890 1085
891 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
892 align => 0, 1087 align => 0,
893 valign => 1, 1088 valign => 1,
894 text => $self->{title}, 1089 text => $self->{title},
895 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 }
896 1101
897 $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};
898} 1111}
899 1112
900sub border { 1113sub border {
901 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
902} 1115}
903 1116
904sub size_request { 1117sub size_request {
905 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};
906 1125
907 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
908 1127
909 ( 1128 (
910 $w + $self->border * 2, 1129 $w + $self->border * 2,
911 $h + $self->border * 2, 1130 $h + $self->border * 2,
912 ) 1131 )
913} 1132}
914 1133
915sub size_allocate { 1134sub invoke_size_allocate {
916 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
917 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
918 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
919 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
920 1147
921 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
922 if $self->{title};
923
924 $self->child->configure ($self->border, $self->border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
925}
926 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
927sub button_down { 1156sub invoke_button_down {
928 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
929 1158
930 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
931 my $border = $self->border; 1160 my $border = $self->border;
932 1161
… …
945 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
946 1175
947 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
949 1178
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953 $self->check_size; 1183 $self->realloc;
954 }; 1184 };
955 1185
956 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
958 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
960 $self->{motion} = sub { 1190 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
962 1192
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
964 1194
965 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
967 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
968 } 1203 1
969} 1204}
970 1205
971sub button_up { 1206sub invoke_button_up {
972 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
973 1208
974 delete $self->{motion}; 1209 ! ! delete $self->{motion}
975} 1210}
976 1211
977sub mouse_motion { 1212sub invoke_mouse_motion {
978 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
979 1214
980 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
981} 1218}
982 1219
983sub _draw { 1220sub _draw {
984 my ($self) = @_; 1221 my ($self) = @_;
985 1222
1223 my $child = $self->{children}[0];
1224
986 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
988 1227
989 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991 1230
992 my $border = $self->border; 1231 my $border = $self->border;
993 1232
994 glColor @{ $self->{border_bg} }; 1233 glColor @{ $self->{border_bg} };
995 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1234 $border[0]->draw_quad_alpha (0, 0, $w, $border);
996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999 1238
1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001 my $bg = $tex[0]; 1240 glColor @{ $self->{bg} };
1002 1241
1003 # TODO: repeat texture not scale 1242 # TODO: repeat texture not scale
1243 # solve this better(?)
1004 my $rep_x = $cw / $bg->{w}; 1244 $bg->{s} = $cw / $bg->{w};
1005 my $rep_y = $ch / $bg->{h}; 1245 $bg->{t} = $ch / $bg->{h};
1006
1007 glColor @{ $self->{bg} };
1008
1009 $bg->{s} = $rep_x;
1010 $bg->{t} = $rep_y;
1011 $bg->{wrap_mode} = 1;
1012 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 } 1247 }
1014 1248
1015 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1016 1250
1017 $self->{title}->draw if $self->{title};
1018
1019 $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};
1020} 1262}
1021 1263
1022############################################################################# 1264#############################################################################
1023 1265
1024package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1032sub new { 1274sub new {
1033 my $class = shift; 1275 my $class = shift;
1034 1276
1035 $class->SUPER::new ( 1277 $class->SUPER::new (
1036 col_expand => [], 1278 col_expand => [],
1037 @_ 1279 @_,
1038 ) 1280 )
1281}
1282
1283sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1285}
1040 1286
1041sub add { 1287sub add {
1042 my ($self, $x, $y, $child) = @_; 1288 my ($self, $x, $y, $child) = @_;
1043 1289
1044 $child->set_parent ($self); 1290 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1046 1292
1047 $child->check_size; 1293 $self->realloc;
1048} 1294}
1049 1295
1050sub children { 1296sub remove {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1297 my ($self, $child) = @_;
1052}
1053 1298
1299 # TODO: not yet implemented
1300}
1301
1054# 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?
1055sub clear { 1303sub clear {
1056 my ($self) = @_; 1304 my ($self) = @_;
1057 1305
1058 my @children = $self->children; 1306 my @children = $self->children;
1059 delete $self->{children}; 1307 delete $self->{children};
… …
1061 for (@children) { 1309 for (@children) {
1062 delete $_->{parent}; 1310 delete $_->{parent};
1063 $_->hide; 1311 $_->hide;
1064 } 1312 }
1065 1313
1066 $self->update; 1314 $self->realloc;
1067} 1315}
1068 1316
1069sub get_wh { 1317sub get_wh {
1070 my ($self) = @_; 1318 my ($self) = @_;
1071 1319
… …
1097 (sum @$ws), 1345 (sum @$ws),
1098 (sum @$hs), 1346 (sum @$hs),
1099 ) 1347 )
1100} 1348}
1101 1349
1102sub size_allocate { 1350sub invoke_size_allocate {
1103 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1104 1352
1105 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1106 1354
1107 my $req_w = sum @$ws; 1355 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1356 my $req_h = (sum @$hs) || 1;
1109 1357
1110 # TODO: nicer code && do row_expand 1358 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1359 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1360 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1361 my $col_expand = (sum @col_expand) || 1;
… …
1139 } 1387 }
1140 1388
1141 $y += $row_h; 1389 $y += $row_h;
1142 } 1390 }
1143 1391
1392 1
1144} 1393}
1145 1394
1146sub find_widget { 1395sub find_widget {
1147 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1148 1397
… …
1167 } 1416 }
1168} 1417}
1169 1418
1170############################################################################# 1419#############################################################################
1171 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
1172package CFClient::UI::HBox; 1481package CFClient::UI::HBox;
1173 1482
1174# TODO: wrap into common Box base class
1175
1176our @ISA = CFClient::UI::Container::; 1483our @ISA = CFClient::UI::Box::;
1177 1484
1178sub size_request { 1485sub new {
1179 my ($self) = @_; 1486 my $class = shift;
1180 1487
1181 my @alloc = map [$_->size_request], @{$self->{children}}; 1488 $class->SUPER::new (
1182 1489 vertical => 0,
1183 ( 1490 @_,
1184 (List::Util::sum map $_->[0], @alloc),
1185 (List::Util::max map $_->[1], @alloc),
1186 ) 1491 )
1187} 1492}
1188 1493
1189sub size_allocate {
1190 my ($self, $w, $h) = @_;
1191
1192 ($h, $w) = ($w, $h);
1193
1194 my $children = $self->{children};
1195
1196 my @h = map $_->{req_w}, @$children;
1197
1198 my $req_h = List::Util::sum @h;
1199
1200 if ($req_h > $h) {
1201 # ah well, not enough space
1202 $_ *= $h / $req_h for @h;
1203 } else {
1204 my $exp = List::Util::sum map $_->{expand}, @$children;
1205 $exp ||= 1;
1206
1207 for (0 .. $#$children) {
1208 my $child = $children->[$_];
1209
1210 my $alloc_h = $h[$_];
1211 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1212 $h[$_] = $alloc_h;
1213 }
1214 }
1215
1216 CFClient::UI::harmonize \@h;
1217
1218 my $y = 0;
1219 for (0 .. $#$children) {
1220 my $child = $children->[$_];
1221 my $h = $h[$_];
1222 $child->configure ($y, 0, $h, $w);
1223
1224 $y += $h;
1225 }
1226
1227 1
1228}
1229
1230############################################################################# 1494#############################################################################
1231 1495
1232package CFClient::UI::VBox; 1496package CFClient::UI::VBox;
1233 1497
1234# TODO: wrap into common Box base class
1235
1236our @ISA = CFClient::UI::Container::; 1498our @ISA = CFClient::UI::Box::;
1237 1499
1238sub size_request { 1500sub new {
1239 my ($self) = @_; 1501 my $class = shift;
1240 1502
1241 my @alloc = map [$_->size_request], @{$self->{children}}; 1503 $class->SUPER::new (
1242 1504 vertical => 1,
1243 ( 1505 @_,
1244 (List::Util::max map $_->[0], @alloc),
1245 (List::Util::sum map $_->[1], @alloc),
1246 ) 1506 )
1247}
1248
1249sub size_allocate {
1250 my ($self, $w, $h) = @_;
1251
1252 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1253
1254 my $children = $self->{children};
1255
1256 my @h = map $_->{req_h}, @$children;
1257
1258 my $req_h = List::Util::sum @h;
1259
1260 if ($req_h > $h) {
1261 # ah well, not enough space
1262 $_ *= $h / $req_h for @h;
1263 } else {
1264 my $exp = List::Util::sum map $_->{expand}, @$children;
1265 $exp ||= 1;
1266
1267 for (0 .. $#$children) {
1268 my $child = $children->[$_];
1269
1270 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1271 }
1272 }
1273
1274 CFClient::UI::harmonize \@h;
1275
1276 my $y = 0;
1277 for (0 .. $#$children) {
1278 my $child = $children->[$_];
1279 my $h = $h[$_];
1280 $child->configure (0, $y, $w, $h);
1281
1282 $y += $h;
1283 }
1284
1285 1
1286} 1507}
1287 1508
1288############################################################################# 1509#############################################################################
1289 1510
1290package CFClient::UI::Label; 1511package CFClient::UI::Label;
… …
1307 ellipsise => 3, # end 1528 ellipsise => 3, # end
1308 layout => (new CFClient::Layout), 1529 layout => (new CFClient::Layout),
1309 fontsize => 1, 1530 fontsize => 1,
1310 align => -1, 1531 align => -1,
1311 valign => -1, 1532 valign => -1,
1312 padding => 2, 1533 padding_x => 2,
1534 padding_y => 2,
1313 can_events => 0, 1535 can_events => 0,
1314 %arg 1536 %arg
1315 ); 1537 );
1316 1538
1317 if (exists $self->{template}) { 1539 if (exists $self->{template}) {
… …
1344 1566
1345 delete $self->{texture}; 1567 delete $self->{texture};
1346 $self->SUPER::update; 1568 $self->SUPER::update;
1347} 1569}
1348 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1349sub set_text { 1578sub set_text {
1350 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1351 1580
1352 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1353 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1354 1583
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1357 1586
1587 delete $self->{size_req};
1588 $self->realloc;
1358 $self->update; 1589 $self->update;
1359 $self->check_size;
1360} 1590}
1361 1591
1362sub set_markup { 1592sub set_markup {
1363 my ($self, $markup) = @_; 1593 my ($self, $markup) = @_;
1364 1594
… …
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369 1599
1370 $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;
1371 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1372 1602
1603 delete $self->{size_req};
1604 $self->realloc;
1373 $self->update; 1605 $self->update;
1374 $self->check_size;
1375} 1606}
1376 1607
1377sub size_request { 1608sub size_request {
1378 my ($self) = @_; 1609 my ($self) = @_;
1379 1610
1611 $self->{size_req} ||= do {
1380 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1381 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1382 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1383 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1617
1386 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1387 1619
1388 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1389 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1390 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1391 1623
1392 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1393 1625
1394 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1396 } 1631 };
1397 1632
1398 ( 1633 @{ $self->{size_req} }
1399 $w + $self->{padding} * 2,
1400 $h + $self->{padding} * 2,
1401 )
1402} 1634}
1403 1635
1404sub size_allocate { 1636sub invoke_size_allocate {
1405 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1406 1638
1639 delete $self->{ox};
1640
1407 delete $self->{texture}; 1641 delete $self->{texture}
1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1408} 1645}
1409 1646
1410sub set_fontsize { 1647sub set_fontsize {
1411 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1412 1649
1413 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1414 delete $self->{texture}; 1651 delete $self->{texture};
1415 1652
1416 $self->update; 1653 $self->realloc;
1417 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1418} 1662}
1419 1663
1420sub _draw { 1664sub _draw {
1421 my ($self) = @_; 1665 my ($self) = @_;
1422 1666
… …
1428 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1429 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432 1676
1433 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1434 1679
1680 unless (exists $self->{ox}) {
1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1437 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1438 1684
1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1441 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1442
1443 $tex
1444 }; 1688 };
1445 1689
1446 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1447 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};
1448 1694
1449 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1450 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1451 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1452 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1453 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1454 } 1702 }
1455 1703
1456 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1457} 1705}
1458 1706
… …
1474 active_fg => [0, 0, 0], 1722 active_fg => [0, 0, 0],
1475 can_hover => 1, 1723 can_hover => 1,
1476 can_focus => 1, 1724 can_focus => 1,
1477 valign => 0, 1725 valign => 0,
1478 can_events => 1, 1726 can_events => 1,
1727 #text => ...
1728 #hidden => "*",
1479 @_ 1729 @_
1480 ) 1730 )
1481} 1731}
1482 1732
1483sub _set_text { 1733sub _set_text {
… …
1485 1735
1486 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1487 1737
1488 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1489 1739
1490 delete $self->{texture};
1491
1492 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1493 $self->{text} = $text; 1741 $self->{text} = $text;
1494 1742
1495 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1497 1746
1498 $self->emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1499} 1751}
1500 1752
1501sub set_text { 1753sub set_text {
1502 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1503 1755
1504 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1505 $self->_set_text ($text); 1757 $self->_set_text ($text);
1506 $self->update;
1507 $self->check_size;
1508} 1758}
1509 1759
1510sub get_text { 1760sub get_text {
1511 $_[0]{text} 1761 $_[0]{text}
1512} 1762}
… …
1517 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1518 1768
1519 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1520} 1770}
1521 1771
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526}
1527
1528sub key_down { 1772sub invoke_key_down {
1529 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1530 1774
1531 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1532 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1533 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1548 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1794 $self->emit ('escape');
1551 } elsif ($uni) { 1795 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1553 } 1799 }
1554 1800
1555 $self->_set_text ($text); 1801 $self->_set_text ($text);
1556 $self->update;
1557 $self->check_size;
1558}
1559 1802
1803 $self->realloc;
1804
1805 1
1806}
1807
1560sub focus_in { 1808sub invoke_focus_in {
1561 my ($self) = @_; 1809 my ($self) = @_;
1562 1810
1563 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1564 1812
1565 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1566} 1814}
1567 1815
1568sub button_down { 1816sub invoke_button_down {
1569 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1570 1818
1571 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1572 1820
1573 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1574 1822
1575 # byte-index to char-index 1823 # byte-index to char-index
1576 my $text = $self->{text}; 1824 my $text = $self->{text};
1577 utf8::encode $text; 1825 utf8::encode $text;
1578 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1579 1827
1580 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1581 $self->update; 1829 $self->update;
1830
1831 1
1582} 1832}
1583 1833
1584sub mouse_motion { 1834sub invoke_mouse_motion {
1585 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1586# 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
1587} 1839}
1588 1840
1589sub _draw { 1841sub _draw {
1590 my ($self) = @_; 1842 my ($self) = @_;
1591 1843
1592 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1593 1845
1594 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1595 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1596 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1597 } else { 1849 } else {
1598 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1599 } 1851 }
1600 1852
1601 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1603 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1604 glVertex 0 , 0; 1856 glVertex 0 , 0;
1605 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1606 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1607 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1632 1884
1633our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1634 1886
1635use CFClient::OpenGL; 1887use CFClient::OpenGL;
1636 1888
1637sub key_down { 1889sub invoke_key_down {
1638 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1639 1891
1640 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1641 1893
1642 if ($sym == 13) { 1894 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1645 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1900 $self->emit (activate => $txt);
1648 $self->update; 1901 $self->update;
1649 1902
… …
1668 } else { 1921 } else {
1669 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1670 } 1923 }
1671 1924
1672 } else { 1925 } else {
1673 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1674 } 1929 1
1675
1676} 1930}
1677 1931
1678############################################################################# 1932#############################################################################
1679 1933
1680package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1689 1943
1690sub new { 1944sub new {
1691 my $class = shift; 1945 my $class = shift;
1692 1946
1693 $class->SUPER::new ( 1947 $class->SUPER::new (
1694 padding => 4, 1948 padding_x => 4,
1949 padding_y => 4,
1695 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1], 1951 active_fg => [0, 0, 1],
1697 can_hover => 1, 1952 can_hover => 1,
1698 align => 0, 1953 align => 0,
1699 valign => 0, 1954 valign => 0,
1700 can_events => 1, 1955 can_events => 1,
1701 @_ 1956 @_
1702 ) 1957 )
1703} 1958}
1704 1959
1705sub button_up { 1960sub invoke_button_up {
1706 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1707 1962
1963 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1965 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate"); 1966
1711 } 1967 1
1712} 1968}
1713 1969
1714sub _draw { 1970sub _draw {
1715 my ($self) = @_; 1971 my ($self) = @_;
1716 1972
1717 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1718
1719 if ($GRAB == $self) {
1720 $self->{fg} = $self->{active_fg};
1721 }
1722 1974
1723 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1725 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1726 1978
… …
1731 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1732} 1984}
1733 1985
1734############################################################################# 1986#############################################################################
1735 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
1736package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
1737 2025
1738our @ISA = CFClient::UI::DrawBG::; 2026our @ISA = CFClient::UI::DrawBG::;
1739 2027
1740my @tex = 2028my @tex =
… …
1745 2033
1746sub new { 2034sub new {
1747 my $class = shift; 2035 my $class = shift;
1748 2036
1749 $class->SUPER::new ( 2037 $class->SUPER::new (
1750 padding => 2, 2038 padding_x => 2,
2039 padding_y => 2,
1751 fg => [1, 1, 1], 2040 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0], 2041 active_fg => [1, 1, 0],
1753 bg => [0, 0, 0, 0.2], 2042 bg => [0, 0, 0, 0.2],
1754 active_bg => [1, 1, 1, 0.5], 2043 active_bg => [1, 1, 1, 0.5],
1755 state => 0, 2044 state => 0,
… …
1759} 2048}
1760 2049
1761sub size_request { 2050sub size_request {
1762 my ($self) = @_; 2051 my ($self) = @_;
1763 2052
1764 ($self->{padding} * 2 + 6) x 2 2053 (6) x 2
1765} 2054}
1766 2055
1767sub button_down { 2056sub invoke_button_down {
1768 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1769 2058
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1774 } 2067 1
1775} 2068}
1776 2069
1777sub _draw { 2070sub _draw {
1778 my ($self) = @_; 2071 my ($self) = @_;
1779 2072
1780 $self->SUPER::_draw; 2073 $self->SUPER::_draw;
1781 2074
1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783 2076
1784 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;
1785 2080
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787 2082
1788 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789 2084
… …
1944 2239
1945 my $h1 = $self->{h} * (1 - $ycut1); 2240 my $h1 = $self->{h} * (1 - $ycut1);
1946 my $h2 = $self->{h} * (1 - $ycut2); 2241 my $h2 = $self->{h} * (1 - $ycut2);
1947 2242
1948 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
1949 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;
1950 glEnable GL_TEXTURE_2D; 2246 glEnable GL_TEXTURE_2D;
1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1952 2248
1953 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2249 glBindTexture GL_TEXTURE_2D, $t1->{name};
1954 glBegin GL_QUADS; 2250 glBegin GL_QUADS;
… …
2053 my $self = $class->SUPER::new ( 2349 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2350 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2351 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2352 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2353 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2354 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2355 min_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2356 min_h => $::WIDTH / 80,
2061 vertical => 0, 2357 vertical => 0,
2062 can_hover => 1, 2358 can_hover => 1,
2063 inner_pad => 0.02, 2359 inner_pad => 0.02,
2064 @_ 2360 @_
2065 ); 2361 );
… …
2068 $self->update; 2364 $self->update;
2069 2365
2070 $self 2366 $self
2071} 2367}
2072 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
2073sub set_value { 2380sub set_value {
2074 my ($self, $value) = @_; 2381 my ($self, $value) = @_;
2075 2382
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2383 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2384
2078 $hi = $lo + 1 if $hi <= $lo; 2385 $hi = $lo + 1 if $hi <= $lo;
2079 2386
2387 $page = $hi - $lo if $page > $hi - $lo;
2388
2080 $value = $lo if $value < $lo; 2389 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2390 $value = $hi - $page if $value > $hi - $page;
2082 2391
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2392 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2393 if $unit;
2085
2086 $page = $hi - $lo if $page > $hi - $lo;
2087 2394
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2396
2090 if ($value != $old_value) { 2397 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2398 $self->emit (changed => $value);
… …
2094} 2401}
2095 2402
2096sub size_request { 2403sub size_request {
2097 my ($self) = @_; 2404 my ($self) = @_;
2098 2405
2099 my $w = $self->{req_w}; 2406 ($self->{req_w}, $self->{req_h})
2100 my $h = $self->{req_h};
2101
2102 $self->{vertical} ? ($h, $w) : ($w, $h)
2103} 2407}
2104 2408
2105sub button_down { 2409sub invoke_button_down {
2106 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2107 2411
2108 $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
2109 $self->mouse_motion ($ev, $x, $y); 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2110} 2417}
2111 2418
2112sub mouse_motion { 2419sub invoke_mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2114 2421
2115 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2424
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2425 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2426
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2427 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2428
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2429 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2430 } else {
2431 return 0;
2432 }
2433
2123 } 2434 1
2124} 2435}
2125 2436
2126sub update { 2437sub update {
2127 my ($self) = @_; 2438 my ($self) = @_;
2128 2439
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2440 delete $self->{knob_w};
2441 $self->SUPER::update;
2442}
2443
2444sub _draw {
2445 my ($self) = @_;
2446
2447 unless ($self->{knob_w}) {
2130 $self->set_value ($self->{range}[0]); 2448 $self->set_value ($self->{range}[0]);
2131 2449
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2450 my ($value, $lo, $hi, $page) = @{$self->{range}};
2451 my $range = ($hi - $page - $lo) || 1e-100;
2133 2452
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2453 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2454
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2455 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2456 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2457
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2458 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2459 $value = $value * $self->{scale} + $self->{offset};
2140 2460
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2461 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2462 $self->{knob_w} = $knob_w;
2148 }); 2463 }
2149
2150 $self->SUPER::update;
2151}
2152
2153sub _draw {
2154 my ($self) = @_;
2155 2464
2156 $self->SUPER::_draw (); 2465 $self->SUPER::_draw ();
2157 2466
2158 glScale $self->{w}, $self->{h}; 2467 glScale $self->{w}, $self->{h};
2159 2468
… …
2179 glDisable GL_TEXTURE_2D; 2488 glDisable GL_TEXTURE_2D;
2180} 2489}
2181 2490
2182############################################################################# 2491#############################################################################
2183 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
2184package CFClient::UI::TextView; 2534package CFClient::UI::TextScroller;
2185 2535
2186our @ISA = CFClient::UI::HBox::; 2536our @ISA = CFClient::UI::HBox::;
2187 2537
2188use CFClient::OpenGL; 2538use CFClient::OpenGL;
2189 2539
… …
2191 my $class = shift; 2541 my $class = shift;
2192 2542
2193 my $self = $class->SUPER::new ( 2543 my $self = $class->SUPER::new (
2194 fontsize => 1, 2544 fontsize => 1,
2195 can_events => 0, 2545 can_events => 0,
2546 indent => 0,
2196 #font => default_font 2547 #font => default_font
2197 @_, 2548 @_,
2198 2549
2199 layout => (new CFClient::Layout 1), 2550 layout => (new CFClient::Layout 1),
2200 par => [], 2551 par => [],
… …
2215 2566
2216 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2217 $self->reflow; 2568 $self->reflow;
2218} 2569}
2219 2570
2220sub size_allocate { 2571sub invoke_size_allocate {
2221 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2222
2223 $self->SUPER::size_allocate ($w, $h);
2224 2573
2225 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2226 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2227 $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});
2228 2578
2229 $self->reflow; 2579 $self->reflow;
2230}
2231 2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2582}
2583
2232sub text_height { 2584sub text_size {
2233 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2234 2586
2235 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2236 2588
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2590 $layout->set_width ($self->{children}[0]{w} - $indent);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2239 $layout->set_markup ($text); 2592 $layout->set_markup ($text);
2240 2593
2241 ($layout->size)[1] 2594 $layout->size
2242} 2595}
2243 2596
2244sub reflow { 2597sub reflow {
2245 my ($self) = @_; 2598 my ($self) = @_;
2246 2599
2247 $self->{need_reflow}++; 2600 $self->{need_reflow}++;
2248 $self->update; 2601 $self->update;
2249} 2602}
2250 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]);
2617}
2618
2251sub add_paragraph { 2619sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2620 my ($self, $color, $text, $indent) = @_;
2253 2621
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2622 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2623 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2624 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2626 }
2261 2627
2262 $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]);
2263 $self->{children}[1]->update;
2264} 2629}
2265 2630
2266sub update { 2631sub update {
2267 my ($self) = @_; 2632 my ($self) = @_;
2268 2633
… …
2270 2635
2271 return unless $self->{h} > 0; 2636 return unless $self->{h} > 0;
2272 2637
2273 delete $self->{texture}; 2638 delete $self->{texture};
2274 2639
2275 $ROOT->on_post_alloc ($self, sub { 2640 $ROOT->on_post_alloc ($self => sub {
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642
2276 if (delete $self->{need_reflow}) { 2643 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2644 my $height = 0;
2278 2645
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2280 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 }
2281 2662
2282 $self->{height} = $height; 2663 $self->{height} = $height;
2283 2664
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update; 2666
2286
2287 delete $self->{texture}; 2667 delete $self->{texture};
2288 } 2668 }
2289 2669
2290 $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 {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2671 glClearColor 0, 0, 0, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2672 glClear GL_COLOR_BUFFER_BIT;
2293 2673
2294 my $top = int $self->{children}[1]{range}[0]; 2674 my $top = int $self->{children}[1]{range}[0];
2295 2675
2296 my $y0 = $top; 2676 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2677 my $y1 = $top + $H;
2298 2678
2299 my $y = 0; 2679 my $y = 0;
2300 2680
2301 my $layout = $self->{layout}; 2681 my $layout = $self->{layout};
2302 2682
2303 $layout->set_font ($self->{font}) if $self->{font}; 2683 $layout->set_font ($self->{font}) if $self->{font};
2304 2684
2305 glEnable GL_BLEND; 2685 glEnable GL_BLEND;
2686 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2687 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2688
2308 for my $par (@{$self->{par}}) { 2689 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2690 my $h = $par->[1];
2310 2691
2311 if ($y0 < $y + $h && $y < $y1) { 2692 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2693 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2314 $layout->set_markup ($par->[3]); 2696 $layout->set_markup ($par->[4]);
2315 2697
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2698 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2699
2318 glRasterPos $par->[2], $y - $y0; 2700 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2701 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2702 }
2321 2703
2322 $y += $h; 2704 $y += $h;
2323 } 2705 }
… …
2330sub _draw { 2712sub _draw {
2331 my ($self) = @_; 2713 my ($self) = @_;
2332 2714
2333 glEnable GL_TEXTURE_2D; 2715 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2717 glColor 0, 0, 0, 1;
2336 $self->{texture}->draw_quad_alpha (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});
2337 glDisable GL_TEXTURE_2D; 2719 glDisable GL_TEXTURE_2D;
2338 2720
2339 $self->{children}[1]->draw; 2721 $self->{children}[1]->draw;
2340 2722
2341} 2723}
… …
2390 2772
2391sub new { 2773sub new {
2392 my $class = shift; 2774 my $class = shift;
2393 2775
2394 my $self = $class->SUPER::new ( 2776 my $self = $class->SUPER::new (
2395 state => 0, 2777 state => 0,
2396 connect_activate => \&toggle_flopper, 2778 on_activate => \&toggle_flopper,
2397 @_ 2779 @_
2398 ); 2780 );
2399 2781
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2782 $self
2406} 2783}
2407 2784
2408sub toggle_flopper { 2785sub toggle_flopper {
2409 my ($self) = @_; 2786 my ($self) = @_;
2410 2787
2411 # TODO: use animation 2788 $self->{other}->toggle_visibility;
2412 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open");
2416 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close");
2419 }
2420
2421 $self->emit (changed => $self->{state});
2422} 2789}
2423 2790
2424############################################################################# 2791#############################################################################
2425 2792
2426package CFClient::UI::Tooltip; 2793package CFClient::UI::Tooltip;
… …
2439} 2806}
2440 2807
2441sub set_tooltip_from { 2808sub set_tooltip_from {
2442 my ($self, $widget) = @_; 2809 my ($self, $widget) = @_;
2443 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
2444 $self->add (new CFClient::UI::Label 2823 $self->add (new CFClient::UI::Label
2445 markup => $widget->{tooltip}, 2824 markup => $tooltip,
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8, 2826 fontsize => 0.8,
2448 fg => [0, 0, 0, 1], 2827 fg => [0, 0, 0, 1],
2449 ellipsise => 0, 2828 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP), 2829 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2457 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2458 2837
2459 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2460} 2839}
2461 2840
2462sub size_allocate { 2841sub invoke_size_allocate {
2463 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2464 2843
2465 $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 });
2466} 2863}
2467 2864
2468sub _draw { 2865sub _draw {
2469 my ($self) = @_; 2866 my ($self) = @_;
2470 2867
… …
2487 glVertex $w, $h; 2884 glVertex $w, $h;
2488 glVertex $w, 0; 2885 glVertex $w, 0;
2489 glEnd; 2886 glEnd;
2490 2887
2491 glTranslate 2 - 0.375, 2 - 0.375; 2888 glTranslate 2 - 0.375, 2 - 0.375;
2889
2492 $self->SUPER::_draw; 2890 $self->SUPER::_draw;
2493} 2891}
2494 2892
2495############################################################################# 2893#############################################################################
2496 2894
… …
2502 2900
2503sub new { 2901sub new {
2504 my $class = shift; 2902 my $class = shift;
2505 2903
2506 my $self = $class->SUPER::new ( 2904 my $self = $class->SUPER::new (
2507 aspect => 1, 2905 aspect => 1,
2906 can_events => 0,
2508 @_, 2907 @_,
2509 ); 2908 );
2510 2909
2511 if ($self->{anim} && $self->{animspeed}) { 2910 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2911 Scalar::Util::weaken (my $widget = $self);
… …
2527 2926
2528sub size_request { 2927sub size_request {
2529 (32, 8) 2928 (32, 8)
2530} 2929}
2531 2930
2931sub update {
2932 my ($self) = @_;
2933
2934 return unless $self->{visible};
2935
2936 $self->SUPER::update;
2937}
2938
2532sub _draw { 2939sub _draw {
2533 my ($self) = @_; 2940 my ($self) = @_;
2534 2941
2535 return unless $::CONN;#d# manage and cache textures differently 2942 return unless $::CONN;
2536 2943
2537 my $face; 2944 my $face;
2538 2945
2539 if ($self->{frame}) { 2946 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2947 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2547 2954
2548 if ($tex) { 2955 if ($tex) {
2549 glEnable GL_TEXTURE_2D; 2956 glEnable GL_TEXTURE_2D;
2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2551 glColor 1, 1, 1, 1; 2958 glColor 0, 0, 0, 1;
2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2553 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2554 } 2961 }
2555} 2962}
2556 2963
2557sub DESTROY { 2964sub destroy {
2558 my ($self) = @_; 2965 my ($self) = @_;
2559 2966
2560 $self->{timer}->cancel 2967 $self->{timer}->cancel
2561 if $self->{timer}; 2968 if $self->{timer};
2562 2969
2563 $self->SUPER::DESTROY; 2970 $self->SUPER::destroy;
2564} 2971}
2565 2972
2566############################################################################# 2973#############################################################################
2567 2974
2568package CFClient::UI::InventoryItem; 2975package CFClient::UI::Buttonbar;
2569 2976
2570our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFClient::UI::HBox::;
2571 2978
2572sub _item_to_desc { 2979# TODO: should actualyl wrap buttons and other goodies.
2573 my ($item) = @_;
2574
2575 my $desc =
2576 $item->{nrof} < 2
2577 ? $item->{name}
2578 : "$item->{nrof} × $item->{name_pl}";
2579
2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2581 and $desc .= " (open)";
2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2583 and $desc .= " (applied)";
2584 $item->{flags} & Crossfire::Protocol::F_UNPAID
2585 and $desc .= " (unpaid)";
2586 $item->{flags} & Crossfire::Protocol::F_MAGIC
2587 and $desc .= " (magic)";
2588 $item->{flags} & Crossfire::Protocol::F_CURSED
2589 and $desc .= " (cursed)";
2590 $item->{flags} & Crossfire::Protocol::F_DAMNED
2591 and $desc .= " (damned)";
2592 $item->{flags} & Crossfire::Protocol::F_LOCKED
2593 and $desc .= " *";
2594
2595 $desc
2596}
2597
2598sub new {
2599 my $class = shift;
2600
2601 my %args = @_;
2602
2603 my $item = delete $args{item};
2604
2605 my $desc = _item_to_desc ($item);
2606
2607 my $self = $class->SUPER::new (
2608 can_hover => 1,
2609 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_;
2614
2615 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag};
2618
2619 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT;
2621 }
2622
2623 $::CONN->send ("move $targ $item->{tag} 0");
2624 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) {
2627 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2640 ),
2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644 }
2645
2646 1
2647 },
2648 %args
2649 );
2650
2651
2652 $self->add (new CFClient::UI::Face
2653 can_events => 0,
2654 face => $item->{face},
2655 anim => $item->{anim},
2656 animspeed => $item->{animspeed},
2657 );
2658
2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661 $self->{item} = $item;
2662
2663 $self->update_item;
2664
2665 $self
2666}
2667
2668sub update_item {
2669 my ($self) = @_;
2670
2671 my $desc = _item_to_desc ($self->{item});
2672
2673 $self->{name_lbl}->set_text ($desc);
2674}
2675
2676#############################################################################
2677
2678package CFClient::UI::Inventory;
2679
2680our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub new {
2683 my $class = shift;
2684
2685 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox),
2687 @_,
2688 );
2689
2690 $self
2691}
2692
2693sub set_items {
2694 my ($self, $items) = @_;
2695
2696 $self->{scrolled}->clear;
2697 return unless $items;
2698
2699 my @items = sort {
2700 ($a->{type} <=> $b->{type})
2701 or ($a->{name} cmp $b->{name})
2702 } @$items;
2703
2704 $self->{real_items} = \@items;
2705
2706 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item ();
2709 }
2710
2711 $self->{scrolled}->add (@items);
2712
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714}
2715
2716sub size_request {
2717 my ($self) = @_;
2718 ($self->{req_w}, $self->{req_h});
2719}
2720 2980
2721############################################################################# 2981#############################################################################
2722 2982
2723package CFClient::UI::Menu; 2983package CFClient::UI::Menu;
2724 2984
… …
2736 ); 2996 );
2737 2997
2738 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2998 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2739 2999
2740 for my $item (@{ $self->{items} }) { 3000 for my $item (@{ $self->{items} }) {
2741 my ($widget, $cb) = @$item; 3001 my ($widget, $cb, $tooltip) = @$item;
2742 3002
2743 # handle various types of items, only text for now 3003 # handle various types of items, only text for now
2744 if (!ref $widget) { 3004 if (!ref $widget) {
2745 $widget = new CFClient::UI::Label 3005 $widget = new CFClient::UI::Label
2746 can_hover => 1, 3006 can_hover => 1,
2747 can_events => 1, 3007 can_events => 1,
2748 text => $widget; 3008 markup => $widget,
3009 tooltip => $tooltip
2749 } 3010 }
2750 3011
2751 $self->{item}{$widget} = $item; 3012 $self->{item}{$widget} = $item;
2752 3013
2753 $self->{vbox}->add ($widget); 3014 $self->{vbox}->add ($widget);
… …
2765 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 3027 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2768 3029
2769 $self->show; 3030 $self->show;
2770 $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);
2771} 3032}
2772 3033
2773sub mouse_motion { 3034sub invoke_mouse_motion {
2774 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2775 3036
2776 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2777 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2778 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2779}
2780 3040
3041 0
3042}
3043
2781sub button_up { 3044sub invoke_button_up {
2782 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2783 3046
2784 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 3048 undef $GRAB;
2786 $self->hide; 3049 $self->hide;
2787 3050
2788 $self->emit ("popdown"); 3051 $self->emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
3053 } else {
3054 return 0
3055 }
3056
2790 } 3057 1
2791} 3058}
2792 3059
2793############################################################################# 3060#############################################################################
2794 3061
2795package CFClient::UI::Statusbox; 3062package CFClient::UI::Multiplexer;
2796 3063
2797our @ISA = CFClient::UI::VBox::; 3064our @ISA = CFClient::UI::Container::;
2798 3065
2799sub new { 3066sub new {
2800 my $class = shift; 3067 my $class = shift;
2801 3068
2802 $class->SUPER::new ( 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
3228package CFClient::UI::Statusbox;
3229
3230our @ISA = CFClient::UI::VBox::;
3231
3232sub new {
3233 my $class = shift;
3234
3235 my $self = $class->SUPER::new (
2803 fontsize => 0.8, 3236 fontsize => 0.8,
2804 @_, 3237 @_,
2805 ) 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
2806} 3245}
2807 3246
2808sub reorder { 3247sub reorder {
2809 my ($self) = @_; 3248 my ($self) = @_;
2810 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} };
2811 3255
2812 while (my ($k, $v) = each %{ $self->{item} }) { 3256 while (my ($k, $v) = each %{ $self->{item} }) {
2813 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3257 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2814 } 3258 }
2815 3259
… …
2818 my @items = sort { 3262 my @items = sort {
2819 $a->{pri} <=> $b->{pri} 3263 $a->{pri} <=> $b->{pri}
2820 or $b->{id} <=> $a->{id} 3264 or $b->{id} <=> $a->{id}
2821 } values %{ $self->{item} }; 3265 } values %{ $self->{item} };
2822 3266
3267 $self->{timer}->interval (1);
3268
2823 my $count = 10 + 1; 3269 my $count = 10 + 1;
2824 for my $item (@items) { 3270 for my $item (@items) {
2825 last unless --$count; 3271 last unless --$count;
2826 3272
2827 push @widgets, $item->{label} ||= do { 3273 my $label = $item->{label} ||= do {
2828 # TODO: doesn't handle markup well (read as: at all) 3274 # TODO: doesn't handle markup well (read as: at all)
2829 my $short = $item->{count} > 1 3275 my $short = $item->{count} > 1
2830 ? "<b>$item->{count} ×</b> $item->{text}" 3276 ? "<b>$item->{count} ×</b> $item->{text}"
2831 : $item->{text}; 3277 : $item->{text};
2832 3278
… …
2840 tooltip => $item->{tooltip}, 3286 tooltip => $item->{tooltip},
2841 tooltip_font => $::FONT_PROP, 3287 tooltip_font => $::FONT_PROP,
2842 tooltip_width => 0.67, 3288 tooltip_width => 0.67,
2843 fontsize => $item->{fontsize} || $self->{fontsize}, 3289 fontsize => $item->{fontsize} || $self->{fontsize},
2844 max_w => $::WIDTH * 0.44, 3290 max_w => $::WIDTH * 0.44,
2845 fg => $item->{fg}, 3291 fg => [@{ $item->{fg} }],
2846 can_events => 1, 3292 can_events => 1,
2847 can_hover => 1 3293 can_hover => 1
2848 }; 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;
2849 } 3307 }
2850 3308
2851 $self->clear; 3309 $self->clear;
2852 $self->SUPER::add (reverse @widgets); 3310 $self->SUPER::add (reverse @widgets);
2853} 3311}
… …
2856 my ($self, $text, %arg) = @_; 3314 my ($self, $text, %arg) = @_;
2857 3315
2858 $text =~ s/^\s+//; 3316 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 3317 $text =~ s/\s+$//;
2860 3318
3319 return unless $text;
3320
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 3321 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2862 3322
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3323 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 3324
2865 if (my $item = $self->{item}{$group}) { 3325 if (my $item = $self->{item}{$group}) {
2866 if ($item->{text} eq $text) { 3326 if ($item->{text} eq $text) {
2867 $item->{count}++; 3327 $item->{count}++;
2868 } else { 3328 } else {
2869 $item->{count} = 1; 3329 $item->{count} = 1;
2870 $item->{text} = $item->{tooltip} = $text; 3330 $item->{text} = $item->{tooltip} = $text;
2871 } 3331 }
2872 $item->{id} = ++$self->{id}; 3332 $item->{id} += 0.2;#d#
2873 $item->{timeout} = $timeout; 3333 $item->{timeout} = $timeout;
2874 delete $item->{label}; 3334 delete $item->{label};
2875 } else { 3335 } else {
2876 $self->{item}{$group} = { 3336 $self->{item}{$group} = {
2877 id => ++$self->{id}, 3337 id => ++$self->{id},
… …
2896 3356
2897 $self->reorder; 3357 $self->reorder;
2898 $self->SUPER::reconfigure; 3358 $self->SUPER::reconfigure;
2899} 3359}
2900 3360
3361sub destroy {
3362 my ($self) = @_;
3363
3364 $self->{timer}->cancel;
3365
3366 $self->SUPER::destroy;
3367}
3368
2901############################################################################# 3369#############################################################################
2902 3370
2903package CFClient::UI::Root; 3371package CFClient::UI::Inventory;
2904 3372
2905our @ISA = CFClient::UI::Container::; 3373our @ISA = CFClient::UI::ScrolledWindow::;
2906
2907use CFClient::OpenGL;
2908 3374
2909sub new { 3375sub new {
2910 my $class = shift; 3376 my $class = shift;
2911 3377
2912 $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 => [],
2913 @_, 3621 @_,
2914 ) 3622 )
2915} 3623}
2916 3624
2917sub configure { 3625my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2918 my ($self, $x, $y, $w, $h) = @_;
2919 3626
2920 $self->{w} = $w; 3627my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2921 $self->{h} = $h; 3628 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2922} 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");
2923 3637
2924sub 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 {
2925 my ($self) = @_; 3711 my ($self, $spell) = @_;
2926 3712
2927 $self->size_allocate ($self->{w}, $self->{h}) 3713 $self->{spell}->{$spell->{name}} = $spell;
2928 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
2929} 3752}
2930 3753
2931sub size_request { 3754sub size_request {
2932 my ($self) = @_; 3755 my ($self) = @_;
2933 3756
2934 ($self->{w}, $self->{h}) 3757 ($self->{w}, $self->{h})
2935} 3758}
2936 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
2937sub size_allocate { 3774sub invoke_size_allocate {
2938 my ($self, $w, $h) = @_; 3775 my ($self, $w, $h) = @_;
2939
2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945 3776
2946 for my $child ($self->children) { 3777 for my $child ($self->children) {
2947 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)};
2948 3779
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3780 $X = $child->{force_x} if exists $child->{force_x};
2950 if exists $child->{req_x}; 3781 $Y = $child->{force_y} if exists $child->{force_y};
2951 3782
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3783 $X = _to_pixel $X, $W, $self->{w};
2953 if exists $child->{req_y}; 3784 $Y = _to_pixel $Y, $H, $self->{h};
2954
2955 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2956 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2957 3785
2958 $child->configure ($X, $Y, $W, $H); 3786 $child->configure ($X, $Y, $W, $H);
2959 } 3787 }
3788
3789 1
2960} 3790}
2961 3791
2962sub coord2local { 3792sub coord2local {
2963 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
2964 3794
… …
2972} 3802}
2973 3803
2974sub update { 3804sub update {
2975 my ($self) = @_; 3805 my ($self) = @_;
2976 3806
2977 $self->check_size;
2978 $::WANT_REFRESH++; 3807 $::WANT_REFRESH++;
2979} 3808}
2980 3809
2981sub add { 3810sub add {
2982 my ($self, @children) = @_; 3811 my ($self, @children) = @_;
2983 3812
2984 for my $child (@children) {
2985 $child->{toplevel} = 1; 3813 $_->{is_toplevel} = 1
2986 3814 for @children;
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991 3815
2992 $self->SUPER::add (@children); 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 }
2993} 3832}
2994 3833
2995sub on_refresh { 3834sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3835 my ($self, $id, $cb) = @_;
2997 3836
… …
3010 while ($self->{refresh_hook}) { 3849 while ($self->{refresh_hook}) {
3011 $_->() 3850 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3851 for values %{delete $self->{refresh_hook}};
3013 } 3852 }
3014 3853
3015 if ($self->{check_size}) { 3854 if ($self->{realloc}) {
3016 my @queue = ([], []); 3855 my %queue;
3856 my @queue;
3857 my $widget;
3017 3858
3018 for (;;) { 3859 outer:
3019 if ($self->{check_size}) { 3860 while () {
3020 # heuristic: check containers last 3861 if (my $realloc = delete $self->{realloc}) {
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3862 for $widget (values %$realloc) {
3022 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 }
3023 } 3869 }
3024 3870
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3871 while () {
3872 @queue or last outer;
3026 3873
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3874 $widget = pop @{ $queue[-1] || [] }
3028 ? @$widget{qw(user_w user_h)} 3875 and last;
3029 : $widget->size_request;
3030
3031 if (delete $widget->{force_alloc}
3032 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3033 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3034 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}) {
3035 $widget->{req_w} = $w; 3895 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h; 3896 $widget->{req_h} = $h;
3037 3897
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3898 $self->{size_alloc}{$widget+0} = $widget;
3039 3899
3040 $widget->{parent}->check_size
3041 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 }
3042 } 3907 }
3908
3909 delete $self->{realloc}{$widget+0};
3043 } 3910 }
3044 } 3911 }
3045 3912
3046 while ($self->{size_alloc}) { 3913 while (my $size_alloc = delete $self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) { 3914 my @queue = sort { $b->{visible} <=> $a->{visible} }
3048 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)};
3049 3921
3050 $w = 0 if $w < 0; 3922 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3923 $h = 0 if $h < 0;
3052 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
3053 $widget->{w} = $w; 3932 $widget->{w} = $w;
3054 $widget->{h} = $h; 3933 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h); 3934
3056 $widget->emit (size_allocate => $w, $h); 3935 $widget->emit (size_allocate => $w, $h);
3936 }
3057 } 3937 }
3058 } 3938 }
3059 3939
3060 while ($self->{post_alloc_hook}) { 3940 while ($self->{post_alloc_hook}) {
3061 $_->() 3941 $_->()
3062 for values %{delete $self->{post_alloc_hook}}; 3942 for values %{delete $self->{post_alloc_hook}};
3063 } 3943 }
3944
3064 3945
3065 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3946 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067 glClear GL_COLOR_BUFFER_BIT; 3948 glClear GL_COLOR_BUFFER_BIT;
3068 3949
… …
3070 glLoadIdentity; 3951 glLoadIdentity;
3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3072 glMatrixMode GL_MODELVIEW; 3953 glMatrixMode GL_MODELVIEW;
3073 glLoadIdentity; 3954 glLoadIdentity;
3074 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
3075 $self->_draw; 3963 $self->_draw;
3076} 3964}
3077 3965
3078############################################################################# 3966#############################################################################
3079 3967

Diff Legend

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