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

Diff Legend

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