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.194 by root, Thu May 11 23:41:47 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_markup ($widget->{tooltip}); 39 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 40 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
40 } 41 }
41 42
42 return; 43 return;
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 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;
49} 74}
50 75
51# class methods for events 76# class methods for events
52sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 78 $FOCUS->emit (key_down => $_[0])
54 if $FOCUS; 79 if $FOCUS;
55} 80}
56 81
57sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 83 $FOCUS->emit (key_up => $_[0])
59 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 }
60} 98}
61 99
62sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
63 my ($ev) = @_; 101 my ($ev) = @_;
64 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
65 103
66 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
67 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
68 108
69 $GRAB = $widget; 109 $GRAB = $widget;
70 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
71 111
72 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
73 } 113 }
74
75 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
76 114
77 if ($GRAB) { 115 if ($GRAB) {
78 ($x, $y) = $GRAB->coord2local ($x, $y); 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
79 $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 }
80 } 124 }
81} 125}
82 126
83sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
84 my ($ev) = @_; 128 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y});
86 129
87 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
88 131
89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90 133
91 if ($GRAB) { 134 $GRAB->emit (button_up => $ev)
92 ($x, $y) = $GRAB->coord2local ($x, $y); 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
95 136
96 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
97 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
98 $grab->update if $grab; 139 $grab->update if $grab;
99 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
100 141
101 check_tooltip; 142 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->();
102 } 144 }
103} 145}
104 146
105sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
106 my ($ev) = @_; 148 my ($ev) = @_;
107 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
108 150
109 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
110 152
111 if ($widget != $HOVER) { 153 check_hover $widget;
112 my $hover = $HOVER; $HOVER = $widget;
113 154
114 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
115 $HOVER->update if $HOVER && $HOVER->{can_hover};
116
117 check_tooltip;
118 }
119
120 if ($HOVER) { 156 if $HOVER;
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
123 }
124} 157}
125 158
126# convert position array to integers 159# convert position array to integers
127sub harmonize { 160sub harmonize {
128 my ($vals) = @_; 161 my ($vals) = @_;
… …
134 $rem += $_ - $i; 167 $rem += $_ - $i;
135 $_ = $i; 168 $_ = $i;
136 } 169 }
137} 170}
138 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
139############################################################################# 213#############################################################################
140 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
141package CFClient::UI::Base; 223package CFPlus::UI::Base;
142 224
143use strict; 225use strict;
144 226
145use CFClient::OpenGL; 227use CFPlus::OpenGL;
146 228
147sub new { 229sub new {
148 my $class = shift; 230 my $class = shift;
149 231
150 my $self = bless { 232 my $self = bless {
151 x => 0, 233 x => "center",
152 y => 0, 234 y => "center",
153 z => 0, 235 z => 0,
236 w => undef,
237 h => undef,
154 can_events => 1, 238 can_events => 1,
155 @_ 239 @_
156 }, $class; 240 }, $class;
157 241
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
243
158 for (keys %$self) { 244 for (keys %$self) {
159 if (/^connect_(.*)$/) { 245 if (/^on_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
161 } 247 }
162 } 248 }
163 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
164 $self 262 $self
165} 263}
166 264
167sub destroy { 265sub destroy {
168 my ($self) = @_; 266 my ($self) = @_;
169 267
170 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
171 %$self = (); 270 %$self = ();
172} 271}
173 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
174sub show { 277sub show {
175 my ($self) = @_; 278 my ($self) = @_;
176 279
177 return if $self->{parent}; 280 return if $self->{parent};
178 281
179 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
180} 283}
181 284
182sub hide { 285sub set_visible {
183 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};
184 309
185 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
187 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
188 $self->{parent}->remove ($self) 342 $self->{parent}->remove ($self)
189 if $self->{parent}; 343 if $self->{parent};
190} 344}
191 345
192sub move { 346sub move_abs {
193 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
194 348
195 $self->{x} = int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
196 $self->{y} = int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
197 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
198 352
199 $self->update; 353 $self->update;
200} 354}
201 355
202sub set_size { 356sub set_size {
203 my ($self, $w, $h) = @_; 357 my ($self, $w, $h) = @_;
204 358
205 $self->{user_w} = $w; 359 $self->{force_w} = $w;
206 $self->{user_h} = $h; 360 $self->{force_h} = $h;
207 361
208 $self->check_size; 362 $self->realloc;
209} 363}
210 364
211sub size_request { 365sub size_request {
212 require Carp; 366 require Carp;
213 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
214} 368}
215 369
370sub baseline_shift {
371 0
372}
373
216sub configure { 374sub configure {
217 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
218 376
219 if ($self->{aspect}) { 377 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h);
379
220 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
221 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
222 382
223 # use alignment to adjust x, y 383 # use alignment to adjust x, y
224 384
225 $x += int +($w - $w2) * 0.5; 385 $x += int 0.5 * ($ow - $w);
226 $y += int +($h - $h2) * 0.5; 386 $y += int 0.5 * ($oh - $h);
227
228 ($w, $h) = ($w2, $h2);
229 } 387 }
230 388
231 if ($self->{x} != $x || $self->{y} != $y) { 389 if ($self->{x} ne $x || $self->{y} ne $y) {
232 $self->{x} = $x; 390 $self->{x} = $x;
233 $self->{y} = $y; 391 $self->{y} = $y;
234 $self->update; 392 $self->update;
235 } 393 }
236 394
237 if ($self->{w} != $w || $self->{h} != $h) { 395 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 396 return unless $self->{visible};
239 }
240}
241 397
242sub size_allocate { 398 $self->{alloc_w} = $w;
243 # nothing to be done 399 $self->{alloc_h} = $h;
400
401 $self->{root}{size_alloc}{$self+0} = $self;
402 }
244} 403}
245 404
246sub children { 405sub children {
406 # nop
247} 407}
248 408
249# call when resolution changes etc. 409sub visible_children {
250sub reconfigure { 410 $_[0]->children
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
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 $self->check_size
389 unless exists $self->{req_w};
390}
391
392sub check_size {
393 my ($self) = @_;
394
395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396}
397
398sub update {
399 my ($self) = @_;
400
401 $self->{parent}->update
402 if $self->{parent};
403}
404
405sub connect {
406 my ($self, $signal, $cb) = @_;
407
408 push @{ $self->{signal_cb}{$signal} }, $cb;
409}
410
411sub emit {
412 my ($self, $signal, @args) = @_;
413
414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
415}
416
417sub DESTROY { 657sub DESTROY {
418 my ($self) = @_; 658 my ($self) = @_;
419 659
420 #$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};
421} 666}
422 667
423############################################################################# 668#############################################################################
424 669
425package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
426 671
427our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
428 673
429use strict; 674use strict;
430use CFClient::OpenGL; 675use CFPlus::OpenGL;
431 676
432sub new { 677sub new {
433 my $class = shift; 678 my $class = shift;
434 679
435 # range [value, low, high, page] 680 # range [value, low, high, page]
436 681
437 $class->SUPER::new ( 682 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 683 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 684 #active_bg => [1, 1, 1, 0.5],
440 @_ 685 @_
441 ) 686 )
442} 687}
443 688
444sub _draw { 689sub _draw {
445 my ($self) = @_; 690 my ($self) = @_;
446 691
692 my $color = $FOCUS == $self && $self->{active_bg}
693 ? $self->{active_bg}
694 : $self->{bg};
695
696 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 697 my ($w, $h) = @$self{qw(w h)};
448 698
449 glEnable GL_BLEND; 699 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 701 glColor_premultiply @$color;
452 702
453 glBegin GL_QUADS; 703 glBegin GL_QUADS;
454 glVertex 0 , 0; 704 glVertex 0 , 0;
455 glVertex 0 , $h; 705 glVertex 0 , $h;
456 glVertex $w, $h; 706 glVertex $w, $h;
457 glVertex $w, 0; 707 glVertex $w, 0;
458 glEnd; 708 glEnd;
459 709
460 glDisable GL_BLEND; 710 glDisable GL_BLEND;
711 }
461} 712}
462 713
463############################################################################# 714#############################################################################
464 715
465package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
466 717
467our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
468 719
469sub new { 720sub new {
470 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
471 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
472} 723}
473 724
474sub size_request { 725sub size_request {
475 (0, 0) 726 my ($self) = @_;
727
728 ($self->{w} + 0, $self->{h} + 0)
476} 729}
477 730
478sub draw { } 731sub draw { }
479 732
480############################################################################# 733#############################################################################
481 734
482package CFClient::UI::Container; 735package CFPlus::UI::Container;
483 736
484our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
485 738
486sub new { 739sub new {
487 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
488 741
489 my $children = delete $arg{children} || []; 742 my $children = delete $arg{children};
490 743
491 my $self = $class->SUPER::new ( 744 my $self = $class->SUPER::new (
492 children => [], 745 children => [],
493 can_events => 0, 746 can_events => 0,
494 %arg, 747 %arg,
495 ); 748 );
749
496 $self->add ($_) for @$children; 750 $self->add (@$children)
751 if $children;
497 752
498 $self 753 $self
754}
755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
499} 762}
500 763
501sub add { 764sub add {
502 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
503 766
… …
509 $self->{children} = [ 772 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 773 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 774 @{$self->{children}}, @widgets
512 ]; 775 ];
513 776
514 $self->check_size; 777 $self->realloc;
515 $self->update;
516} 778}
517 779
518sub children { 780sub children {
519 @{ $_[0]{children} } 781 @{ $_[0]{children} }
520} 782}
… …
525 delete $child->{parent}; 787 delete $child->{parent};
526 $child->hide; 788 $child->hide;
527 789
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 791
530 $self->check_size; 792 $self->realloc;
531 $self->update;
532} 793}
533 794
534sub clear { 795sub clear {
535 my ($self) = @_; 796 my ($self) = @_;
536 797
… …
540 for (@$children) { 801 for (@$children) {
541 delete $_->{parent}; 802 delete $_->{parent};
542 $_->hide; 803 $_->hide;
543 } 804 }
544 805
545 $self->check_size; 806 $self->realloc;
546 $self->update;
547} 807}
548 808
549sub find_widget { 809sub find_widget {
550 my ($self, $x, $y) = @_; 810 my ($self, $x, $y) = @_;
551 811
552 $x -= $self->{x}; 812 $x -= $self->{x};
553 $y -= $self->{y}; 813 $y -= $self->{y};
554 814
555 my $res; 815 my $res;
556 816
557 for (reverse @{ $self->{children} }) { 817 for (reverse $self->visible_children) {
558 $res = $_->find_widget ($x, $y) 818 $res = $_->find_widget ($x, $y)
559 and return $res; 819 and return $res;
560 } 820 }
561 821
562 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 822 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
568 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
569} 829}
570 830
571############################################################################# 831#############################################################################
572 832
573package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
574 834
575our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
576 836
577sub new { 837sub new {
578 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
579 839
580 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
581 841
582 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
583} 843}
584 844
585sub add { 845sub add {
586 my ($self, $child) = @_; 846 my ($self, $child) = @_;
587 847
588 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
589
590 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
591} 850}
592 851
593sub remove { 852sub remove {
594 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
595 854
596 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
597 856
598 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
599 unless @{$self->{children}}; 858 unless @{$self->{children}};
600} 859}
601 860
602sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
603 862
604sub size_request { 863sub size_request {
605 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
606} 865}
607 866
608sub size_allocate { 867sub invoke_size_allocate {
609 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
610 869
611 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
612} 873}
613 874
614############################################################################# 875#############################################################################
615 876
877# back-buffered drawing area
878
616package CFClient::UI::Window; 879package CFPlus::UI::Window;
617 880
618our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
619 882
620use CFClient::OpenGL; 883use CFPlus::OpenGL;
621 884
622sub new { 885sub new {
623 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
624 887
625 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
626} 889}
627 890
628sub update { 891sub update {
629 my ($self) = @_; 892 my ($self) = @_;
630 893
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 895 $self->SUPER::update;
633} 896}
634 897
635sub size_allocate { 898sub invoke_size_allocate {
636 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
637 900
638 $self->SUPER::size_allocate ($w, $h);
639 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
640} 904}
641 905
642sub _render { 906sub _render {
907 my ($self) = @_;
908
643 $_[0]{children}[0]->draw; 909 $self->{children}[0]->draw;
644} 910}
645 911
646sub render_child { 912sub render_child {
647 my ($self) = @_; 913 my ($self) = @_;
648 914
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
652 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
653 $self->_render; 925 $self->_render;
654# glColorMask 1, 1, 1, 0; 926 }
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 }; 927 };
662} 928}
663 929
664sub _draw { 930sub _draw {
665 my ($self) = @_; 931 my ($self) = @_;
666
667 my ($w, $h) = ($self->w, $self->h);
668 932
669 my $tex = $self->{texture} 933 my $tex = $self->{texture}
670 or return; 934 or return;
671 935
672 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
675 939
676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
677 941
678 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
679} 943}
680 944
681############################################################################# 945#############################################################################
682 946
683package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
684 948
685our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
950
951sub new {
952 my $class = shift;
953
954 $class->SUPER::new (
955 scroll_x => 0,
956 scroll_y => 1,
957 @_,
958 )
959}
686 960
687sub size_request { 961sub size_request {
688 my ($self) = @_; 962 my ($self) = @_;
689 963
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 964 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
692 965
693 @$self{qw(child_w child_h)} 966 $w = 10 if $self->{scroll_x};
694} 967 $h = 10 if $self->{scroll_y};
695 968
969 ($w, $h)
970}
971
696sub size_allocate { 972sub invoke_size_allocate {
697 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
698 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);
699 $self->update; 981 $self->update;
982
983 1
700} 984}
701 985
702sub set_offset { 986sub set_offset {
703 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
704 988
… …
730 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
731 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
732 ) { 1016 ) {
733 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
734 } else { 1018 } else {
735 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
736 } 1020 }
737} 1021}
738 1022
739sub _render { 1023sub _render {
740 my ($self) = @_; 1024 my ($self) = @_;
741 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
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743 1030
744 $self->SUPER::_render; 1031 $self->SUPER::_render;
745} 1032}
746 1033
747############################################################################# 1034#############################################################################
748 1035
749package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
750 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
751our @ISA = CFClient::UI::HBox::; 1134our @ISA = CFPlus::UI::Bin::;
1135
1136use CFPlus::OpenGL;
752 1137
753sub new { 1138sub new {
754 my $class = shift; 1139 my $class = shift;
755 1140
756 my $self;
757
758 my $slider = new CFClient::UI::Slider
759 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 },
764 ;
765
766 $self = $class->SUPER::new ( 1141 $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort), 1142 bg => undef,
768 slider => $slider,
769 @_, 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 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
770 ); 1195 );
771 1196
772 $self->{vp}->add ($self->{scrolled});
773 $self->add ($self->{vp});
774 $self->add ($self->{slider});
775
776 $self 1197 $self
777} 1198}
778 1199
779#TODO# update range on size_allocate depeneing on child 1200sub add {
780# update viewport offset on scroll
781
782#############################################################################
783
784package CFClient::UI::Frame;
785
786our @ISA = CFClient::UI::Bin::;
787
788use CFClient::OpenGL;
789
790sub new {
791 my $class = shift;
792
793 my $self = $class->SUPER::new (
794 bg => [1, 1, 1, 1],
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_
798 );
799
800 $self
801}
802
803sub _draw {
804 my ($self) = @_; 1201 my ($self, @widgets) = @_;
805 1202
806 my ($w, $h) = ($self->{w}, $self->{h}); 1203 $self->SUPER::add (@widgets);
807 1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
808 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D;
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812
813# glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0;
816# glVertex 0 , $h;
817# glVertex $w, $h;
818# glVertex $w, 0;
819# glEnd;
820
821
822 $self->child->draw;
823 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D;
825}
826
827#############################################################################
828
829package CFClient::UI::FancyFrame;
830
831our @ISA = CFClient::UI::Bin::;
832
833use CFClient::OpenGL;
834
835my @tex =
836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
837 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
838
839sub new {
840 my $class = shift;
841
842 # TODO: user_x, user_y, overwrite moveto?
843
844 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1],
847 border => 0.6,
848 can_events => 1,
849 @_
850 );
851
852 $self->{title} &&= new CFClient::UI::Label
853 align => 0,
854 valign => 1,
855 text => $self->{title},
856 fontsize => $self->{border};
857
858 $self
859} 1205}
860 1206
861sub border { 1207sub border {
862 int $_[0]{border} * $::FONTSIZE 1208 int $_[0]{border} * $::FONTSIZE
863} 1209}
864 1210
865sub size_request { 1211sub size_request {
866 my ($self) = @_; 1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
867 1216
868 my ($w, $h) = $self->SUPER::size_request; 1217 my ($w, $h) = $self->SUPER::size_request;
869 1218
870 ( 1219 (
871 $w + $self->border * 2, 1220 $w + $self->border * 2,
872 $h + $self->border * 2, 1221 $h + $self->border * 2,
873 ) 1222 )
874} 1223}
875 1224
876sub size_allocate { 1225sub invoke_size_allocate {
877 my ($self, $w, $h) = @_; 1226 my ($self, $w, $h) = @_;
878 1227
879 $h -= List::Util::max 0, $self->border * 2; 1228 my $border = $self->border;
1229
880 $w -= List::Util::max 0, $self->border * 2; 1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
881 1232
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1233 if (my $label = $self->{label}) {
883 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 }
884 1238
885 $self->child->configure ($self->border, $self->border, $w, $h); 1239 $self->child->configure ($border, $border, $w, $h);
886}
887 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
888sub button_down { 1377sub invoke_button_down {
889 my ($self, $ev, $x, $y) = @_; 1378 my ($self, $ev, $x, $y) = @_;
890 1379
891 my ($w, $h) = @$self{qw(w h)}; 1380 my ($w, $h) = @$self{qw(w h)};
892 my $border = $self->border; 1381 my $border = $self->border;
893 1382
… …
906 my ($ev, $x, $y) = @_; 1395 my ($ev, $x, $y) = @_;
907 1396
908 my $dx = $ev->{x} - $ox; 1397 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy; 1398 my $dy = $ev->{y} - $oy;
910 1399
911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1400 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1401 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1402
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1403 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
914 $self->check_size; 1404 $self->realloc;
915 }; 1405 };
916 1406
917 } elsif ($lr ^ $td) { 1407 } elsif ($lr ^ $td) {
918 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1408 my ($ox, $oy) = ($ev->{x}, $ev->{y});
919 my ($bx, $by) = ($self->{x}, $self->{y}); 1409 my ($bx, $by) = ($self->{x}, $self->{y});
… …
921 $self->{motion} = sub { 1411 $self->{motion} = sub {
922 my ($ev, $x, $y) = @_; 1412 my ($ev, $x, $y) = @_;
923 1413
924 ($x, $y) = ($ev->{x}, $ev->{y}); 1414 ($x, $y) = ($ev->{x}, $ev->{y});
925 1415
926 $self->move ($bx + $x - $ox, $by + $y - $oy); 1416 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
927 $self->update; 1417 # HACK: the next line is required to enforce placement
1418 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
928 }; 1419 };
1420 } else {
1421 return 0;
1422 }
1423
929 } 1424 1
930} 1425}
931 1426
932sub button_up { 1427sub invoke_button_up {
933 my ($self, $ev, $x, $y) = @_; 1428 my ($self, $ev, $x, $y) = @_;
934 1429
935 delete $self->{motion}; 1430 ! ! delete $self->{motion}
936} 1431}
937 1432
938sub mouse_motion { 1433sub invoke_mouse_motion {
939 my ($self, $ev, $x, $y) = @_; 1434 my ($self, $ev, $x, $y) = @_;
940 1435
941 $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
942} 1447}
943 1448
944sub _draw { 1449sub _draw {
945 my ($self) = @_; 1450 my ($self) = @_;
946 1451
1452 my $child = $self->{children}[0];
1453
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1454 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1455 my ($cw, $ch) = ($child->{w}, $child->{h});
949 1456
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1457 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1459
955 my $border = $self->border; 1460 my $border = $self->border;
956 1461
957 glColor @{ $self->{border_bg} }; 1462 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1463 $border[0]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1464 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1465 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1466 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1467
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1468 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1469 glColor @{ $self->{bg} };
965 1470
966 # TODO: repeat texture not scale 1471 # TODO: repeat texture not scale
1472 # solve this better(?)
967 my $rep_x = $cw / $bg->{w}; 1473 $bg->{s} = $cw / $bg->{w};
968 my $rep_y = $ch / $bg->{h}; 1474 $bg->{t} = $ch / $bg->{h};
969
970 glColor @{ $self->{bg} };
971
972 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1475 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1476 }
976 1477
977 glDisable GL_TEXTURE_2D; 1478 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1479
981 $self->{title}->draw if $self->{title};
982
983 $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};
984} 1491}
985 1492
986############################################################################# 1493#############################################################################
987 1494
988package CFClient::UI::Table; 1495package CFPlus::UI::Table;
989 1496
990our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
991 1498
992use List::Util qw(max sum); 1499use List::Util qw(max sum);
993 1500
994use CFClient::OpenGL; 1501use CFPlus::OpenGL;
995 1502
996sub new { 1503sub new {
997 my $class = shift; 1504 my $class = shift;
998 1505
999 $class->SUPER::new ( 1506 $class->SUPER::new (
1000 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1001 @_ 1509 @_,
1002 ) 1510 )
1003}
1004
1005sub add {
1006 my ($self, $x, $y, $child) = @_;
1007
1008 $child->set_parent ($self);
1009 $self->{children}[$y][$x] = $child;
1010
1011 $child->check_size;
1012} 1511}
1013 1512
1014sub children { 1513sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016} 1515}
1017 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
1018# 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?
1019sub clear { 1538sub clear {
1020 my ($self) = @_; 1539 my ($self) = @_;
1021 1540
1022 my @children = $self->children; 1541 my @children = $self->children;
1023 delete $self->{children}; 1542 delete $self->{children};
… …
1025 for (@children) { 1544 for (@children) {
1026 delete $_->{parent}; 1545 delete $_->{parent};
1027 $_->hide; 1546 $_->hide;
1028 } 1547 }
1029 1548
1030 $self->update; 1549 $self->realloc;
1031} 1550}
1032 1551
1033sub get_wh { 1552sub get_wh {
1034 my ($self) = @_; 1553 my ($self) = @_;
1035 1554
… …
1061 (sum @$ws), 1580 (sum @$ws),
1062 (sum @$hs), 1581 (sum @$hs),
1063 ) 1582 )
1064} 1583}
1065 1584
1066sub size_allocate { 1585sub invoke_size_allocate {
1067 my ($self, $w, $h) = @_; 1586 my ($self, $w, $h) = @_;
1068 1587
1069 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1070 1589
1071 my $req_w = sum @$ws; 1590 my $req_w = (sum @$ws) || 1;
1072 my $req_h = sum @$hs; 1591 my $req_h = (sum @$hs) || 1;
1073 1592
1074 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1075 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1076 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1077 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1078 1597
1079 # linearly scale sizes
1080 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1081 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1082 1599
1083 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
1084 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1085 1609
1086 my $y; 1610 my $y;
1087 1611
1088 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1089 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1103 } 1627 }
1104 1628
1105 $y += $row_h; 1629 $y += $row_h;
1106 } 1630 }
1107 1631
1632 1
1108} 1633}
1109 1634
1110sub find_widget { 1635sub find_widget {
1111 my ($self, $x, $y) = @_; 1636 my ($self, $x, $y) = @_;
1112 1637
… …
1131 } 1656 }
1132} 1657}
1133 1658
1134############################################################################# 1659#############################################################################
1135 1660
1136package CFClient::UI::HBox; 1661package CFPlus::UI::Box;
1137 1662
1138# TODO: wrap into common Box base class
1139
1140our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1141 1664
1142sub size_request { 1665sub size_request {
1143 my ($self) = @_; 1666 my ($self) = @_;
1144 1667
1145 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}
1146 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 }
1147 ( 1704 }
1148 (List::Util::sum map $_->[0], @alloc), 1705
1149 (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 @_,
1150 ) 1731 )
1151} 1732}
1152 1733
1153sub size_allocate {
1154 my ($self, $w, $h) = @_;
1155
1156 ($h, $w) = ($w, $h);
1157
1158 my $children = $self->{children};
1159
1160 my @h = map $_->{req_w}, @$children;
1161
1162 my $req_h = List::Util::sum @h;
1163
1164 if ($req_h > $h) {
1165 # ah well, not enough space
1166 $_ *= $h / $req_h for @h;
1167 } else {
1168 my $exp = List::Util::sum map $_->{expand}, @$children;
1169 $exp ||= 1;
1170
1171 for (0 .. $#$children) {
1172 my $child = $children->[$_];
1173
1174 my $alloc_h = $h[$_];
1175 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1176 $h[$_] = $alloc_h;
1177 }
1178 }
1179
1180 CFClient::UI::harmonize \@h;
1181
1182 my $y = 0;
1183 for (0 .. $#$children) {
1184 my $child = $children->[$_];
1185 my $h = $h[$_];
1186 $child->configure ($y, 0, $h, $w);
1187
1188 $y += $h;
1189 }
1190
1191 1
1192}
1193
1194############################################################################# 1734#############################################################################
1195 1735
1196package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1197 1737
1198# TODO: wrap into common Box base class 1738our @ISA = CFPlus::UI::Box::;
1199 1739
1200our @ISA = CFClient::UI::Container::; 1740sub new {
1741 my $class = shift;
1201 1742
1202sub size_request { 1743 $class->SUPER::new (
1203 my ($self) = @_; 1744 vertical => 1,
1204 1745 @_,
1205 my @alloc = map [$_->size_request], @{$self->{children}};
1206
1207 (
1208 (List::Util::max map $_->[0], @alloc),
1209 (List::Util::sum map $_->[1], @alloc),
1210 ) 1746 )
1211} 1747}
1212 1748
1213sub size_allocate {
1214 my ($self, $w, $h) = @_;
1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1218 my $children = $self->{children};
1219
1220 my @h = map $_->{req_h}, @$children;
1221
1222 my $req_h = List::Util::sum @h;
1223
1224 if ($req_h > $h) {
1225 # ah well, not enough space
1226 $_ *= $h / $req_h for @h;
1227 } else {
1228 my $exp = List::Util::sum map $_->{expand}, @$children;
1229 $exp ||= 1;
1230
1231 for (0 .. $#$children) {
1232 my $child = $children->[$_];
1233
1234 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1235 }
1236 }
1237
1238 CFClient::UI::harmonize \@h;
1239
1240 my $y = 0;
1241 for (0 .. $#$children) {
1242 my $child = $children->[$_];
1243 my $h = $h[$_];
1244 $child->configure (0, $y, $w, $h);
1245
1246 $y += $h;
1247 }
1248
1249 1
1250}
1251
1252############################################################################# 1749#############################################################################
1253 1750
1254package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1255 1752
1256our @ISA = CFClient::UI::Base::; 1753our @ISA = CFPlus::UI::DrawBG::;
1257 1754
1258use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1259 1756
1260sub new { 1757sub new {
1261 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1262 1759
1263 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1761 fg => [1, 1, 1],
1762 #bg => none
1763 #active_bg => none
1265 #font => default_font 1764 #font => default_font
1266 #text => initial text 1765 #text => initial text
1267 #markup => initial narkup 1766 #markup => initial narkup
1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1769 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1269 fontsize => 1, 1771 fontsize => 1,
1270 align => -1, 1772 align => -1,
1271 valign => -1, 1773 valign => -1,
1272 padding => 2, 1774 padding_x => 2,
1775 padding_y => 2,
1273 can_events => 0, 1776 can_events => 0,
1274 %arg 1777 %arg
1275 ); 1778 );
1276 1779
1277 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1278 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1279 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1280 $self->{template} = $layout; 1783 $self->{template} = $layout;
1281 } 1784 }
1282 1785
1283 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1287 } 1790 }
1288 1791
1289 $self 1792 $self
1290} 1793}
1291 1794
1292sub escape {
1293 local $_ = $_[1];
1294
1295 s/&/&amp;/g;
1296 s/>/&gt;/g;
1297 s/</&lt;/g;
1298
1299 $_[1]
1300}
1301
1302sub update { 1795sub update {
1303 my ($self) = @_; 1796 my ($self) = @_;
1304 1797
1305 delete $self->{texture}; 1798 delete $self->{texture};
1306 $self->SUPER::update; 1799 $self->SUPER::update;
1307} 1800}
1308 1801
1802sub realloc {
1803 my ($self) = @_;
1804
1805 delete $self->{ox};
1806 $self->SUPER::realloc;
1807}
1808
1309sub set_text { 1809sub set_text {
1310 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1311 1811
1312 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1313 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1314 1814
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1316 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1317 1816
1817 delete $self->{size_req};
1818 $self->realloc;
1318 $self->update; 1819 $self->update;
1319 $self->check_size;
1320} 1820}
1321 1821
1322sub set_markup { 1822sub set_markup {
1323 my ($self, $markup) = @_; 1823 my ($self, $markup) = @_;
1324 1824
1325 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1326 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1327 1827
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329 1829
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1331 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1332 1831
1832 delete $self->{size_req};
1833 $self->realloc;
1333 $self->update; 1834 $self->update;
1334 $self->check_size;
1335} 1835}
1336 1836
1337sub size_request { 1837sub size_request {
1338 my ($self) = @_; 1838 my ($self) = @_;
1339 1839
1840 $self->{size_req} ||= do {
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1841 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $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});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1845 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1846
1344 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1345 1848
1346 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1347 $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);
1348 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1853
1350 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1351 1855
1352 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
1353 $h = List::Util::max $h, $h2; 1857 $h = List::Util::max $h, $h2;
1858 }
1859
1860 [$w, $h]
1354 } 1861 };
1355 1862
1356 ( 1863 @{ $self->{size_req} }
1357 $w + $self->{padding} * 2,
1358 $h + $self->{padding} * 2,
1359 )
1360} 1864}
1361 1865
1866sub baseline_shift {
1867 $_[0]{layout}->descent
1868}
1869
1362sub size_allocate { 1870sub invoke_size_allocate {
1363 my ($self, $w, $h) = @_; 1871 my ($self, $w, $h) = @_;
1364 1872
1873 delete $self->{ox};
1874
1365 delete $self->{texture}; 1875 delete $self->{texture}
1876 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1877
1878 1
1366} 1879}
1367 1880
1368sub set_fontsize { 1881sub set_fontsize {
1369 my ($self, $fontsize) = @_; 1882 my ($self, $fontsize) = @_;
1370 1883
1371 $self->{fontsize} = $fontsize; 1884 $self->{fontsize} = $fontsize;
1885 delete $self->{size_req};
1372 delete $self->{texture}; 1886 delete $self->{texture};
1373 1887
1374 $self->update; 1888 $self->realloc;
1375 $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;
1376} 1898}
1377 1899
1378sub _draw { 1900sub _draw {
1379 my ($self) = @_; 1901 my ($self) = @_;
1380 1902
1903 $self->SUPER::_draw; # draw background, if applicable
1904
1381 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1906 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $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});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1912
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1913 [$self->{layout}->size]
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1398 }; 1914 };
1399 1915
1400 glEnable GL_TEXTURE_2D; 1916 unless (exists $self->{ox}) {
1401 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);
1402 1920
1403 if ($tex->{format} == GL_ALPHA) { 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1404 glColor @{$self->{fg}}; 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1923 : ($self->{h} - $size->[1]) * 0.5);
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 } 1924 };
1409 1925
1410 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});
1411} 1930}
1412 1931
1413############################################################################# 1932#############################################################################
1414 1933
1415package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1416 1935
1417our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1418 1937
1419use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1420 1939
1421sub new { 1940sub new {
1422 my $class = shift; 1941 my $class = shift;
1423 1942
1424 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1428 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1429 can_hover => 1, 1948 can_hover => 1,
1430 can_focus => 1, 1949 can_focus => 1,
1431 valign => 0, 1950 valign => 0,
1432 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1953 #text => ...
1954 #hidden => "*",
1433 @_ 1955 @_
1434 ) 1956 )
1435} 1957}
1436 1958
1437sub _set_text { 1959sub _set_text {
… …
1439 1961
1440 delete $self->{cur_h}; 1962 delete $self->{cur_h};
1441 1963
1442 return if $self->{text} eq $text; 1964 return if $self->{text} eq $text;
1443 1965
1444 delete $self->{texture};
1445
1446 $self->{last_activity} = $::NOW; 1966 $self->{last_activity} = $::NOW;
1447 $self->{text} = $text; 1967 $self->{text} = $text;
1448 1968
1449 $text =~ s/./*/g if $self->{hidden}; 1969 $text =~ s/./*/g if $self->{hidden};
1450 $self->{layout}->set_text ("$text "); 1970 $self->{layout}->set_text ("$text ");
1971 delete $self->{size_req};
1451 1972
1452 $self->emit (changed => $self->{text}); 1973 $self->emit (changed => $self->{text});
1974
1975 $self->realloc;
1976 $self->update;
1453} 1977}
1454 1978
1455sub set_text { 1979sub set_text {
1456 my ($self, $text) = @_; 1980 my ($self, $text) = @_;
1457 1981
1458 $self->{cursor} = length $text; 1982 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1983 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462} 1984}
1463 1985
1464sub get_text { 1986sub get_text {
1465 $_[0]{text} 1987 $_[0]{text}
1466} 1988}
… …
1471 my ($w, $h) = $self->SUPER::size_request; 1993 my ($w, $h) = $self->SUPER::size_request;
1472 1994
1473 ($w + 1, $h) # add 1 for cursor 1995 ($w + 1, $h) # add 1 for cursor
1474} 1996}
1475 1997
1476sub size_allocate {
1477 my ($self, $w, $h) = @_;
1478
1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1480}
1481
1482sub key_down { 1998sub invoke_key_down {
1483 my ($self, $ev) = @_; 1999 my ($self, $ev) = @_;
1484 2000
1485 my $mod = $ev->{mod}; 2001 my $mod = $ev->{mod};
1486 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1488 2004
1489 my $text = $self->get_text; 2005 my $text = $self->get_text;
1490 2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2008
1491 if ($sym == 8) { 2009 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 2011 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } 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 = "";
1500 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 2032 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 2033 $self->emit ('escape');
1505 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
2038 } else {
2039 return 0;
1507 } 2040 }
1508 2041
1509 $self->_set_text ($text); 2042 $self->_set_text ($text);
2043
2044 $self->realloc;
1510 $self->update; 2045 $self->update;
1511}
1512 2046
2047 1
2048}
2049
1513sub focus_in { 2050sub invoke_focus_in {
1514 my ($self) = @_; 2051 my ($self) = @_;
1515 2052
1516 $self->{last_activity} = $::NOW; 2053 $self->{last_activity} = $::NOW;
1517 2054
1518 $self->SUPER::focus_in; 2055 $self->SUPER::invoke_focus_in
1519} 2056}
1520 2057
1521sub button_down { 2058sub invoke_button_down {
1522 my ($self, $ev, $x, $y) = @_; 2059 my ($self, $ev, $x, $y) = @_;
1523 2060
1524 $self->SUPER::button_down ($ev, $x, $y); 2061 $self->SUPER::invoke_button_down ($ev, $x, $y);
1525 2062
1526 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1527 2064
1528 # byte-index to char-index 2065 # byte-index to char-index
1529 my $text = $self->{text}; 2066 my $text = $self->{text};
1530 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1531 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1532 2069
1533 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1534 $self->update; 2071 $self->update;
2072
2073 1
1535} 2074}
1536 2075
1537sub mouse_motion { 2076sub invoke_mouse_motion {
1538 my ($self, $ev, $x, $y) = @_; 2077 my ($self, $ev, $x, $y) = @_;
1539# 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
1540} 2081}
1541 2082
1542sub _draw { 2083sub _draw {
1543 my ($self) = @_; 2084 my ($self) = @_;
1544 2085
1545 local $self->{fg} = $self->{fg}; 2086 local $self->{fg} = $self->{fg};
1546 2087
1547 if ($FOCUS == $self) { 2088 if ($FOCUS == $self) {
1548 glColor @{$self->{active_bg}}; 2089 glColor_premultiply @{$self->{active_bg}};
1549 $self->{fg} = $self->{active_fg}; 2090 $self->{fg} = $self->{active_fg};
1550 } else { 2091 } else {
1551 glColor @{$self->{bg}}; 2092 glColor_premultiply @{$self->{bg}};
1552 } 2093 }
1553 2094
1554 glEnable GL_BLEND; 2095 glEnable GL_BLEND;
1555 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2096 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1556 glBegin GL_QUADS; 2097 glBegin GL_QUADS;
1557 glVertex 0 , 0; 2098 glVertex 0 , 0;
1558 glVertex 0 , $self->{h}; 2099 glVertex 0 , $self->{h};
1559 glVertex $self->{w}, $self->{h}; 2100 glVertex $self->{w}, $self->{h};
1560 glVertex $self->{w}, 0; 2101 glVertex $self->{w}, 0;
… …
1571 utf8::encode $text; 2112 utf8::encode $text;
1572 2113
1573 @$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)
1574 } 2115 }
1575 2116
1576 glColor @{$self->{fg}};
1577 glBegin GL_LINES; 2117 glBegin GL_LINES;
1578 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};
1579 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};
1580 glEnd; 2120 glEnd;
1581 } 2121 }
1582} 2122}
1583 2123
2124#############################################################################
2125
1584package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1585 2127
1586our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1587 2129
1588use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1589 2131
1590sub key_down { 2132sub invoke_key_down {
1591 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1592 2134
1593 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1594 2136
1595 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1596 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1597 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
2140
1598 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1600 $self->emit (activate => $txt); 2143 $self->emit (activate => $txt);
1601 $self->update; 2144 $self->update;
1602 2145
1603 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1606 } 2149 }
1607 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1608 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1610 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1611 } 2154 }
1612 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1613 } 2156 }
1614 2157
1615 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1616 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1617 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1618 2161
1619 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1620 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1621 } else { 2164 } else {
1622 $self->set_text ($self->{history_saveback}); 2165 $self->set_text ($self->{history_saveback});
1623 } 2166 }
1624 2167
1625 } else { 2168 } else {
1626 $self->SUPER::key_down ($ev); 2169 return $self->SUPER::invoke_key_down ($ev)
2170 }
2171
1627 } 2172 1
1628
1629} 2173}
1630 2174
1631############################################################################# 2175#############################################################################
1632 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
1633package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1634 2217
1635our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1636 2219
1637use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1638 2221
1639my @tex = 2222my @tex =
1640 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1641 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1642 2225
1643sub new { 2226sub new {
1644 my $class = shift; 2227 my $class = shift;
1645 2228
1646 $class->SUPER::new ( 2229 $class->SUPER::new (
1647 padding => 4, 2230 padding_x => 4,
2231 padding_y => 4,
1648 fg => [1, 1, 1], 2232 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 2233 active_fg => [0, 0, 1],
1651 can_hover => 1, 2234 can_hover => 1,
1652 align => 0, 2235 align => 0,
1653 valign => 0, 2236 valign => 0,
1654 can_events => 1, 2237 can_events => 1,
1655 @_ 2238 @_
1656 ) 2239 )
1657} 2240}
1658 2241
1659sub button_up { 2242sub invoke_button_up {
1660 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1661 2244
2245 $self->emit ("activate")
1662 if ($x >= 0 && $x < $self->{w} 2246 if $x >= 0 && $x < $self->{w}
1663 && $y >= 0 && $y < $self->{h}) { 2247 && $y >= 0 && $y < $self->{h};
1664 $self->emit ("activate"); 2248
1665 } 2249 1
1666} 2250}
1667 2251
1668sub _draw { 2252sub _draw {
1669 my ($self) = @_; 2253 my ($self) = @_;
1670 2254
1671 local $self->{fg} = $self->{fg}; 2255 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1672 2256
1673 if ($GRAB == $self) {
1674 $self->{fg} = $self->{active_fg};
1675 }
1676
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 2257 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2258 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 glColor 0, 0, 0, 1; 2259 glColor 0, 0, 0, 1;
1682 2260
1683 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 2261 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1684 2262
1685 glDisable GL_TEXTURE_2D; 2263 glDisable GL_TEXTURE_2D;
1686 glDisable GL_BLEND;
1687 2264
1688 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
1689} 2266}
1690 2267
1691############################################################################# 2268#############################################################################
1692 2269
1693package CFClient::UI::CheckBox; 2270package CFPlus::UI::CheckBox;
1694 2271
1695our @ISA = CFClient::UI::DrawBG::; 2272our @ISA = CFPlus::UI::DrawBG::;
1696 2273
1697my @tex = 2274my @tex =
1698 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1699 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1700 2277
1701use CFClient::OpenGL; 2278use CFPlus::OpenGL;
1702 2279
1703sub new { 2280sub new {
1704 my $class = shift; 2281 my $class = shift;
1705 2282
1706 $class->SUPER::new ( 2283 $class->SUPER::new (
1707 padding => 2, 2284 padding_x => 2,
2285 padding_y => 2,
1708 fg => [1, 1, 1], 2286 fg => [1, 1, 1],
1709 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],
1710 state => 0, 2290 state => 0,
1711 can_hover => 1, 2291 can_hover => 1,
1712 @_ 2292 @_
1713 ) 2293 )
1714} 2294}
1715 2295
1716sub size_request { 2296sub size_request {
1717 my ($self) = @_; 2297 my ($self) = @_;
1718 2298
1719 ($self->{padding} * 2 + 6) x 2 2299 (6) x 2
1720} 2300}
1721 2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
1722sub button_down { 2310sub invoke_button_down {
1723 my ($self, $ev, $x, $y) = @_; 2311 my ($self, $ev, $x, $y) = @_;
1724 2312
1725 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1726 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1727 $self->{state} = !$self->{state}; 2315 $self->toggle;
1728 $self->emit (changed => $self->{state}); 2316 } else {
2317 return 0
2318 }
2319
1729 } 2320 1
1730} 2321}
1731 2322
1732sub _draw { 2323sub _draw {
1733 my ($self) = @_; 2324 my ($self) = @_;
1734 2325
1735 $self->SUPER::_draw; 2326 $self->SUPER::_draw;
1736 2327
1737 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2328 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1738 2329
1739 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;
1740 2333
1741 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2334 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1742 2335
1743 glEnable GL_BLEND; 2336 my $tex = $self->{state} ? $tex[1] : $tex[0];
2337
1744 glEnable GL_TEXTURE_2D; 2338 glEnable GL_TEXTURE_2D;
1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746
1747 my $tex = $self->{state} ? $tex[1] : $tex[0];
1748
1749 $tex->draw_quad (0, 0, $s, $s); 2339 $tex->draw_quad_alpha (0, 0, $s, $s);
1750
1751 glDisable GL_TEXTURE_2D; 2340 glDisable GL_TEXTURE_2D;
1752 glDisable GL_BLEND;
1753} 2341}
1754 2342
1755############################################################################# 2343#############################################################################
1756 2344
1757package CFClient::UI::Image; 2345package CFPlus::UI::Image;
1758 2346
1759our @ISA = CFClient::UI::Base::; 2347our @ISA = CFPlus::UI::Base::;
1760 2348
1761use CFClient::OpenGL; 2349use CFPlus::OpenGL;
1762use Carp qw/confess/;
1763 2350
1764our %loaded_images; 2351our %texture_cache;
1765 2352
1766sub new { 2353sub new {
1767 my $class = shift; 2354 my $class = shift;
1768 2355
1769 my $self = $class->SUPER::new (can_events => 0, @_); 2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
1770 2360
1771 $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";
1772 2363
1773 $loaded_images{$self->{image}} ||= 2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1774 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;
1775 2366
1776 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2367 CFPlus::weaken $texture_cache{$self->{path}};
1777 2368
1778 Scalar::Util::weaken $loaded_images{$self->{image}}; 2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1779
1780 $self->{aspect} = $tex->{w} / $tex->{h};
1781 2370
1782 $self 2371 $self
1783} 2372}
1784 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
1785sub size_request { 2389sub size_request {
1786 my ($self) = @_; 2390 my ($self) = @_;
1787 2391
1788 ($self->{tex}->{w}, $self->{tex}->{h}) 2392 ($self->{tex}{w}, $self->{tex}{h})
1789} 2393}
1790 2394
1791sub _draw { 2395sub _draw {
1792 my ($self) = @_; 2396 my ($self) = @_;
1793 2397
… …
1800 glTranslate 0, -$self->{w}, 0; 2404 glTranslate 0, -$self->{w}, 0;
1801 2405
1802 ($w, $h) = ($h, $w); 2406 ($w, $h) = ($h, $w);
1803 } 2407 }
1804 2408
1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809 2411
1810 $tex->draw_quad (0, 0, $w, $h); 2412 $tex->draw_quad (0, 0, $w, $h);
1811 2413
1812 glDisable GL_BLEND;
1813 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
1814} 2415}
1815 2416
1816############################################################################# 2417#############################################################################
1817 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
1818package CFClient::UI::VGauge; 2455package CFPlus::UI::VGauge;
1819 2456
1820our @ISA = CFClient::UI::Base::; 2457our @ISA = CFPlus::UI::Base::;
1821 2458
1822use List::Util qw(min max); 2459use List::Util qw(min max);
1823 2460
1824use CFClient::OpenGL; 2461use CFPlus::OpenGL;
1825 2462
1826my %tex = ( 2463my %tex = (
1827 food => [ 2464 food => [
1828 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1829 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1830 ], 2467 ],
1831 grace => [ 2468 grace => [
1832 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1833 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/
1834 ], 2471 ],
1835 hp => [ 2472 hp => [
1836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1837 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1838 ], 2475 ],
1839 mana => [ 2476 mana => [
1840 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1841 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/
1842 ], 2479 ],
1843); 2480);
1844 2481
1845# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1905 my $ycut1 = max 0, min 1, $ycut; 2542 my $ycut1 = max 0, min 1, $ycut;
1906 my $ycut2 = max 0, min 1, $ycut - 1; 2543 my $ycut2 = max 0, min 1, $ycut - 1;
1907 2544
1908 my $h1 = $self->{h} * (1 - $ycut1); 2545 my $h1 = $self->{h} * (1 - $ycut1);
1909 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);
1910 2550
1911 glEnable GL_BLEND; 2551 glEnable GL_BLEND;
1912 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;
1913 glEnable GL_TEXTURE_2D; 2554 glEnable GL_TEXTURE_2D;
1914 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1915 2556
1916 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2557 glBindTexture GL_TEXTURE_2D, $t1->{name};
1917 glBegin GL_QUADS; 2558 glBegin GL_QUADS;
… …
1932 2573
1933 if ($t3) { 2574 if ($t3) {
1934 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2575 glBindTexture GL_TEXTURE_2D, $t3->{name};
1935 glBegin GL_QUADS; 2576 glBegin GL_QUADS;
1936 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2577 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1937 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2578 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1938 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2579 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1939 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2580 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1940 glEnd; 2581 glEnd;
1941 } 2582 }
1942 2583
1943 glDisable GL_BLEND; 2584 glDisable GL_BLEND;
1944 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
1945} 2586}
1946 2587
1947############################################################################# 2588#############################################################################
1948 2589
1949package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
1950 2591
1951our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
1952 2593
1953sub new { 2594sub new {
1954 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
1955 2596
1956 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
1958 can_hover => 1, 2599 can_hover => 1,
1959 can_events => 1, 2600 can_events => 1,
1960 %arg, 2601 %arg,
1961 ); 2602 );
1962 2603
1963 $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");
1964 $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);
1965 $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");
1966 2607
1967 $self 2608 $self
1968} 2609}
1969 2610
1970sub set_fontsize { 2611sub set_fontsize {
… …
1991 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
1992} 2633}
1993 2634
1994############################################################################# 2635#############################################################################
1995 2636
1996package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
1997 2638
1998use strict; 2639use strict;
1999 2640
2000use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2001 2642
2002our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2003 2644
2004my @tex = 2645my @tex =
2005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2006 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2007 2648
2008sub new { 2649sub new {
2009 my $class = shift; 2650 my $class = shift;
2010 2651
2011 # range [value, low, high, page] 2652 # range [value, low, high, page, unit]
2012 2653
2013 # TODO: 0-width page 2654 # TODO: 0-width page
2014 # TODO: req_w/h are wrong with vertical 2655 # TODO: req_w/h are wrong with vertical
2015 # TODO: calculations are off 2656 # TODO: calculations are off
2016 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2017 fg => [1, 1, 1], 2658 fg => [1, 1, 1],
2018 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],
2019 range => [0, 0, 100, 10], 2662 range => [0, 0, 100, 10, 0],
2020 req_w => $::WIDTH / 80, 2663 min_w => $::WIDTH / 80,
2021 req_h => $::WIDTH / 80, 2664 min_h => $::WIDTH / 80,
2022 vertical => 0, 2665 vertical => 0,
2023 can_hover => 1, 2666 can_hover => 1,
2024 inner_pad => 5, 2667 inner_pad => 0.02,
2025 @_ 2668 @_
2026 ); 2669 );
2027 2670
2671 $self->set_value ($self->{range}[0]);
2672 $self->update;
2673
2028 $self 2674 $self
2029} 2675}
2030 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
2031sub size_request { 2711sub size_request {
2032 my ($self) = @_; 2712 my ($self) = @_;
2033 2713
2034 my $w = $self->{req_w}; 2714 ($self->{req_w}, $self->{req_h})
2035 my $h = $self->{req_h};
2036
2037 $self->{vertical} ? ($h, $w) : ($w, $h)
2038} 2715}
2039 2716
2040sub button_down { 2717sub invoke_button_down {
2041 my ($self, $ev, $x, $y) = @_; 2718 my ($self, $ev, $x, $y) = @_;
2042 2719
2043 $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
2044 $self->mouse_motion ($ev, $x, $y); 2724 $self->invoke_mouse_motion ($ev, $x, $y)
2045} 2725}
2046 2726
2047sub mouse_motion { 2727sub invoke_mouse_motion {
2048 my ($self, $ev, $x, $y) = @_; 2728 my ($self, $ev, $x, $y) = @_;
2049 2729
2050 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
2051 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2770 my ($value, $lo, $hi, $page) = @{$self->{range}};
2771 my $range = ($hi - $page - $lo) || 1e-100;
2052 2772
2053 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2773 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2054 2774
2055 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2775 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2056 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2776 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2057 2777
2058 $x -= $inner_pad_px; # substract the padding 2778 $value = ($value - $lo) / $range;
2059 $x = $x * ($hi - $lo) / $inner_w + $lo; 2779 $value = $value * $self->{scale} + $self->{offset};
2060 $x = $lo if $x < $lo;
2061 $x = $hi - $page if $x > $hi - $page;
2062 $self->{range}[0] = $x;
2063 2780
2064 $self->emit (changed => $x); 2781 $self->{knob_x} = $value - $knob_w * 0.5;
2065 $self->update; 2782 $self->{knob_w} = $knob_w;
2066 } 2783 }
2067}
2068
2069# the inner_* stuff is for generating a padding for the slider handle,
2070# so that the handle doesn't leave the texture. This calculation isn't 100%
2071# correct propably, but it does the job for now
2072sub _calc_inner_pad_px {
2073 my ($self, $w) = @_;
2074 ($w / 100) * $self->{inner_pad} # % to pixels
2075}
2076
2077sub _draw {
2078 my ($self) = @_;
2079 2784
2080 $self->SUPER::_draw (); 2785 $self->SUPER::_draw ();
2081 2786
2082 my ($w, $h) = @$self{qw(w h)}; 2787 glScale $self->{w}, $self->{h};
2083 2788
2084 if ($self->{vertical}) { 2789 if ($self->{vertical}) {
2085 # draw a vertical slider like a rotated horizontal slider 2790 # draw a vertical slider like a rotated horizontal slider
2086 2791
2792 glTranslate 1, 0, 0;
2087 glRotate 90, 0, 0, 1; 2793 glRotate 90, 0, 0, 1;
2088 glTranslate 0, -$self->{w}, 0;
2089
2090 ($w, $h) = ($h, $w);
2091 } 2794 }
2092 2795
2093 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2796 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2094 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2797 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2095 2798
2096 my ($value, $lo, $hi, $page) = @{$self->{range}};
2097
2098 $hi = $value + 1 if $lo == $hi;
2099
2100 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2101 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2102
2103 $page = int $page * $inner_w / ($hi - $lo);
2104 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2105
2106 $w -= $page;
2107 $page &= ~1;
2108 glTranslate $page * 0.5, 0, 0;
2109 $page ||= 2;
2110
2111 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2112 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2113
2114 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2799 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2801
2119 # draw background 2802 # draw background
2120 $tex[1]->draw_quad (0, 0, $w, $h); 2803 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2121 2804
2122 # draw handle 2805 # draw handle
2123 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2806 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2124 2807
2125 glDisable GL_BLEND;
2126 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2127} 2809}
2128 2810
2129############################################################################# 2811#############################################################################
2130 2812
2131package CFClient::UI::TextView; 2813package CFPlus::UI::ValSlider;
2132 2814
2133our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2134 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
2135use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2136 2859
2137sub new { 2860sub new {
2138 my $class = shift; 2861 my $class = shift;
2139 2862
2140 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2141 fontsize => 1, 2864 fontsize => 1,
2142 can_events => 0, 2865 can_events => 1,
2866 indent => 0,
2143 #font => default_font 2867 #font => default_font
2144 @_, 2868 @_,
2145 2869
2146 layout => (new CFClient::Layout), 2870 layout => (new CFPlus::Layout),
2147 par => [], 2871 par => [],
2872 max_par => 0,
2148 height => 0, 2873 height => 0,
2149 children => [ 2874 children => [
2150 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2151 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2152 ], 2877 ],
2153 ); 2878 );
2154 2879
2155 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2156 2881
… …
2162 2887
2163 $self->{fontsize} = $fontsize; 2888 $self->{fontsize} = $fontsize;
2164 $self->reflow; 2889 $self->reflow;
2165} 2890}
2166 2891
2167sub 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 {
2168 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) = @_;
2169 2930
2170 my $layout = $self->{layout}; 2931 my $layout = $self->{layout};
2171 2932
2933 $layout->set_font ($self->{font}) if $self->{font};
2934 $layout->set_foreground (@{$para->{fg}});
2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2935 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $layout->set_width ($self->{children}[0]{w}); 2936 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2174 $layout->set_text ($text); 2937 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
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}}
2175 2944 );
2176 ($layout->size)[1] 2945
2946 $layout
2177} 2947}
2178 2948
2179sub reflow { 2949sub reflow {
2180 my ($self) = @_; 2950 my ($self) = @_;
2181 2951
2182 $self->{need_reflow}++; 2952 $self->{need_reflow}++;
2183 $self->update; 2953 $self->update;
2184} 2954}
2185 2955
2186sub 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 {
2187 my ($self, $w, $h) = @_; 2970 my ($self, $para) = @_;
2188 2971
2189 $self->SUPER::size_allocate ($w, $h); 2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2190 2973
2191 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2974 $self->{scroll_to} = $para;
2192 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2975 $self->update;
2193 $self->{layout}->set_width ($self->{children}[0]{w}); 2976}
2194 2977
2195 $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]);
2196} 2987}
2197 2988
2198sub add_paragraph { 2989sub add_paragraph {
2199 my ($self, $color, $text) = @_; 2990 my $self = shift;
2200 2991
2201 #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 };
2202 3002
2203 my $height = $self->text_height ($text); 3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3004 push @{$self->{par}}, $para;
3005 }
2204 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
2205 $self->{height} += $height; 3044 $self->{height} = $height;
3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2206 3046
2207 push @{$self->{par}}, [$height, $color, $text]; 3047 delete $self->{texture};
3048 }
2208 3049
2209 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3050 if (my $paridx = delete $self->{scroll_to}) {
2210 $self->{children}[1]->update; 3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
2211} 3053}
2212 3054
2213sub update { 3055sub update {
2214 my ($self) = @_; 3056 my ($self) = @_;
2215 3057
… …
2217 3059
2218 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2219 3061
2220 delete $self->{texture}; 3062 delete $self->{texture};
2221 3063
2222 $ROOT->on_refresh ($self, sub { 3064 $ROOT->on_post_alloc ($self => sub {
2223 if (delete $self->{need_reflow}) { 3065 $self->force_uptodate;
2224 my $height = 0;
2225 3066
2226 $height += $_->[0] = $self->text_height ($_->[2]) 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2227 for @{$self->{par}};
2228 3068
2229 $self->{height} = $height; 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2230
2231 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2232
2233 delete $self->{texture};
2234 }
2235
2236 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2237 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2238 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2239 3072
2240 glEnable GL_BLEND; 3073 package CFPlus::UI::Base;
2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2242 glEnable GL_TEXTURE_2D; 3075 (0, 0, $self->{w}, $self->{h});
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244 3076
2245 my $top = int $self->{children}[1]{range}[0]; 3077 my $top = int $self->{children}[1]{range}[0];
2246 3078
3079 my $paridx = 0;
3080 my $top_paragraph;
3081 my $top = int $self->{children}[1]{range}[0];
3082
2247 my $y0 = $top; 3083 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 3084 my $y1 = $top + $H;
2249 3085
2250 my $y = 0;
2251
2252 my $layout = $self->{layout};
2253
2254 $layout->set_font ($self->{font}) if $self->{font};
2255
2256 for my $par (@{$self->{par}}) { 3086 for my $para (@{$self->{par}}) {
2257 my $h = $par->[0]; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2258 3089
2259 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_text ($par->[2]); 3091 my $layout = $self->get_layout ($para);
2261 3092
2262 glColor @{ $par->[1] }; 3093 $layout->render ($para->{indent}, $y - $y0);
2263 my ($W, $H) = $layout->size; 3094
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 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 }
2265 } 3107 }
2266 3108
2267 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2268 } 3111 }
2269 3112
2270 glDisable GL_TEXTURE_2D; 3113 $self->{top_paragraph} = $top_paragraph;
2271 glDisable GL_BLEND;
2272 }; 3114 };
2273 }); 3115 });
2274} 3116}
2275 3117
3118sub reconfigure {
3119 my ($self) = @_;
3120
3121 $self->SUPER::reconfigure;
3122
3123 $_->{w} = 1e10 for @{ $self->{par} };
3124 $self->reflow;
3125}
3126
2276sub _draw { 3127sub _draw {
2277 my ($self) = @_; 3128 my ($self) = @_;
2278 3129
2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2281 glEnable GL_TEXTURE_2D; 3130 glEnable GL_TEXTURE_2D;
2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283 glColor 1, 1, 1, 1; 3132 glColor 0, 0, 0, 1;
2284 $self->{texture}->draw_quad (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});
2285 glDisable GL_TEXTURE_2D; 3134 glDisable GL_TEXTURE_2D;
2286 glDisable GL_BLEND;
2287 3135
2288 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2289
2290} 3137}
2291 3138
2292############################################################################# 3139#############################################################################
2293 3140
2294package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2295 3142
2296use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2297 3144
2298our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2299 3146
2300sub moveto { 3147sub moveto {
2301 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2302 3149
2303 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2331 glPopMatrix; 3178 glPopMatrix;
2332} 3179}
2333 3180
2334############################################################################# 3181#############################################################################
2335 3182
2336package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2337 3184
2338our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2339 3186
2340sub new { 3187sub new {
2341 my $class = shift; 3188 my $class = shift;
2342 3189
2343 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
2344 state => 0, 3191 state => 0,
2345 connect_activate => \&toggle_flopper, 3192 on_activate => \&toggle_flopper,
2346 @_ 3193 @_
2347 ); 3194 );
2348 3195
2349 if ($self->{state}) {
2350 $self->{state} = 0;
2351 $self->toggle_flopper;
2352 }
2353
2354 $self 3196 $self
2355} 3197}
2356 3198
2357sub toggle_flopper { 3199sub toggle_flopper {
2358 my ($self) = @_; 3200 my ($self) = @_;
2359 3201
2360 # TODO: use animation 3202 $self->{other}->toggle_visibility;
2361 if ($self->{state} = !$self->{state}) {
2362 $CFClient::UI::ROOT->add ($self->{other});
2363 $self->{other}->move ($self->coord2global (0, $self->{h}));
2364 $self->emit ("open");
2365 } else {
2366 $CFClient::UI::ROOT->remove ($self->{other});
2367 $self->emit ("close");
2368 }
2369
2370 $self->emit (changed => $self->{state});
2371} 3203}
2372 3204
2373############################################################################# 3205#############################################################################
2374 3206
2375package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2376 3208
2377our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2378 3210
2379use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2380 3212
2381sub new { 3213sub new {
2382 my $class = shift; 3214 my $class = shift;
2383 3215
2384 $class->SUPER::new ( 3216 $class->SUPER::new (
2385 @_, 3217 @_,
2386 can_events => 0, 3218 can_events => 0,
2387 ) 3219 )
2388} 3220}
2389 3221
2390sub set_markup { 3222sub set_tooltip_from {
2391 my ($self, $text) = @_; 3223 my ($self, $widget) = @_;
2392 3224
2393 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2394 $self->{label}->set_markup ($text); 3226 if $widget->{tooltip} =~ /^#(.*)$/;
2395 $self->add ($self->{label}); 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
3240 $self->add (new CFPlus::UI::Label
3241 markup => $tooltip,
3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3243 fontsize => 0.8,
3244 style => 1, # FLAG_INVERSE
3245 ellipsise => 0,
3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
3247 );
2396} 3248}
2397 3249
2398sub size_request { 3250sub size_request {
2399 my ($self) = @_; 3251 my ($self) = @_;
2400 3252
2401 $self->child->set_max_size ($::WIDTH * 0.3);
2402
2403 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3253 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404 3254
2405 ($w + 4, $h + 4) 3255 ($w + 4, $h + 4)
2406} 3256}
2407 3257
2408sub size_allocate { 3258sub invoke_size_allocate {
2409 my ($self, $w, $h) = @_; 3259 my ($self, $w, $h) = @_;
2410 3260
2411 $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 });
2412} 3284}
2413 3285
2414sub _draw { 3286sub _draw {
2415 my ($self) = @_; 3287 my ($self) = @_;
2416 3288
2417 glPushMatrix;
2418 glTranslate 0.375, 0.375; 3289 glTranslate 0.375, 0.375;
2419 3290
2420 my ($w, $h) = @$self{qw(w h)}; 3291 my ($w, $h) = @$self{qw(w h)};
2421 3292
2422 glColor 1, 0.8, 0.4; 3293 glColor 1, 0.8, 0.4;
… …
2433 glVertex 0 , $h; 3304 glVertex 0 , $h;
2434 glVertex $w, $h; 3305 glVertex $w, $h;
2435 glVertex $w, 0; 3306 glVertex $w, 0;
2436 glEnd; 3307 glEnd;
2437 3308
2438 glPopMatrix; 3309 glTranslate 2 - 0.375, 2 - 0.375;
2439 3310
2440 glTranslate 2, 2;
2441 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2442} 3312}
2443 3313
2444############################################################################# 3314#############################################################################
2445 3315
2446package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2447 3317
2448our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2449 3319
2450use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2451 3321
2452sub new { 3322sub new {
2453 my $class = shift; 3323 my $class = shift;
2454 3324
2455 $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
2456 aspect => 1, 3326 aspect => 1,
3327 can_events => 0,
2457 @_, 3328 @_,
2458 ) 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
2459} 3347}
2460 3348
2461sub size_request { 3349sub size_request {
2462 (32, 8) 3350 (32, 8)
2463} 3351}
2464 3352
3353sub update {
3354 my ($self) = @_;
3355
3356 return unless $self->{visible};
3357
3358 $self->SUPER::update;
3359}
3360
2465sub _draw { 3361sub _draw {
2466 my ($self) = @_; 3362 my ($self) = @_;
2467 3363
2468 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
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
2470 3381
2471 # TODO animation
2472 if ($tex) { 3382 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 3385 glColor 0, 0, 0, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND; 3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
2481 } 3392 }
3393}
3394
3395sub destroy {
3396 my ($self) = @_;
3397
3398 $self->{timer}->cancel
3399 if $self->{timer};
3400
3401 $self->SUPER::destroy;
2482} 3402}
2483 3403
2484############################################################################# 3404#############################################################################
2485 3405
2486package CFClient::UI::InventoryItem; 3406package CFPlus::UI::Buttonbar;
2487 3407
2488our @ISA = CFClient::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
2489 3409
2490sub new { 3410# TODO: should actually wrap buttons and other goodies.
2491 my $class = shift;
2492
2493 my %args = @_;
2494
2495 my $item = delete $args{item};
2496
2497 my $desc = $item->{nrof} < 2
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501
2502 my $self = $class->SUPER::new (
2503 can_hover => 1,
2504 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_;
2509
2510 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) {
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519 [
2520 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521 sub { $::CONN->send ("lock $item->{tag}") },
2522 ],
2523 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526 ],
2527 )->popup ($ev);
2528 }
2529
2530 1
2531 },
2532 %args
2533 );
2534
2535 $self->add (new CFClient::UI::Face
2536 can_events => 0,
2537 face => $item->{face},
2538 anim => $item->{anim},
2539 animspeed => $item->{animspeed},
2540 );
2541
2542 $self->add (new CFClient::UI::Label
2543 can_events => 0,
2544 text => $desc,
2545 );
2546
2547 $self
2548}
2549 3411
2550############################################################################# 3412#############################################################################
2551 3413
2552package CFClient::UI::Inventory;
2553
2554our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556sub new {
2557 my $class = shift;
2558
2559 my $self = $class->SUPER::new (
2560 scrolled => (new CFClient::UI::VBox),
2561 @_,
2562 );
2563
2564 $self
2565}
2566
2567sub set_items {
2568 my ($self, $items) = @_;
2569
2570 $self->{scrolled}->clear;
2571 return unless $items;
2572
2573 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2574
2575 $self->{real_items} = \@items;
2576
2577 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2583 }
2584
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586}
2587
2588sub size_request {
2589 my ($self) = @_;
2590 ($self->{req_w}, $self->{req_h});
2591}
2592
2593#############################################################################
2594
2595package CFClient::UI::Menu; 3414package CFPlus::UI::Menu;
2596 3415
2597our @ISA = CFClient::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
2598 3417
2599use CFClient::OpenGL; 3418use CFPlus::OpenGL;
2600 3419
2601sub new { 3420sub new {
2602 my $class = shift; 3421 my $class = shift;
2603 3422
2604 my $self = $class->SUPER::new ( 3423 my $self = $class->SUPER::new (
2605 items => [], 3424 items => [],
2606 z => 100, 3425 z => 100,
2607 @_, 3426 @_,
2608 ); 3427 );
2609 3428
2610 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2611 3430
2612 for my $item (@{ $self->{items} }) { 3431 for my $item (@{ $self->{items} }) {
2613 my ($widget, $cb) = @$item; 3432 my ($widget, $cb, $tooltip) = @$item;
2614 3433
2615 # handle various types of items, only text for now 3434 # handle various types of items, only text for now
2616 if (!ref $widget) { 3435 if (!ref $widget) {
3436 if ($widget =~ /\t/) {
3437 my ($left, $right) = split /\t/, $widget, 2;
3438
2617 $widget = new CFClient::UI::Label 3439 $widget = new CFPlus::UI::HBox
2618 can_hover => 1, 3440 can_hover => 1,
2619 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,
2620 text => $widget; 3453 markup => $widget,
3454 tooltip => $tooltip;
3455 }
2621 } 3456 }
2622 3457
2623 $self->{item}{$widget} = $item; 3458 $self->{item}{$widget} = $item;
2624 3459
2625 $self->{vbox}->add ($widget); 3460 $self->{vbox}->add ($widget);
… …
2637 # maybe save $GRAB? must be careful about events... 3472 # maybe save $GRAB? must be careful about events...
2638 $GRAB = $self; 3473 $GRAB = $self;
2639 $self->{button} = $ev->{button}; 3474 $self->{button} = $ev->{button};
2640 3475
2641 $self->show; 3476 $self->show;
2642 $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);
2643} 3478}
2644 3479
2645sub mouse_motion { 3480sub invoke_mouse_motion {
2646 my ($self, $ev, $x, $y) = @_; 3481 my ($self, $ev, $x, $y) = @_;
2647 3482
2648 # TODO: should use vbox->find_widget or so 3483 # TODO: should use vbox->find_widget or so
2649 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3484 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2650 $self->{hover} = $self->{item}{$HOVER}; 3485 $self->{hover} = $self->{item}{$HOVER};
2651}
2652 3486
3487 0
3488}
3489
2653sub button_up { 3490sub invoke_button_up {
2654 my ($self, $ev, $x, $y) = @_; 3491 my ($self, $ev, $x, $y) = @_;
2655 3492
2656 if ($ev->{button} == $self->{button}) { 3493 if ($ev->{button} == $self->{button}) {
2657 undef $GRAB; 3494 undef $GRAB;
2658 $self->hide; 3495 $self->hide;
2659 3496
2660 $self->emit ("popdown"); 3497 $self->emit ("popdown");
2661 $self->{hover}[1]->() if $self->{hover}; 3498 $self->{hover}[1]->() if $self->{hover};
3499 } else {
3500 return 0
3501 }
3502
2662 } 3503 1
2663} 3504}
2664 3505
2665############################################################################# 3506#############################################################################
2666 3507
2667package CFClient::UI::Statusbox; 3508package CFPlus::UI::Multiplexer;
2668 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
2669our @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}
2670 3704
2671sub reorder { 3705sub reorder {
2672 my ($self) = @_; 3706 my ($self) = @_;
2673 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} };
2674 3713
2675 while (my ($k, $v) = each %{ $self->{item} }) { 3714 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3715 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 } 3716 }
2678 3717
2679 my @widgets; 3718 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 3719
3720 my @items = sort {
3721 $a->{pri} <=> $b->{pri}
3722 or $b->{id} <=> $a->{id}
3723 } values %{ $self->{item} };
3724
3725 $self->{timer}->interval (1);
3726
2681 my $count = 10 + 1; 3727 my $count = 10 + 1;
2682 for my $item (@items) { 3728 for my $item (@items) {
2683 last unless --$count; 3729 last unless --$count;
2684 3730
2685 push @widgets, $item->{label} ||= do { 3731 my $label = $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all) 3732 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text}; 3733 my $short = $item->{count} > 1
3734 ? "<b>$item->{count} ×</b> $item->{text}"
3735 : $item->{text};
3736
2688 for ($short) { 3737 for ($short) {
2689 s/^\s+//; 3738 s/^\s+//;
2690 s/\012.*//s; 3739 s/\s+/ /g;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 } 3740 }
2694 3741
2695 new CFClient::UI::Label 3742 new CFPlus::UI::Label
2696 markup => $short, 3743 markup => $short,
2697 tooltip => delete $item->{tooltip}, 3744 tooltip => $item->{tooltip},
2698 fontsize => delete $item->{fontsize}, 3745 tooltip_font => $::FONT_PROP,
2699 color => delete $item->{color}, 3746 tooltip_width => 0.67,
3747 fontsize => $item->{fontsize} || $self->{fontsize},
3748 max_w => $::WIDTH * 0.44,
3749 fg => [@{ $item->{fg} }],
2700 can_events => 1, 3750 can_events => 1,
2701 can_hover => 1, 3751 can_hover => 1
2702 }; 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;
2703 } 3765 }
2704 3766
2705 $self->clear; 3767 $self->clear;
2706 $self->SUPER::add (@widgets); 3768 $self->SUPER::add (reverse @widgets);
2707} 3769}
2708 3770
2709sub add { 3771sub add {
2710 my ($self, $text, %arg) = @_; 3772 my ($self, $text, %arg) = @_;
2711 3773
2712 my $item = { 3774 $text =~ s/^\s+//;
2713 time => time, 3775 $text =~ s/\s+$//;
3776
3777 return unless $text;
3778
3779 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3780
3781 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3782
3783 if (my $item = $self->{item}{$group}) {
3784 if ($item->{text} eq $text) {
3785 $item->{count}++;
3786 } else {
3787 $item->{count} = 1;
3788 $item->{text} = $item->{tooltip} = $text;
3789 }
3790 $item->{id} += 0.2;#d#
3791 $item->{timeout} = $timeout;
3792 delete $item->{label};
3793 } else {
3794 $self->{item}{$group} = {
3795 id => ++$self->{id},
2714 text => $text, 3796 text => $text,
2715 timeout => 60, 3797 timeout => $timeout,
2716 tooltip => $text, 3798 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8], 3799 fg => [0.8, 0.8, 0.8, 0.8],
3800 pri => 0,
3801 count => 1,
2719 %arg, 3802 %arg,
3803 };
3804 }
3805
3806 $ROOT->on_refresh (reorder => sub {
3807 $self->reorder;
2720 }; 3808 });
3809}
2721 3810
2722 $item->{timeout} += time; 3811sub reconfigure {
2723 $item->{group} ||= $item+0; 3812 my ($self) = @_;
2724 3813
2725 $item = $self->{item}{$item->{group}} ||= $item; 3814 delete $_->{label}
3815 for values %{ $self->{item} || {} };
2726 3816
2727 $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;
2728} 3827}
2729 3828
2730############################################################################# 3829#############################################################################
2731 3830
2732package CFClient::UI::Root; 3831package CFPlus::UI::Root;
2733 3832
2734our @ISA = CFClient::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
2735 3834
3835use List::Util qw(min max);
3836
2736use CFClient::OpenGL; 3837use CFPlus::OpenGL;
2737 3838
2738sub new { 3839sub new {
2739 my $class = shift; 3840 my $class = shift;
2740 3841
2741 $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3843 visible => 1,
2742 @_, 3844 @_,
2743 ) 3845 );
2744}
2745 3846
2746sub configure { 3847 CFPlus::weaken ($self->{root} = $self);
2747 my ($self, $x, $y, $w, $h) = @_;
2748 3848
2749 $self->{w} = $w; 3849 $self
2750 $self->{h} = $h;
2751}
2752
2753sub check_size {
2754 my ($self) = @_;
2755
2756 $self->size_allocate ($self->{w}, $self->{h})
2757 if $self->{w};
2758} 3850}
2759 3851
2760sub size_request { 3852sub size_request {
2761 my ($self) = @_; 3853 my ($self) = @_;
2762 3854
2763 ($self->{w}, $self->{h}) 3855 ($self->{w}, $self->{h})
2764} 3856}
2765 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
2766sub size_allocate { 3872sub invoke_size_allocate {
2767 my ($self, $w, $h) = @_; 3873 my ($self, $w, $h) = @_;
2768
2769 my $old_w = $self->{old_w};
2770 my $old_h = $self->{old_h};
2771
2772 if ($old_w && $old_h) {
2773 for my $child ($self->children) {
2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782 }
2783 }
2784 3874
2785 for my $child ($self->children) { 3875 for my $child ($self->children) {
2786 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)};
2787 3877
2788 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3878 $X = $child->{force_x} if exists $child->{force_x};
2789 $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
2790 $child->configure ($X, $Y, $W, $H); 3884 $child->configure ($X, $Y, $W, $H);
2791 } 3885 }
2792 3886
2793 $self->{old_w} = $w; 3887 1
2794 $self->{old_h} = $h;
2795} 3888}
2796 3889
2797sub coord2local { 3890sub coord2local {
2798 my ($self, $x, $y) = @_; 3891 my ($self, $x, $y) = @_;
2799 3892
… …
2807} 3900}
2808 3901
2809sub update { 3902sub update {
2810 my ($self) = @_; 3903 my ($self) = @_;
2811 3904
2812 $self->check_size;
2813 $::WANT_REFRESH++; 3905 $::WANT_REFRESH++;
2814} 3906}
2815 3907
2816sub add { 3908sub add {
2817 my ($self, $child) = @_; 3909 my ($self, @children) = @_;
2818 3910
2819 # integerise window positions 3911 $_->{is_toplevel} = 1
2820 $child->{x} = int $child->{x}; 3912 for @children;
2821 $child->{y} = int $child->{y};
2822 3913
2823 $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 }
2824} 3930}
2825 3931
2826sub on_refresh { 3932sub on_refresh {
2827 my ($self, $id, $cb) = @_; 3933 my ($self, $id, $cb) = @_;
2828 3934
2829 $self->{refresh_hook}{$id} = $cb; 3935 $self->{refresh_hook}{$id} = $cb;
2830} 3936}
2831 3937
3938sub on_post_alloc {
3939 my ($self, $id, $cb) = @_;
3940
3941 $self->{post_alloc_hook}{$id} = $cb;
3942}
3943
2832sub draw { 3944sub draw {
2833 my ($self) = @_; 3945 my ($self) = @_;
2834
2835 if ($self->{check_size}) {
2836 my @queue = ([], []);
2837
2838 for (;;) {
2839 if ($self->{check_size}) {
2840 # heuristic: check containers last
2841 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2842 for values %{delete $self->{check_size}}
2843 }
2844
2845 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2846
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request;
2850
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853
2854 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h;
2856
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2858
2859 $widget->{parent}->check_size
2860 if $widget->{parent};
2861 }
2862 }
2863 }
2864
2865 while ($self->{size_alloc}) {
2866 for (values %{delete $self->{size_alloc}}) {
2867 my ($widget, $w, $h) = @$_;
2868
2869 $w = 0 if $w < 0;
2870 $h = 0 if $h < 0;
2871
2872 $widget->{w} = $w;
2873 $widget->{h} = $h;
2874 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h);
2876 }
2877 }
2878 3946
2879 while ($self->{refresh_hook}) { 3947 while ($self->{refresh_hook}) {
2880 $_->() 3948 $_->()
2881 for values %{delete $self->{refresh_hook}}; 3949 for values %{delete $self->{refresh_hook}};
2882 } 3950 }
2883 3951
3952 if ($self->{realloc}) {
3953 my %queue;
3954 my @queue;
3955 my $widget;
3956
3957 outer:
3958 while () {
3959 if (my $realloc = delete $self->{realloc}) {
3960 for $widget (values %$realloc) {
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 }
3967 }
3968
3969 while () {
3970 @queue or last outer;
3971
3972 $widget = pop @{ $queue[-1] || [] }
3973 and last;
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}) {
3993 $widget->{req_w} = $w;
3994 $widget->{req_h} = $h;
3995
3996 $self->{size_alloc}{$widget+0} = $widget;
3997
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 }
4005 }
4006
4007 delete $self->{realloc}{$widget+0};
4008 }
4009 }
4010
4011 while (my $size_alloc = delete $self->{size_alloc}) {
4012 my @queue = sort { $b->{visible} <=> $a->{visible} }
4013 values %$size_alloc;
4014
4015 while () {
4016 my $widget = pop @queue || last;
4017
4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4019
4020 $w = 0 if $w < 0;
4021 $h = 0 if $h < 0;
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
4039 $widget->{w} = $w;
4040 $widget->{h} = $h;
4041
4042 $widget->emit (size_allocate => $w, $h);
4043 }
4044 }
4045 }
4046
4047 while ($self->{post_alloc_hook}) {
4048 $_->()
4049 for values %{delete $self->{post_alloc_hook}};
4050 }
4051
4052
2884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4053 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4054 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2886 glClear GL_COLOR_BUFFER_BIT; 4055 glClear GL_COLOR_BUFFER_BIT;
2887 4056
2888 glMatrixMode GL_PROJECTION; 4057 glMatrixMode GL_PROJECTION;
2889 glLoadIdentity; 4058 glLoadIdentity;
2890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2891 glMatrixMode GL_MODELVIEW; 4060 glMatrixMode GL_MODELVIEW;
2892 glLoadIdentity; 4061 glLoadIdentity;
2893 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
2894 $self->_draw; 4069 $self->_draw;
4070 }
2895} 4071}
2896 4072
2897############################################################################# 4073#############################################################################
2898 4074
2899package CFClient::UI; 4075package CFPlus::UI;
2900 4076
2901$ROOT = new CFClient::UI::Root; 4077$ROOT = new CFPlus::UI::Root;
2902$TOOLTIP = new CFClient::UI::Tooltip; 4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2903 4079
29041 40801
2905 4081

Diff Legend

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