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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC

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

Diff Legend

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