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

Diff Legend

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