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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.408 by root, Sun Jul 22 15:26:01 2007 UTC

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

Diff Legend

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