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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

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

Diff Legend

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