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

Diff Legend

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