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

Diff Legend

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