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

Diff Legend

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