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

Diff Legend

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