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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.396 by root, Sat Jul 21 14:00:02 2007 UTC

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

Diff Legend

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