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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

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

Diff Legend

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