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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC

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

Diff Legend

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