ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC

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

Diff Legend

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