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

Diff Legend

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