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.237 by root, Thu May 25 21:36:45 2006 UTC vs.
Revision 1.319 by root, Sun Jul 2 21:07:26 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
94 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
95 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
96 $grab->update if $grab; 116 $grab->update if $grab;
97 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
98 118
99 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
100 } 120 }
101} 121}
102 122
103sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
104 my ($ev) = @_; 124 my ($ev) = @_;
… …
110 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
111 131
112 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
113 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
114 134
115 check_tooltip; 135 $TOOLTIP_WATCHER->start;
116 } 136 }
117 137
118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER; 139 if $HOVER;
120} 140}
… …
152sub rescale_widgets { 172sub rescale_widgets {
153 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
154 174
155 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
165 } 190 }
166 } 191 }
167 192
168 reconfigure_widgets; 193 reconfigure_widgets;
169} 194}
… …
178 203
179sub new { 204sub new {
180 my $class = shift; 205 my $class = shift;
181 206
182 my $self = bless { 207 my $self = bless {
183 x => 0, 208 x => "center",
184 y => 0, 209 y => "center",
185 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
186 can_events => 1, 213 can_events => 1,
187 @_ 214 @_
188 }, $class; 215 }, $class;
189 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
190 for (keys %$self) { 219 for (keys %$self) {
191 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
193 } 222 }
194 } 223 }
195 224
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
197 236
198 $self 237 $self
199} 238}
200 239
201sub destroy { 240sub destroy {
… …
205 %$self = (); 244 %$self = ();
206} 245}
207 246
208sub show { 247sub show {
209 my ($self) = @_; 248 my ($self) = @_;
249
210 return if $self->{parent}; 250 return if $self->{parent};
211 251
212 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
213} 253}
214 254
215sub show_centered { 255sub set_visible {
216 my ($self) = @_; 256 my ($self) = @_;
257
217 return if $self->{parent}; 258 return if $self->{visible};
218 259
219 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
220 262
221 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 264
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
224 }, 266
225 ); 267 $_->set_visible for $self->children;
226} 268}
227 269
228sub set_invisible { 270sub set_invisible {
229 my ($self) = @_; 271 my ($self) = @_;
230 272
231 # broken show/hide model 273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
232 276
233 delete $self->{visible}; 277 delete $self->{visible};
278 delete $self->{root};
234 279
235 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
237 282
238 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
240 285
241 $self->focus_out; 286 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
275} 338}
276 339
340sub baseline_shift {
341 0
342}
343
277sub configure { 344sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
279 346
280 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
283 352
284 # use alignment to adjust x, y 353 # use alignment to adjust x, y
285 354
286 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 357 }
291 358
292 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 360 $self->{x} = $x;
294 $self->{y} = $y; 361 $self->{y} = $y;
295 $self->update; 362 $self->update;
296 } 363 }
297 364
298 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
300 }
301}
302 367
303sub size_allocate { 368 $self->{alloc_w} = $w;
304 # nothing to be done 369 $self->{alloc_h} = $h;
305}
306 370
307sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
308 my ($self) = @_; 372 }
309
310 $self->check_size (1);
311 $self->update;
312} 373}
313 374
314sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
315} 381}
316 382
317sub set_max_size { 383sub set_max_size {
318 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
319 385
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
322} 390}
323 391
324sub set_tooltip { 392sub set_tooltip {
325 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
326 394
… …
331 399
332 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
333 401
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
337 } 405 }
338} 406}
339 407
340# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
341sub coord2local { 409sub coord2local {
… …
349 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
350 418
351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
352} 420}
353 421
354sub focus_in { 422sub invoke_focus_in {
355 my ($self) = @_; 423 my ($self) = @_;
356 424
357 return if $FOCUS == $self; 425 return if $FOCUS == $self;
358 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
359 427
360 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
361 429
362 $self->_emit (focus_in => $focus); 430 $self->update;
363 431
364 $focus->update if $focus; 432 0
365 $FOCUS->update;
366} 433}
367 434
368sub focus_out { 435sub invoke_focus_out {
369 my ($self) = @_; 436 my ($self) = @_;
370 437
371 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
372 439
373 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
374 441
375 $self->_emit (focus_out => $focus); 442 $self->update;
376 443
377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 445 unless $FOCUS;
381}
382 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
383sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
384sub button_up { } 458sub invoke_button_up { 1 }
385sub key_down { } 459sub invoke_key_down { 1 }
386sub key_up { } 460sub invoke_key_up { 1 }
387 461
388sub button_down { 462sub invoke_button_down {
389 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
390 464
391 $self->focus_in; 465 $self->grab_focus;
392}
393 466
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
484
485sub find_widget {
486 my ($self, $x, $y) = @_;
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496
497sub set_parent {
498 my ($self, $parent) = @_;
499
500 Scalar::Util::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible};
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 535
400sub draw { 536sub draw {
401 my ($self) = @_; 537 my ($self) = @_;
402 538
403 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 548
405 glPushMatrix; 549 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 551
410 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 554 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 556 glBegin GL_QUADS;
417 glVertex $x , $y; 557 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
421 glEnd; 561 glEnd;
422 glDisable GL_BLEND; 562 glDisable GL_BLEND;
423 } 563 }
424 564
425 if ($ENV{PCLIENT_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 566 glPushMatrix;
427 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 570 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
434 glEnd; 574 glEnd;
435 glPopMatrix; 575 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
438} 581}
439 582
440sub _draw { 583sub _draw {
441 my ($self) = @_; 584 my ($self) = @_;
442 585
443 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
444} 587}
445 588
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504}
505
506sub DESTROY { 589sub DESTROY {
507 my ($self) = @_; 590 my ($self) = @_;
508 591
509 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
510 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
511} 596}
512 597
513############################################################################# 598#############################################################################
514 599
515package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
540 625
541 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
542 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
543 628
544 glEnable GL_BLEND; 629 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glColor @$color; 631 glColor_premultiply @$color;
547 632
548 glBegin GL_QUADS; 633 glBegin GL_QUADS;
549 glVertex 0 , 0; 634 glVertex 0 , 0;
550 glVertex 0 , $h; 635 glVertex 0 , $h;
551 glVertex $w, $h; 636 glVertex $w, $h;
… …
566 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
568} 653}
569 654
570sub size_request { 655sub size_request {
571 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
572} 659}
573 660
574sub draw { } 661sub draw { }
575 662
576############################################################################# 663#############################################################################
… …
580our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
581 668
582sub new { 669sub new {
583 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
584 671
585 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
586 673
587 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
588 children => [], 675 children => [],
589 can_events => 0, 676 can_events => 0,
590 %arg, 677 %arg,
591 ); 678 );
679
592 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
593 682
594 $self 683 $self
595} 684}
596 685
597sub add { 686sub add {
… …
605 $self->{children} = [ 694 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
608 ]; 697 ];
609 698
610 $self->check_size (1); 699 $self->realloc;
611 $self->update;
612} 700}
613 701
614sub children { 702sub children {
615 @{ $_[0]{children} } 703 @{ $_[0]{children} }
616} 704}
… …
621 delete $child->{parent}; 709 delete $child->{parent};
622 $child->hide; 710 $child->hide;
623 711
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 713
626 $self->check_size (1); 714 $self->realloc;
627 $self->update;
628} 715}
629 716
630sub clear { 717sub clear {
631 my ($self) = @_; 718 my ($self) = @_;
632 719
… …
636 for (@$children) { 723 for (@$children) {
637 delete $_->{parent}; 724 delete $_->{parent};
638 $_->hide; 725 $_->hide;
639 } 726 }
640 727
641 $self->check_size; 728 $self->realloc;
642 $self->update;
643} 729}
644 730
645sub find_widget { 731sub find_widget {
646 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
647 733
648 $x -= $self->{x}; 734 $x -= $self->{x};
649 $y -= $self->{y}; 735 $y -= $self->{y};
650 736
651 my $res; 737 my $res;
652 738
653 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
654 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
655 and return $res; 741 and return $res;
656 } 742 }
657 743
658 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
679} 765}
680 766
681sub add { 767sub add {
682 my ($self, $child) = @_; 768 my ($self, $child) = @_;
683 769
684 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
685
686 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
687} 772}
688 773
689sub remove { 774sub remove {
690 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
699 784
700sub size_request { 785sub size_request {
701 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
702} 787}
703 788
704sub size_allocate { 789sub invoke_size_allocate {
705 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
706 791
707 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
708} 795}
709 796
710############################################################################# 797#############################################################################
798
799# back-buffered drawing area
711 800
712package CFClient::UI::Window; 801package CFClient::UI::Window;
713 802
714our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
715 804
… …
726 815
727 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
728 $self->SUPER::update; 817 $self->SUPER::update;
729} 818}
730 819
731sub size_allocate { 820sub invoke_size_allocate {
732 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
733 822
734 $self->SUPER::size_allocate ($w, $h);
735 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
736} 826}
737 827
738sub _render { 828sub _render {
829 my ($self) = @_;
830
739 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
740} 832}
741 833
742sub render_child { 834sub render_child {
743 my ($self) = @_; 835 my ($self) = @_;
744 836
745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
748 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
749 $self->_render; 848 $self->_render;
750 }; 849 };
751} 850}
752 851
753sub _draw { 852sub _draw {
754 my ($self) = @_; 853 my ($self) = @_;
755 854
756 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
757 856
758 my $tex = $self->{texture} 857 my $tex = $self->{texture}
759 or return; 858 or return;
760 859
761 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
763 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
764 863
765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
766 865
767 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
768} 867}
… …
784} 883}
785 884
786sub size_request { 885sub size_request {
787 my ($self) = @_; 886 my ($self) = @_;
788 887
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 889
791 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
792} 891 $h = 10 if $self->{scroll_y};
793 892
893 ($w, $h)
894}
895
794sub size_allocate { 896sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
796 898
899 my $child = $self->child;
900
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 903
800 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
801 $self->update; 905 $self->update;
906
907 1
802} 908}
803 909
804sub set_offset { 910sub set_offset {
805 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
806 912
… …
839} 945}
840 946
841sub _render { 947sub _render {
842 my ($self) = @_; 948 my ($self) = @_;
843 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845 954
846 $self->SUPER::_render; 955 $self->SUPER::_render;
847} 956}
848 957
… …
851package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
852 961
853our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
854 963
855sub new { 964sub new {
856 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
857 968
858 my $self; 969 my $self;
859 970
860 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
861 vertical => 1, 972 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 974 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
865 }, 976 },
866 ; 977 ;
867 978
868 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
869 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
870 slider => $slider, 981 slider => $slider,
871 @_, 982 %arg,
872 ); 983 );
873 984
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
877 987
878 $self 988 $self
879} 989}
880 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
1005sub update {
1006 my ($self) = @_;
1007
1008 $self->SUPER::update;
1009
1010 $self->update_slider;
1011}
1012
881sub size_allocate { 1013sub invoke_size_allocate {
882 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
883 1015
1016 $self->update_slider;
1017
884 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
885
886 my $child = $self->{vp}->child;
887 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
888} 1019}
889
890#TODO# update range on size_allocate depending on child
891# update viewport offset on scroll
892 1020
893############################################################################# 1021#############################################################################
894 1022
895package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
896 1024
… …
912 1040
913 if ($self->{bg}) { 1041 if ($self->{bg}) {
914 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
915 1043
916 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
917 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
918 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
919 1047
920 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
921 glVertex 0 , 0; 1049 glVertex 0 , 0;
922 glVertex 0 , $h; 1050 glVertex 0 , $h;
923 glVertex $w, $h; 1051 glVertex $w, $h;
… …
936 1064
937our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
938 1066
939use CFClient::OpenGL; 1067use CFClient::OpenGL;
940 1068
941my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
944 1076
945sub new { 1077sub new {
946 my $class = shift; 1078 my ($class, %arg) = @_;
947
948 # TODO: user_x, user_y, overwrite moveto?
949 1079
950 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
951 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
952 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
953 border => 0.6, 1083 border => 0.6,
954 is_toplevel => 1,
955 can_events => 1, 1084 can_events => 1,
956 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
957 ); 1088 );
958 1089
959 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
960 align => 0, 1091 align => 0,
961 valign => 1, 1092 valign => 1,
962 text => $self->{title}, 1093 text => $self->{title},
963 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
964 1105
965 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
966} 1115}
967 1116
968sub border { 1117sub border {
969 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
970} 1119}
971 1120
972sub size_request { 1121sub size_request {
973 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
974 1129
975 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
976 1131
977 ( 1132 (
978 $w + $self->border * 2, 1133 $w + $self->border * 2,
979 $h + $self->border * 2, 1134 $h + $self->border * 2,
980 ) 1135 )
981} 1136}
982 1137
983sub size_allocate { 1138sub invoke_size_allocate {
984 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
985 1140
1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1146
1147 my $border = $self->border;
1148
986 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
987 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
988 1151
989 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
990 if $self->{title};
991
992 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
993}
994 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
995sub button_down { 1168sub invoke_button_down {
996 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
997 1170
998 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
999 my $border = $self->border; 1172 my $border = $self->border;
1000 1173
… …
1013 my ($ev, $x, $y) = @_; 1186 my ($ev, $x, $y) = @_;
1014 1187
1015 my $dx = $ev->{x} - $ox; 1188 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1017 1190
1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1193
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1021 $self->check_size; 1195 $self->realloc;
1022 }; 1196 };
1023 1197
1024 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1025 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1028 $self->{motion} = sub { 1202 $self->{motion} = sub {
1029 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1030 1204
1031 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1032 1206
1033 $self->move ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1034 $self->update; 1208 # HACK: the next line is required to enforce placement
1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1035 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
1036 } 1215 1
1037} 1216}
1038 1217
1039sub button_up { 1218sub invoke_button_up {
1040 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1041 1220
1042 delete $self->{motion}; 1221 ! ! delete $self->{motion}
1043} 1222}
1044 1223
1045sub mouse_motion { 1224sub invoke_mouse_motion {
1046 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1047 1226
1048 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
1049} 1230}
1050 1231
1051sub _draw { 1232sub _draw {
1052 my ($self) = @_; 1233 my ($self) = @_;
1053 1234
1235 my $child = $self->{children}[0];
1236
1054 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
1055 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
1056 1239
1057 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1059 1242
1060 my $border = $self->border; 1243 my $border = $self->border;
1061 1244
1062 glColor @{ $self->{border_bg} }; 1245 glColor @{ $self->{border_bg} };
1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1246 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1247 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1248 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1249 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1067 1250
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1251 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1069 my $bg = $tex[0]; 1252 glColor @{ $self->{bg} };
1070 1253
1071 # TODO: repeat texture not scale 1254 # TODO: repeat texture not scale
1255 # solve this better(?)
1072 my $rep_x = $cw / $bg->{w}; 1256 $bg->{s} = $cw / $bg->{w};
1073 my $rep_y = $ch / $bg->{h}; 1257 $bg->{t} = $ch / $bg->{h};
1074
1075 glColor @{ $self->{bg} };
1076
1077 $bg->{s} = $rep_x;
1078 $bg->{t} = $rep_y;
1079 $bg->{wrap_mode} = 1;
1080 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 } 1259 }
1082 1260
1083 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1084 1262
1085 $self->{title}->draw if $self->{title};
1086
1087 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1088} 1274}
1089 1275
1090############################################################################# 1276#############################################################################
1091 1277
1092package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1114 my ($self, $x, $y, $child) = @_; 1300 my ($self, $x, $y, $child) = @_;
1115 1301
1116 $child->set_parent ($self); 1302 $child->set_parent ($self);
1117 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1118 1304
1119 $self->check_size (1); 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1120} 1312}
1121 1313
1122# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1123sub clear { 1315sub clear {
1124 my ($self) = @_; 1316 my ($self) = @_;
… …
1129 for (@children) { 1321 for (@children) {
1130 delete $_->{parent}; 1322 delete $_->{parent};
1131 $_->hide; 1323 $_->hide;
1132 } 1324 }
1133 1325
1134 $self->check_size (1); 1326 $self->realloc;
1135 $self->update;
1136} 1327}
1137 1328
1138sub get_wh { 1329sub get_wh {
1139 my ($self) = @_; 1330 my ($self) = @_;
1140 1331
… …
1166 (sum @$ws), 1357 (sum @$ws),
1167 (sum @$hs), 1358 (sum @$hs),
1168 ) 1359 )
1169} 1360}
1170 1361
1171sub size_allocate { 1362sub invoke_size_allocate {
1172 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1173 1364
1174 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1175 1366
1176 my $req_w = sum @$ws; 1367 my $req_w = (sum @$ws) || 1;
1177 my $req_h = sum @$hs; 1368 my $req_h = (sum @$hs) || 1;
1178 1369
1179 # TODO: nicer code && do row_expand 1370 # TODO: nicer code && do row_expand
1180 my @col_expand = @{$self->{col_expand}}; 1371 my @col_expand = @{$self->{col_expand}};
1181 @col_expand = (1) x @$ws unless @col_expand; 1372 @col_expand = (1) x @$ws unless @col_expand;
1182 my $col_expand = (sum @col_expand) || 1; 1373 my $col_expand = (sum @col_expand) || 1;
… …
1208 } 1399 }
1209 1400
1210 $y += $row_h; 1401 $y += $row_h;
1211 } 1402 }
1212 1403
1404 1
1213} 1405}
1214 1406
1215sub find_widget { 1407sub find_widget {
1216 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1217 1409
… …
1236 } 1428 }
1237} 1429}
1238 1430
1239############################################################################# 1431#############################################################################
1240 1432
1433package CFClient::UI::Box;
1434
1435our @ISA = CFClient::UI::Container::;
1436
1437sub size_request {
1438 my ($self) = @_;
1439
1440 $self->{vertical}
1441 ? (
1442 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1443 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1444 )
1445 : (
1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1448 )
1449}
1450
1451sub invoke_size_allocate {
1452 my ($self, $w, $h) = @_;
1453
1454 my $space = $self->{vertical} ? $h : $w;
1455 my @children = $self->visible_children;
1456
1457 my @req;
1458
1459 if ($self->{homogeneous}) {
1460 @req = ($space / (@children || 1)) x @children;
1461 } else {
1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1463 my $req = List::Util::sum @req;
1464
1465 if ($req > $space) {
1466 # ah well, not enough space
1467 $_ *= $space / $req for @req;
1468 } else {
1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1470
1471 $space = ($space - $req) / $expand; # remaining space to give away
1472
1473 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children;
1475 }
1476 }
1477
1478 CFClient::UI::harmonize \@req;
1479
1480 my $pos = 0;
1481 for (0 .. $#children) {
1482 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1484
1485 $pos += $alloc;
1486 }
1487
1488 1
1489}
1490
1491#############################################################################
1492
1241package CFClient::UI::HBox; 1493package CFClient::UI::HBox;
1242 1494
1243# TODO: wrap into common Box base class
1244
1245our @ISA = CFClient::UI::Container::; 1495our @ISA = CFClient::UI::Box::;
1246 1496
1247sub size_request { 1497sub new {
1248 my ($self) = @_; 1498 my $class = shift;
1249 1499
1250 my @alloc = map [$_->size_request], @{$self->{children}}; 1500 $class->SUPER::new (
1251 1501 vertical => 0,
1252 ( 1502 @_,
1253 (List::Util::sum map $_->[0], @alloc),
1254 (List::Util::max map $_->[1], @alloc),
1255 ) 1503 )
1256} 1504}
1257 1505
1258sub size_allocate {
1259 my ($self, $w, $h) = @_;
1260
1261 ($h, $w) = ($w, $h);
1262
1263 my $children = $self->{children};
1264
1265 my @h = map $_->{req_w}, @$children;
1266
1267 my $req_h = List::Util::sum @h;
1268
1269 if ($req_h > $h) {
1270 # ah well, not enough space
1271 $_ *= $h / $req_h for @h;
1272 } else {
1273 my $exp = List::Util::sum map $_->{expand}, @$children;
1274 $exp ||= 1;
1275
1276 for (0 .. $#$children) {
1277 my $child = $children->[$_];
1278
1279 my $alloc_h = $h[$_];
1280 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281 $h[$_] = $alloc_h;
1282 }
1283 }
1284
1285 CFClient::UI::harmonize \@h;
1286
1287 my $y = 0;
1288 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290 my $h = $h[$_];
1291 $child->configure ($y, 0, $h, $w);
1292
1293 $y += $h;
1294 }
1295
1296 1
1297}
1298
1299############################################################################# 1506#############################################################################
1300 1507
1301package CFClient::UI::VBox; 1508package CFClient::UI::VBox;
1302 1509
1303# TODO: wrap into common Box base class
1304
1305our @ISA = CFClient::UI::Container::; 1510our @ISA = CFClient::UI::Box::;
1306 1511
1307sub size_request { 1512sub new {
1308 my ($self) = @_; 1513 my $class = shift;
1309 1514
1310 my @alloc = map [$_->size_request], @{$self->{children}}; 1515 $class->SUPER::new (
1311 1516 vertical => 1,
1312 ( 1517 @_,
1313 (List::Util::max map $_->[0], @alloc),
1314 (List::Util::sum map $_->[1], @alloc),
1315 ) 1518 )
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323 my $children = $self->{children};
1324
1325 my @h = map $_->{req_h}, @$children;
1326
1327 my $req_h = List::Util::sum @h;
1328
1329 if ($req_h > $h) {
1330 # ah well, not enough space
1331 $_ *= $h / $req_h for @h;
1332 } else {
1333 my $exp = List::Util::sum map $_->{expand}, @$children;
1334 $exp ||= 1;
1335
1336 for (0 .. $#$children) {
1337 my $child = $children->[$_];
1338
1339 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340 }
1341 }
1342
1343 CFClient::UI::harmonize \@h;
1344
1345 my $y = 0;
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348 my $h = $h[$_];
1349 $child->configure (0, $y, $w, $h);
1350
1351 $y += $h;
1352 }
1353
1354 1
1355} 1519}
1356 1520
1357############################################################################# 1521#############################################################################
1358 1522
1359package CFClient::UI::Label; 1523package CFClient::UI::Label;
… …
1376 ellipsise => 3, # end 1540 ellipsise => 3, # end
1377 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout),
1378 fontsize => 1, 1542 fontsize => 1,
1379 align => -1, 1543 align => -1,
1380 valign => -1, 1544 valign => -1,
1381 padding => 2, 1545 padding_x => 2,
1546 padding_y => 2,
1382 can_events => 0, 1547 can_events => 0,
1383 %arg 1548 %arg
1384 ); 1549 );
1385 1550
1386 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
… …
1413 1578
1414 delete $self->{texture}; 1579 delete $self->{texture};
1415 $self->SUPER::update; 1580 $self->SUPER::update;
1416} 1581}
1417 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1418sub set_text { 1590sub set_text {
1419 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1420 1592
1421 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1422 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1423 1595
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1426 1598
1599 delete $self->{size_req};
1600 $self->realloc;
1427 $self->update; 1601 $self->update;
1428 $self->check_size;
1429} 1602}
1430 1603
1431sub set_markup { 1604sub set_markup {
1432 my ($self, $markup) = @_; 1605 my ($self, $markup) = @_;
1433 1606
… …
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1610 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438 1611
1439 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1440 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1441 1614
1615 delete $self->{size_req};
1616 $self->realloc;
1442 $self->update; 1617 $self->update;
1443 $self->check_size;
1444} 1618}
1445 1619
1446sub size_request { 1620sub size_request {
1447 my ($self) = @_; 1621 my ($self) = @_;
1448 1622
1623 $self->{size_req} ||= do {
1449 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1450 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1451 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1452 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1453 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1454 1629
1455 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1456 1631
1457 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1458 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1459 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1460 1635
1461 my ($w2, $h2) = $self->{template}->size; 1636 my ($w2, $h2) = $self->{template}->size;
1462 1637
1463 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1464 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1640 }
1641
1642 [$w, $h]
1465 } 1643 };
1466 1644
1467 ( 1645 @{ $self->{size_req} }
1468 $w + $self->{padding} * 2,
1469 $h + $self->{padding} * 2,
1470 )
1471} 1646}
1472 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1473sub size_allocate { 1652sub invoke_size_allocate {
1474 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1475 1654
1655 delete $self->{ox};
1656
1476 delete $self->{texture}; 1657 delete $self->{texture}
1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1477} 1661}
1478 1662
1479sub set_fontsize { 1663sub set_fontsize {
1480 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1481 1665
1482 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1483 delete $self->{texture}; 1668 delete $self->{texture};
1484 1669
1485 $self->update; 1670 $self->realloc;
1486 $self->check_size; 1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1487} 1679}
1488 1680
1489sub _draw { 1681sub _draw {
1490 my ($self) = @_; 1682 my ($self) = @_;
1491 1683
… …
1497 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1498 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1499 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501 1693
1502 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1694 new_from_layout CFClient::Texture $self->{layout}
1695 };
1503 1696
1697 unless (exists $self->{ox}) {
1504 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1505 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1506 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $tex->{w}) * 0.5);
1507 1701
1508 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1509 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1510 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1511
1512 $tex
1513 }; 1705 };
1514 1706
1515 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1516 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1517 1711
1518 if ($tex->{format} == GL_ALPHA) { 1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1519 glColor @{$self->{fg}}; 1714 glColor @{$self->{fg}};
1520 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1521 } else { 1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1522 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1523 } 1719 }
1524 1720
1525 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1526} 1722}
1527 1723
… …
1544 can_hover => 1, 1740 can_hover => 1,
1545 can_focus => 1, 1741 can_focus => 1,
1546 valign => 0, 1742 valign => 0,
1547 can_events => 1, 1743 can_events => 1,
1548 #text => ... 1744 #text => ...
1745 #hidden => "*",
1549 @_ 1746 @_
1550 ) 1747 )
1551} 1748}
1552 1749
1553sub _set_text { 1750sub _set_text {
… …
1555 1752
1556 delete $self->{cur_h}; 1753 delete $self->{cur_h};
1557 1754
1558 return if $self->{text} eq $text; 1755 return if $self->{text} eq $text;
1559 1756
1560 delete $self->{texture};
1561
1562 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1563 $self->{text} = $text; 1758 $self->{text} = $text;
1564 1759
1565 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1566 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1762 delete $self->{size_req};
1567 1763
1568 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1765
1766 $self->realloc;
1767 $self->update;
1569} 1768}
1570 1769
1571sub set_text { 1770sub set_text {
1572 my ($self, $text) = @_; 1771 my ($self, $text) = @_;
1573 1772
1574 $self->{cursor} = length $text; 1773 $self->{cursor} = length $text;
1575 $self->_set_text ($text); 1774 $self->_set_text ($text);
1576 $self->update;
1577 $self->check_size;
1578} 1775}
1579 1776
1580sub get_text { 1777sub get_text {
1581 $_[0]{text} 1778 $_[0]{text}
1582} 1779}
… …
1587 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1588 1785
1589 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1590} 1787}
1591 1788
1592sub key_down { 1789sub invoke_key_down {
1593 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1594 1791
1595 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1596 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1597 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
… …
1609 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1610 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1611 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1612 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1613 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1614 $self->_emit ('escape'); 1811 $self->emit ('escape');
1615 } elsif ($uni) { 1812 } elsif ($uni) {
1616 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else {
1815 return 0;
1617 } 1816 }
1618 1817
1619 $self->_set_text ($text); 1818 $self->_set_text ($text);
1620 $self->update;
1621 $self->check_size;
1622}
1623 1819
1820 $self->realloc;
1821
1822 1
1823}
1824
1624sub focus_in { 1825sub invoke_focus_in {
1625 my ($self) = @_; 1826 my ($self) = @_;
1626 1827
1627 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1628 1829
1629 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1630} 1831}
1631 1832
1632sub button_down { 1833sub invoke_button_down {
1633 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1634 1835
1635 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1636 1837
1637 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1638 1839
1639 # byte-index to char-index 1840 # byte-index to char-index
1640 my $text = $self->{text}; 1841 my $text = $self->{text};
1641 utf8::encode $text; 1842 utf8::encode $text;
1642 $self->{cursor} = length substr $text, 0, $idx; 1843 $self->{cursor} = length substr $text, 0, $idx;
1643 1844
1644 $self->_set_text ($self->{text}); 1845 $self->_set_text ($self->{text});
1645 $self->update; 1846 $self->update;
1847
1848 1
1646} 1849}
1647 1850
1648sub mouse_motion { 1851sub invoke_mouse_motion {
1649 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1650# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1854
1855 1
1651} 1856}
1652 1857
1653sub _draw { 1858sub _draw {
1654 my ($self) = @_; 1859 my ($self) = @_;
1655 1860
1656 local $self->{fg} = $self->{fg}; 1861 local $self->{fg} = $self->{fg};
1657 1862
1658 if ($FOCUS == $self) { 1863 if ($FOCUS == $self) {
1659 glColor @{$self->{active_bg}}; 1864 glColor_premultiply @{$self->{active_bg}};
1660 $self->{fg} = $self->{active_fg}; 1865 $self->{fg} = $self->{active_fg};
1661 } else { 1866 } else {
1662 glColor @{$self->{bg}}; 1867 glColor_premultiply @{$self->{bg}};
1663 } 1868 }
1664 1869
1665 glEnable GL_BLEND; 1870 glEnable GL_BLEND;
1666 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1871 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1667 glBegin GL_QUADS; 1872 glBegin GL_QUADS;
1668 glVertex 0 , 0; 1873 glVertex 0 , 0;
1669 glVertex 0 , $self->{h}; 1874 glVertex 0 , $self->{h};
1670 glVertex $self->{w}, $self->{h}; 1875 glVertex $self->{w}, $self->{h};
1671 glVertex $self->{w}, 0; 1876 glVertex $self->{w}, 0;
… …
1696 1901
1697our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1698 1903
1699use CFClient::OpenGL; 1904use CFClient::OpenGL;
1700 1905
1701sub key_down { 1906sub invoke_key_down {
1702 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1703 1908
1704 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1705 1910
1706 if ($sym == 13) { 1911 if ($sym == 13) {
1707 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1708 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1709 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1710 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1711 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1712 $self->update; 1918 $self->update;
1713 1919
1714 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1715 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1716 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
… …
1732 } else { 1938 } else {
1733 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1734 } 1940 }
1735 1941
1736 } else { 1942 } else {
1737 $self->SUPER::key_down ($ev); 1943 return $self->SUPER::invoke_key_down ($ev)
1944 }
1945
1738 } 1946 1
1739
1740} 1947}
1741 1948
1742############################################################################# 1949#############################################################################
1743 1950
1744package CFClient::UI::Button; 1951package CFClient::UI::Button;
… …
1753 1960
1754sub new { 1961sub new {
1755 my $class = shift; 1962 my $class = shift;
1756 1963
1757 $class->SUPER::new ( 1964 $class->SUPER::new (
1758 padding => 4, 1965 padding_x => 4,
1966 padding_y => 4,
1759 fg => [1, 1, 1], 1967 fg => [1, 1, 1],
1760 active_fg => [0, 0, 1], 1968 active_fg => [0, 0, 1],
1761 can_hover => 1, 1969 can_hover => 1,
1762 align => 0, 1970 align => 0,
1763 valign => 0, 1971 valign => 0,
1764 can_events => 1, 1972 can_events => 1,
1765 @_ 1973 @_
1766 ) 1974 )
1767} 1975}
1768 1976
1769sub activate { }
1770
1771sub button_up { 1977sub invoke_button_up {
1772 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1773 1979
1774 $self->emit ("activate") 1980 $self->emit ("activate")
1775 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1776 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
1983
1984 1
1777} 1985}
1778 1986
1779sub _draw { 1987sub _draw {
1780 my ($self) = @_; 1988 my ($self) = @_;
1781 1989
1782 local $self->{fg} = $self->{fg}; 1990 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1783
1784 if ($GRAB == $self) {
1785 $self->{fg} = $self->{active_fg};
1786 }
1787 1991
1788 glEnable GL_TEXTURE_2D; 1992 glEnable GL_TEXTURE_2D;
1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1790 glColor 0, 0, 0, 1; 1994 glColor 0, 0, 0, 1;
1791 1995
… …
1796 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
1797} 2001}
1798 2002
1799############################################################################# 2003#############################################################################
1800 2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
2037}
2038
2039#############################################################################
2040
1801package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
1802 2042
1803our @ISA = CFClient::UI::DrawBG::; 2043our @ISA = CFClient::UI::DrawBG::;
1804 2044
1805my @tex = 2045my @tex =
… …
1810 2050
1811sub new { 2051sub new {
1812 my $class = shift; 2052 my $class = shift;
1813 2053
1814 $class->SUPER::new ( 2054 $class->SUPER::new (
1815 padding => 2, 2055 padding_x => 2,
2056 padding_y => 2,
1816 fg => [1, 1, 1], 2057 fg => [1, 1, 1],
1817 active_fg => [1, 1, 0], 2058 active_fg => [1, 1, 0],
1818 bg => [0, 0, 0, 0.2], 2059 bg => [0, 0, 0, 0.2],
1819 active_bg => [1, 1, 1, 0.5], 2060 active_bg => [1, 1, 1, 0.5],
1820 state => 0, 2061 state => 0,
… …
1824} 2065}
1825 2066
1826sub size_request { 2067sub size_request {
1827 my ($self) = @_; 2068 my ($self) = @_;
1828 2069
1829 ($self->{padding} * 2 + 6) x 2 2070 (6) x 2
1830} 2071}
1831 2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
1832sub button_down { 2081sub invoke_button_down {
1833 my ($self, $ev, $x, $y) = @_; 2082 my ($self, $ev, $x, $y) = @_;
1834 2083
1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1837 $self->{state} = !$self->{state}; 2086 $self->toggle;
1838 $self->_emit (changed => $self->{state}); 2087 } else {
2088 return 0
2089 }
2090
1839 } 2091 1
1840} 2092}
1841 2093
1842sub _draw { 2094sub _draw {
1843 my ($self) = @_; 2095 my ($self) = @_;
1844 2096
1845 $self->SUPER::_draw; 2097 $self->SUPER::_draw;
1846 2098
1847 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2099 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1848 2100
1849 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2101 my ($w, $h) = @$self{qw(w h)};
2102
2103 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1850 2104
1851 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2105 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1852 2106
1853 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2107 my $tex = $self->{state} ? $tex[1] : $tex[0];
1854 2108
… …
1862package CFClient::UI::Image; 2116package CFClient::UI::Image;
1863 2117
1864our @ISA = CFClient::UI::Base::; 2118our @ISA = CFClient::UI::Base::;
1865 2119
1866use CFClient::OpenGL; 2120use CFClient::OpenGL;
1867use Carp qw/confess/;
1868 2121
1869our %loaded_images; 2122our %texture_cache;
1870 2123
1871sub new { 2124sub new {
1872 my $class = shift; 2125 my $class = shift;
1873 2126
1874 my $self = $class->SUPER::new (can_events => 0, @_); 2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
1875 2131
1876 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
1877 2134
1878 $loaded_images{$self->{image}} ||= 2135 $self->{tex} = $texture_cache{$self->{path}} ||=
1879 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1880 2137
1881 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2138 Scalar::Util::weaken $texture_cache{$self->{path}};
1882 2139
1883 Scalar::Util::weaken $loaded_images{$self->{image}}; 2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1884
1885 $self->{aspect} = $tex->{w} / $tex->{h};
1886 2141
1887 $self 2142 $self
1888} 2143}
1889 2144
1890sub size_request { 2145sub size_request {
1891 my ($self) = @_; 2146 my ($self) = @_;
1892 2147
1893 ($self->{tex}->{w}, $self->{tex}->{h}) 2148 ($self->{tex}{w}, $self->{tex}{h})
1894} 2149}
1895 2150
1896sub _draw { 2151sub _draw {
1897 my ($self) = @_; 2152 my ($self) = @_;
1898 2153
… …
2007 my $ycut1 = max 0, min 1, $ycut; 2262 my $ycut1 = max 0, min 1, $ycut;
2008 my $ycut2 = max 0, min 1, $ycut - 1; 2263 my $ycut2 = max 0, min 1, $ycut - 1;
2009 2264
2010 my $h1 = $self->{h} * (1 - $ycut1); 2265 my $h1 = $self->{h} * (1 - $ycut1);
2011 my $h2 = $self->{h} * (1 - $ycut2); 2266 my $h2 = $self->{h} * (1 - $ycut2);
2267 my $h3 = $self->{h};
2268
2269 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2012 2270
2013 glEnable GL_BLEND; 2271 glEnable GL_BLEND;
2014 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2272 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2273 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2015 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2016 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2017 2276
2018 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2277 glBindTexture GL_TEXTURE_2D, $t1->{name};
2019 glBegin GL_QUADS; 2278 glBegin GL_QUADS;
… …
2034 2293
2035 if ($t3) { 2294 if ($t3) {
2036 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2295 glBindTexture GL_TEXTURE_2D, $t3->{name};
2037 glBegin GL_QUADS; 2296 glBegin GL_QUADS;
2038 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2297 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2039 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2298 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2040 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2299 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2041 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2300 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2042 glEnd; 2301 glEnd;
2043 } 2302 }
2044 2303
2045 glDisable GL_BLEND; 2304 glDisable GL_BLEND;
… …
2119 fg => [1, 1, 1], 2378 fg => [1, 1, 1],
2120 active_fg => [0, 0, 0], 2379 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2], 2380 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5], 2381 active_bg => [1, 1, 1, 0.5],
2123 range => [0, 0, 100, 10, 0], 2382 range => [0, 0, 100, 10, 0],
2124 req_w => $::WIDTH / 80, 2383 min_w => $::WIDTH / 80,
2125 req_h => $::WIDTH / 80, 2384 min_h => $::WIDTH / 80,
2126 vertical => 0, 2385 vertical => 0,
2127 can_hover => 1, 2386 can_hover => 1,
2128 inner_pad => 0.02, 2387 inner_pad => 0.02,
2129 @_ 2388 @_
2130 ); 2389 );
… …
2136} 2395}
2137 2396
2138sub set_range { 2397sub set_range {
2139 my ($self, $range) = @_; 2398 my ($self, $range) = @_;
2140 2399
2141 $self->{range} = $range; 2400 ($range, $self->{range}) = ($self->{range}, $range);
2142 2401
2402 if ("@$range" ne "@{$self->{range}}") {
2143 $self->update; 2403 $self->update;
2404 $self->set_value ($self->{range}[0]);
2405 }
2144} 2406}
2145 2407
2146sub set_value { 2408sub set_value {
2147 my ($self, $value) = @_; 2409 my ($self, $value) = @_;
2148 2410
… …
2159 if $unit; 2421 if $unit;
2160 2422
2161 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2423 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2162 2424
2163 if ($value != $old_value) { 2425 if ($value != $old_value) {
2164 $self->_emit (changed => $value); 2426 $self->emit (changed => $value);
2165 $self->update; 2427 $self->update;
2166 } 2428 }
2167} 2429}
2168 2430
2169sub size_request { 2431sub size_request {
2170 my ($self) = @_; 2432 my ($self) = @_;
2171 2433
2172 my $w = $self->{req_w}; 2434 ($self->{req_w}, $self->{req_h})
2173 my $h = $self->{req_h};
2174
2175 $self->{vertical} ? ($h, $w) : ($w, $h)
2176} 2435}
2177 2436
2178sub button_down { 2437sub invoke_button_down {
2179 my ($self, $ev, $x, $y) = @_; 2438 my ($self, $ev, $x, $y) = @_;
2180 2439
2181 $self->SUPER::button_down ($ev, $x, $y); 2440 $self->SUPER::invoke_button_down ($ev, $x, $y);
2182 2441
2183 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2442 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184 2443
2185 $self->mouse_motion ($ev, $x, $y); 2444 $self->invoke_mouse_motion ($ev, $x, $y)
2186} 2445}
2187 2446
2188sub mouse_motion { 2447sub invoke_mouse_motion {
2189 my ($self, $ev, $x, $y) = @_; 2448 my ($self, $ev, $x, $y) = @_;
2190 2449
2191 if ($GRAB == $self) { 2450 if ($GRAB == $self) {
2192 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2451 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2193 2452
2194 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2453 my (undef, $lo, $hi, $page) = @{$self->{range}};
2195 2454
2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2455 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2197 2456
2198 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2457 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2458 } else {
2459 return 0;
2460 }
2461
2199 } 2462 1
2200} 2463}
2201 2464
2202sub update { 2465sub update {
2203 my ($self) = @_; 2466 my ($self) = @_;
2204 2467
2205 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2468 delete $self->{knob_w};
2469 $self->SUPER::update;
2470}
2471
2472sub _draw {
2473 my ($self) = @_;
2474
2475 unless ($self->{knob_w}) {
2206 $self->set_value ($self->{range}[0]); 2476 $self->set_value ($self->{range}[0]);
2207 2477
2208 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2478 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100; 2479 my $range = ($hi - $page - $lo) || 1e-100;
2210 2480
… …
2216 $value = ($value - $lo) / $range; 2486 $value = ($value - $lo) / $range;
2217 $value = $value * $self->{scale} + $self->{offset}; 2487 $value = $value * $self->{scale} + $self->{offset};
2218 2488
2219 $self->{knob_x} = $value - $knob_w * 0.5; 2489 $self->{knob_x} = $value - $knob_w * 0.5;
2220 $self->{knob_w} = $knob_w; 2490 $self->{knob_w} = $knob_w;
2221 }); 2491 }
2222
2223 $self->SUPER::update;
2224}
2225
2226sub _draw {
2227 my ($self) = @_;
2228 2492
2229 $self->SUPER::_draw (); 2493 $self->SUPER::_draw ();
2230 2494
2231 glScale $self->{w}, $self->{h}; 2495 glScale $self->{w}, $self->{h};
2232 2496
… …
2293sub set_range { shift->{slider}->set_range (@_) } 2557sub set_range { shift->{slider}->set_range (@_) }
2294sub set_value { shift->{slider}->set_value (@_) } 2558sub set_value { shift->{slider}->set_value (@_) }
2295 2559
2296############################################################################# 2560#############################################################################
2297 2561
2298package CFClient::UI::TextView; 2562package CFClient::UI::TextScroller;
2299 2563
2300our @ISA = CFClient::UI::HBox::; 2564our @ISA = CFClient::UI::HBox::;
2301 2565
2302use CFClient::OpenGL; 2566use CFClient::OpenGL;
2303 2567
… …
2305 my $class = shift; 2569 my $class = shift;
2306 2570
2307 my $self = $class->SUPER::new ( 2571 my $self = $class->SUPER::new (
2308 fontsize => 1, 2572 fontsize => 1,
2309 can_events => 0, 2573 can_events => 0,
2574 indent => 0,
2310 #font => default_font 2575 #font => default_font
2311 @_, 2576 @_,
2312 2577
2313 layout => (new CFClient::Layout 1), 2578 layout => (new CFClient::Layout 1),
2314 par => [], 2579 par => [],
… …
2329 2594
2330 $self->{fontsize} = $fontsize; 2595 $self->{fontsize} = $fontsize;
2331 $self->reflow; 2596 $self->reflow;
2332} 2597}
2333 2598
2599sub size_request {
2600 my ($self) = @_;
2601
2602 my ($empty, $slider) = @{ $self->{children} };
2603
2604 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request
2606}
2607
2334sub size_allocate { 2608sub invoke_size_allocate {
2335 my ($self, $w, $h) = @_; 2609 my ($self, $w, $h) = @_;
2336 2610
2337 $self->SUPER::size_allocate ($w, $h); 2611 my ($empty, $slider, @other) = @{ $self->{children} };
2612 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2338 2613
2339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2614 $self->{layout}->set_font ($self->{font}) if $self->{font};
2340 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2341 $self->{layout}->set_width ($self->{children}[0]{w}); 2616 $self->{layout}->set_width ($empty->{w});
2617 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2342 2618
2343 $self->reflow; 2619 $self->reflow;
2344}
2345 2620
2346sub text_size { 2621 local $self->{children} = [$empty, $slider];
2347 my ($self, $text, $indent) = @_; 2622 $self->SUPER::invoke_size_allocate ($w, $h)
2623}
2624
2625sub get_layout {
2626 my ($self, $para) = @_;
2348 2627
2349 my $layout = $self->{layout}; 2628 my $layout = $self->{layout};
2350 2629
2630 $layout->set_font ($self->{font}) if $self->{font};
2631 $layout->set_foreground (@{$para->{fg}});
2351 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2632 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2352 $layout->set_width ($self->{children}[0]{w} - $indent); 2633 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2634 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2353 $layout->set_markup ($text); 2635 $layout->set_markup ($para->{markup});
2636
2637 $layout->set_shapes (
2638 map
2639 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2640 @{$para->{widget}}
2354 2641 );
2642
2355 $layout->size 2643 $layout
2356} 2644}
2357 2645
2358sub reflow { 2646sub reflow {
2359 my ($self) = @_; 2647 my ($self) = @_;
2360 2648
… …
2369 $self->{children}[1]->set_value ($offset); 2657 $self->{children}[1]->set_value ($offset);
2370} 2658}
2371 2659
2372sub clear { 2660sub clear {
2373 my ($self) = @_; 2661 my ($self) = @_;
2662
2663 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other;
2374 2665
2375 $self->{par} = []; 2666 $self->{par} = [];
2376 $self->{height} = 0; 2667 $self->{height} = 0;
2377 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2378} 2669}
2379 2670
2380sub add_paragraph { 2671sub add_paragraph {
2381 my ($self, $color, $text, $indent) = @_; 2672 my ($self, $color, $para, $indent) = @_;
2382 2673
2383 for my $line (split /\n/, $text) { 2674 my ($text, @w) = ref $para ? @$para : $para;
2384 my ($w, $h) = $self->text_size ($line); 2675
2385 $self->{height} += $h; 2676 $para = {
2386 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2677 w => 1e10,
2678 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2387 } 2683 };
2388 2684
2389 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2685 $self->add (@w) if @w;
2686 push @{$self->{par}}, $para;
2687
2688 $self->{need_reflow}++;
2689 $self->update;
2690}
2691
2692sub scroll_to_bottom {
2693 my ($self) = @_;
2694
2695 $self->{scroll_to_bottom} = 1;
2696 $self->update;
2390} 2697}
2391 2698
2392sub update { 2699sub update {
2393 my ($self) = @_; 2700 my ($self) = @_;
2394 2701
… …
2396 2703
2397 return unless $self->{h} > 0; 2704 return unless $self->{h} > 0;
2398 2705
2399 delete $self->{texture}; 2706 delete $self->{texture};
2400 2707
2401 $ROOT->on_post_alloc ($self, sub { 2708 $ROOT->on_post_alloc ($self => sub {
2402 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2403 2710
2404 if (delete $self->{need_reflow}) { 2711 if (delete $self->{need_reflow}) {
2405 my $height = 0; 2712 my $height = 0;
2406 2713
2407 my $layout = $self->{layout};
2408
2409 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2410
2411 for (@{$self->{par}}) { 2714 for my $para (@{$self->{par}}) {
2412 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2413 $layout->set_width ($W - $_->[3]); 2716 my $layout = $self->get_layout ($para);
2414 $layout->set_markup ($_->[4]);
2415 my ($w, $h) = $layout->size; 2717 my ($w, $h) = $layout->size;
2416 $_->[0] = $w + $_->[3]; 2718
2417 $_->[1] = $h; 2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2418 } 2722 }
2419 2723
2420 $height += $_->[1]; 2724 $height += $para->{h};
2421 } 2725 }
2422 2726
2423 $self->{height} = $height; 2727 $self->{height} = $height;
2424 2728
2425 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2426 2730
2427 delete $self->{texture}; 2731 delete $self->{texture};
2428 } 2732 }
2429 2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2431 glClearColor 0.5, 0.5, 0.5, 0; 2739 glClearColor 0, 0, 0, 0;
2432 glClear GL_COLOR_BUFFER_BIT; 2740 glClear GL_COLOR_BUFFER_BIT;
2433 2741
2434 my $top = int $self->{children}[1]{range}[0]; 2742 my $top = int $self->{children}[1]{range}[0];
2435 2743
2436 my $y0 = $top; 2744 my $y0 = $top;
2437 my $y1 = $top + $H; 2745 my $y1 = $top + $H;
2438 2746
2439 my $y = 0; 2747 my $y = 0;
2440
2441 my $layout = $self->{layout};
2442
2443 $layout->set_font ($self->{font}) if $self->{font};
2444 2748
2445 glEnable GL_BLEND; 2749 glEnable GL_BLEND;
2446 #TODO# not correct in windows where rgba is forced off 2750 #TODO# not correct in windows where rgba is forced off
2447 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2448 2752
2449 for my $par (@{$self->{par}}) { 2753 for my $para (@{$self->{par}}) {
2450 my $h = $par->[1]; 2754 my $h = $para->{h};
2451 2755
2452 if ($y0 < $y + $h && $y < $y1) { 2756 if ($y0 < $y + $h && $y < $y1) {
2453 $layout->set_foreground (@{ $par->[2] }); 2757
2454 $layout->set_width ($W - $par->[3]); 2758 my $layout = $self->get_layout ($para);
2455 $layout->set_markup ($par->[4]);
2456 2759
2457 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2458 2761
2459 glRasterPos $par->[3], $y - $y0; 2762 glRasterPos $para->{indent}, $y - $y0;
2460 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764
2765 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes;
2767
2768 glDisable GL_BLEND;
2769 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, ();
2771
2772 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0;
2774
2775 $_->draw;
2776 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 }
2461 } 2780 }
2462 2781
2463 $y += $h; 2782 $y += $h;
2464 } 2783 }
2465 2784
2466 glDisable GL_BLEND; 2785 glDisable GL_BLEND;
2467 }; 2786 };
2468 }); 2787 });
2469} 2788}
2470 2789
2790sub reconfigure {
2791 my ($self) = @_;
2792
2793 $self->SUPER::reconfigure;
2794
2795 $_->{w} = 1e10 for @{ $self->{par} };
2796 $self->reflow;
2797}
2798
2471sub _draw { 2799sub _draw {
2472 my ($self) = @_; 2800 my ($self) = @_;
2473 2801
2474 glEnable GL_TEXTURE_2D; 2802 glEnable GL_TEXTURE_2D;
2475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2476 glColor 1, 1, 1, 1; 2804 glColor 0, 0, 0, 1;
2477 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2805 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2478 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2479 2807
2480 $self->{children}[1]->draw; 2808 $self->{children}[1]->draw;
2481
2482} 2809}
2483 2810
2484############################################################################# 2811#############################################################################
2485 2812
2486package CFClient::UI::Animator; 2813package CFClient::UI::Animator;
… …
2531 2858
2532sub new { 2859sub new {
2533 my $class = shift; 2860 my $class = shift;
2534 2861
2535 my $self = $class->SUPER::new ( 2862 my $self = $class->SUPER::new (
2536 state => 0, 2863 state => 0,
2537 connect_activate => \&toggle_flopper, 2864 on_activate => \&toggle_flopper,
2538 @_ 2865 @_
2539 ); 2866 );
2540 2867
2541 if ($self->{state}) {
2542 $self->{state} = 0;
2543 $self->toggle_flopper;
2544 }
2545
2546 $self 2868 $self
2547} 2869}
2548 2870
2549sub toggle_flopper { 2871sub toggle_flopper {
2550 my ($self) = @_; 2872 my ($self) = @_;
2551 2873
2552 # TODO: use animation 2874 $self->{other}->toggle_visibility;
2553 if ($self->{state} = !$self->{state}) {
2554 $CFClient::UI::ROOT->add ($self->{other});
2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2556 $self->_emit ("open");
2557 } else {
2558 $CFClient::UI::ROOT->remove ($self->{other});
2559 $self->_emit ("close");
2560 }
2561
2562 $self->_emit (changed => $self->{state});
2563} 2875}
2564 2876
2565############################################################################# 2877#############################################################################
2566 2878
2567package CFClient::UI::Tooltip; 2879package CFClient::UI::Tooltip;
… …
2580} 2892}
2581 2893
2582sub set_tooltip_from { 2894sub set_tooltip_from {
2583 my ($self, $widget) = @_; 2895 my ($self, $widget) = @_;
2584 2896
2897 my $tooltip = $widget->{tooltip};
2898
2899 if ($ENV{CFPLUS_DEBUG} & 2) {
2900 $tooltip .= "\n\n" . (ref $widget) . "\n"
2901 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2902 . "req $widget->{req_w} $widget->{req_h}\n"
2903 . "visible $widget->{visible}";
2904 }
2905
2906 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//;
2908
2585 $self->add (new CFClient::UI::Label 2909 $self->add (new CFClient::UI::Label
2586 markup => $widget->{tooltip}, 2910 markup => $tooltip,
2587 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588 fontsize => 0.8, 2912 fontsize => 0.8,
2589 fg => [0, 0, 0, 1], 2913 fg => [0, 0, 0, 1],
2590 ellipsise => 0, 2914 ellipsise => 0,
2591 font => ($widget->{tooltip_font} || $::FONT_PROP), 2915 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2598 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2599 2923
2600 ($w + 4, $h + 4) 2924 ($w + 4, $h + 4)
2601} 2925}
2602 2926
2603sub size_allocate { 2927sub invoke_size_allocate {
2604 my ($self, $w, $h) = @_; 2928 my ($self, $w, $h) = @_;
2605 2929
2606 $self->SUPER::size_allocate ($w - 4, $h - 4); 2930 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2931}
2932
2933sub invoke_visibility_change {
2934 my ($self, $visible) = @_;
2935
2936 return unless $visible;
2937
2938 $self->{root}->on_post_alloc ("move_$self" => sub {
2939 my $widget = $self->{owner}
2940 or return;
2941
2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943
2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945 if $x + $self->{w} > $self->{root}{w};
2946
2947 $self->move_abs ($x, $y);
2948 });
2607} 2949}
2608 2950
2609sub _draw { 2951sub _draw {
2610 my ($self) = @_; 2952 my ($self) = @_;
2611 2953
… …
2628 glVertex $w, $h; 2970 glVertex $w, $h;
2629 glVertex $w, 0; 2971 glVertex $w, 0;
2630 glEnd; 2972 glEnd;
2631 2973
2632 glTranslate 2 - 0.375, 2 - 0.375; 2974 glTranslate 2 - 0.375, 2 - 0.375;
2975
2633 $self->SUPER::_draw; 2976 $self->SUPER::_draw;
2634} 2977}
2635 2978
2636############################################################################# 2979#############################################################################
2637 2980
… …
2696 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3039 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2697 3040
2698 if ($tex) { 3041 if ($tex) {
2699 glEnable GL_TEXTURE_2D; 3042 glEnable GL_TEXTURE_2D;
2700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2701 glColor 1, 1, 1, 1; 3044 glColor 0, 0, 0, 1;
2702 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3045 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2703 glDisable GL_TEXTURE_2D; 3046 glDisable GL_TEXTURE_2D;
2704 } 3047 }
2705} 3048}
2706 3049
2707sub DESTROY { 3050sub destroy {
2708 my ($self) = @_; 3051 my ($self) = @_;
2709 3052
2710 $self->{timer}->cancel 3053 $self->{timer}->cancel
2711 if $self->{timer}; 3054 if $self->{timer};
2712 3055
2713 $self->SUPER::DESTROY; 3056 $self->SUPER::destroy;
2714} 3057}
2715 3058
2716############################################################################# 3059#############################################################################
2717 3060
2718package CFClient::UI::Inventory; 3061package CFClient::UI::Buttonbar;
2719 3062
2720our @ISA = CFClient::UI::ScrolledWindow::; 3063our @ISA = CFClient::UI::HBox::;
2721 3064
2722sub new { 3065# TODO: should actualyl wrap buttons and other goodies.
2723 my $class = shift;
2724
2725 my $self = $class->SUPER::new (
2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2727 @_,
2728 );
2729
2730 $self
2731}
2732
2733sub set_items {
2734 my ($self, $items) = @_;
2735
2736 $self->{scrolled}->clear;
2737 return unless $items;
2738
2739 my @items = sort {
2740 ($a->{type} <=> $b->{type})
2741 or ($a->{name} cmp $b->{name})
2742 } @$items;
2743
2744 $self->{real_items} = \@items;
2745
2746 my $row = 0;
2747 for my $item (@items) {
2748 CFClient::Item::update_widgets $item;
2749
2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753
2754 $row++;
2755 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763}
2764 3066
2765############################################################################# 3067#############################################################################
2766 3068
2767package CFClient::UI::Menu; 3069package CFClient::UI::Menu;
2768 3070
… …
2780 ); 3082 );
2781 3083
2782 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3084 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2783 3085
2784 for my $item (@{ $self->{items} }) { 3086 for my $item (@{ $self->{items} }) {
2785 my ($widget, $cb) = @$item; 3087 my ($widget, $cb, $tooltip) = @$item;
2786 3088
2787 # handle various types of items, only text for now 3089 # handle various types of items, only text for now
2788 if (!ref $widget) { 3090 if (!ref $widget) {
2789 $widget = new CFClient::UI::Label 3091 $widget = new CFClient::UI::Label
2790 can_hover => 1, 3092 can_hover => 1,
2791 can_events => 1, 3093 can_events => 1,
2792 text => $widget; 3094 markup => $widget,
3095 tooltip => $tooltip
2793 } 3096 }
2794 3097
2795 $self->{item}{$widget} = $item; 3098 $self->{item}{$widget} = $item;
2796 3099
2797 $self->{vbox}->add ($widget); 3100 $self->{vbox}->add ($widget);
… …
2802 3105
2803# popup given the event (must be a mouse button down event currently) 3106# popup given the event (must be a mouse button down event currently)
2804sub popup { 3107sub popup {
2805 my ($self, $ev) = @_; 3108 my ($self, $ev) = @_;
2806 3109
2807 $self->_emit ("popdown"); 3110 $self->emit ("popdown");
2808 3111
2809 # maybe save $GRAB? must be careful about events... 3112 # maybe save $GRAB? must be careful about events...
2810 $GRAB = $self; 3113 $GRAB = $self;
2811 $self->{button} = $ev->{button}; 3114 $self->{button} = $ev->{button};
2812 3115
2813 $self->show; 3116 $self->show;
2814 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3117 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2815} 3118}
2816 3119
2817sub mouse_motion { 3120sub invoke_mouse_motion {
2818 my ($self, $ev, $x, $y) = @_; 3121 my ($self, $ev, $x, $y) = @_;
2819 3122
2820 # TODO: should use vbox->find_widget or so 3123 # TODO: should use vbox->find_widget or so
2821 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3124 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2822 $self->{hover} = $self->{item}{$HOVER}; 3125 $self->{hover} = $self->{item}{$HOVER};
2823}
2824 3126
3127 0
3128}
3129
2825sub button_up { 3130sub invoke_button_up {
2826 my ($self, $ev, $x, $y) = @_; 3131 my ($self, $ev, $x, $y) = @_;
2827 3132
2828 if ($ev->{button} == $self->{button}) { 3133 if ($ev->{button} == $self->{button}) {
2829 undef $GRAB; 3134 undef $GRAB;
2830 $self->hide; 3135 $self->hide;
2831 3136
2832 $self->_emit ("popdown"); 3137 $self->emit ("popdown");
2833 $self->{hover}[1]->() if $self->{hover}; 3138 $self->{hover}[1]->() if $self->{hover};
3139 } else {
3140 return 0
3141 }
3142
2834 } 3143 1
2835} 3144}
2836 3145
2837############################################################################# 3146#############################################################################
2838 3147
2839package CFClient::UI::Statusbox; 3148package CFClient::UI::Multiplexer;
2840 3149
2841our @ISA = CFClient::UI::VBox::; 3150our @ISA = CFClient::UI::Container::;
2842 3151
2843sub new { 3152sub new {
2844 my $class = shift; 3153 my $class = shift;
2845 3154
2846 $class->SUPER::new ( 3155 my $self = $class->SUPER::new (
3156 @_,
3157 );
3158
3159 $self->{current} = $self->{children}[0]
3160 if @{ $self->{children} };
3161
3162 $self
3163}
3164
3165sub add {
3166 my ($self, @widgets) = @_;
3167
3168 $self->SUPER::add (@widgets);
3169
3170 $self->{current} = $self->{children}[0]
3171 if @{ $self->{children} };
3172}
3173
3174sub get_current_page {
3175 my ($self) = @_;
3176
3177 $self->{current}
3178}
3179
3180sub set_current_page {
3181 my ($self, $page_or_widget) = @_;
3182
3183 my $widget = ref $page_or_widget
3184 ? $page_or_widget
3185 : $self->{children}[$page_or_widget];
3186
3187 $self->{current} = $widget;
3188 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3189
3190 $self->emit (page_changed => $self->{current});
3191
3192 $self->realloc;
3193}
3194
3195sub visible_children {
3196 $_[0]{current}
3197}
3198
3199sub size_request {
3200 my ($self) = @_;
3201
3202 $self->{current}->size_request
3203}
3204
3205sub invoke_size_allocate {
3206 my ($self, $w, $h) = @_;
3207
3208 $self->{current}->configure (0, 0, $w, $h);
3209
3210 1
3211}
3212
3213sub _draw {
3214 my ($self) = @_;
3215
3216 $self->{current}->draw;
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::Notebook;
3222
3223our @ISA = CFClient::UI::VBox::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (
3229 buttonbar => (new CFClient::UI::Buttonbar),
3230 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3231 # filter => # will be put between multiplexer and $self
3232 @_,
3233 );
3234
3235 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3236 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3237
3238 $self
3239}
3240
3241sub add {
3242 my ($self, $title, $widget, $tooltip) = @_;
3243
3244 Scalar::Util::weaken $self;
3245
3246 $self->{buttonbar}->add (new CFClient::UI::Button
3247 markup => $title,
3248 tooltip => $tooltip,
3249 on_activate => sub { $self->set_current_page ($widget) },
3250 );
3251
3252 $self->{multiplexer}->add ($widget);
3253}
3254
3255sub get_current_page {
3256 my ($self) = @_;
3257
3258 $self->{multiplexer}->get_current_page
3259}
3260
3261sub set_current_page {
3262 my ($self, $page) = @_;
3263
3264 $self->{multiplexer}->set_current_page ($page);
3265 $self->emit (page_changed => $self->{multiplexer}{current});
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::Combobox;
3271
3272use utf8;
3273
3274our @ISA = CFClient::UI::Button::;
3275
3276sub new {
3277 my $class = shift;
3278
3279 my $self = $class->SUPER::new (
3280 options => [], # [value, title, longdesc], ...
3281 value => undef,
3282 @_,
3283 );
3284
3285 $self->_set_value ($self->{value});
3286
3287 $self
3288}
3289
3290sub invoke_button_down {
3291 my ($self, $ev) = @_;
3292
3293 my @menu_items;
3294
3295 for (@{ $self->{options} }) {
3296 my ($value, $title, $tooltip) = @$_;
3297
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 }
3300
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302}
3303
3304sub _set_value {
3305 my ($self, $value) = @_;
3306
3307 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3308 or return;
3309
3310 $self->{value} = $item->[0];
3311 $self->set_markup ("$item->[1] ⇓");
3312 $self->set_tooltip ($item->[2]);
3313}
3314
3315sub set_value {
3316 my ($self, $value) = @_;
3317
3318 return unless $self->{value} ne $value;
3319
3320 $self->_set_value ($value);
3321 $self->emit (changed => $value);
3322}
3323
3324#############################################################################
3325
3326package CFClient::UI::Statusbox;
3327
3328our @ISA = CFClient::UI::VBox::;
3329
3330sub new {
3331 my $class = shift;
3332
3333 my $self = $class->SUPER::new (
2847 fontsize => 0.8, 3334 fontsize => 0.8,
2848 @_, 3335 @_,
2849 ) 3336 );
3337
3338 Scalar::Util::weaken (my $this = $self);
3339
3340 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341
3342 $self
2850} 3343}
2851 3344
2852sub reorder { 3345sub reorder {
2853 my ($self) = @_; 3346 my ($self) = @_;
2854 my $NOW = time; 3347 my $NOW = Time::HiRes::time;
3348
3349 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} };
2855 3353
2856 while (my ($k, $v) = each %{ $self->{item} }) { 3354 while (my ($k, $v) = each %{ $self->{item} }) {
2857 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3355 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2858 } 3356 }
2859 3357
… …
2862 my @items = sort { 3360 my @items = sort {
2863 $a->{pri} <=> $b->{pri} 3361 $a->{pri} <=> $b->{pri}
2864 or $b->{id} <=> $a->{id} 3362 or $b->{id} <=> $a->{id}
2865 } values %{ $self->{item} }; 3363 } values %{ $self->{item} };
2866 3364
3365 $self->{timer}->interval (1);
3366
2867 my $count = 10 + 1; 3367 my $count = 10 + 1;
2868 for my $item (@items) { 3368 for my $item (@items) {
2869 last unless --$count; 3369 last unless --$count;
2870 3370
2871 push @widgets, $item->{label} ||= do { 3371 my $label = $item->{label} ||= do {
2872 # TODO: doesn't handle markup well (read as: at all) 3372 # TODO: doesn't handle markup well (read as: at all)
2873 my $short = $item->{count} > 1 3373 my $short = $item->{count} > 1
2874 ? "<b>$item->{count} ×</b> $item->{text}" 3374 ? "<b>$item->{count} ×</b> $item->{text}"
2875 : $item->{text}; 3375 : $item->{text};
2876 3376
… …
2884 tooltip => $item->{tooltip}, 3384 tooltip => $item->{tooltip},
2885 tooltip_font => $::FONT_PROP, 3385 tooltip_font => $::FONT_PROP,
2886 tooltip_width => 0.67, 3386 tooltip_width => 0.67,
2887 fontsize => $item->{fontsize} || $self->{fontsize}, 3387 fontsize => $item->{fontsize} || $self->{fontsize},
2888 max_w => $::WIDTH * 0.44, 3388 max_w => $::WIDTH * 0.44,
2889 fg => $item->{fg}, 3389 fg => [@{ $item->{fg} }],
2890 can_events => 1, 3390 can_events => 1,
2891 can_hover => 1 3391 can_hover => 1
2892 }; 3392 };
3393
3394 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3395 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3396 $label->update;
3397 $label->set_max_size (undef, $label->{req_h} * $diff)
3398 if $diff < 1;
3399 $self->{timer}->interval (1/30);
3400 } else {
3401 $label->{fg}[3] = $item->{fg}[3] || 1;
3402 }
3403
3404 push @widgets, $label;
2893 } 3405 }
2894 3406
2895 $self->clear; 3407 $self->clear;
2896 $self->SUPER::add (reverse @widgets); 3408 $self->SUPER::add (reverse @widgets);
2897} 3409}
… …
2902 $text =~ s/^\s+//; 3414 $text =~ s/^\s+//;
2903 $text =~ s/\s+$//; 3415 $text =~ s/\s+$//;
2904 3416
2905 return unless $text; 3417 return unless $text;
2906 3418
2907 my $timeout = time + ((delete $arg{timeout}) || 60); 3419 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2908 3420
2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3421 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2910 3422
2911 if (my $item = $self->{item}{$group}) { 3423 if (my $item = $self->{item}{$group}) {
2912 if ($item->{text} eq $text) { 3424 if ($item->{text} eq $text) {
2913 $item->{count}++; 3425 $item->{count}++;
2914 } else { 3426 } else {
2915 $item->{count} = 1; 3427 $item->{count} = 1;
2916 $item->{text} = $item->{tooltip} = $text; 3428 $item->{text} = $item->{tooltip} = $text;
2917 } 3429 }
2918 $item->{id} = ++$self->{id}; 3430 $item->{id} += 0.2;#d#
2919 $item->{timeout} = $timeout; 3431 $item->{timeout} = $timeout;
2920 delete $item->{label}; 3432 delete $item->{label};
2921 } else { 3433 } else {
2922 $self->{item}{$group} = { 3434 $self->{item}{$group} = {
2923 id => ++$self->{id}, 3435 id => ++$self->{id},
… …
2929 count => 1, 3441 count => 1,
2930 %arg, 3442 %arg,
2931 }; 3443 };
2932 } 3444 }
2933 3445
3446 $ROOT->on_refresh (reorder => sub {
2934 $self->reorder; 3447 $self->reorder;
3448 });
2935} 3449}
2936 3450
2937sub reconfigure { 3451sub reconfigure {
2938 my ($self) = @_; 3452 my ($self) = @_;
2939 3453
… …
2942 3456
2943 $self->reorder; 3457 $self->reorder;
2944 $self->SUPER::reconfigure; 3458 $self->SUPER::reconfigure;
2945} 3459}
2946 3460
3461sub destroy {
3462 my ($self) = @_;
3463
3464 $self->{timer}->cancel;
3465
3466 $self->SUPER::destroy;
3467}
3468
2947############################################################################# 3469#############################################################################
2948 3470
2949package CFClient::UI::Root; 3471package CFClient::UI::Inventory;
2950 3472
2951our @ISA = CFClient::UI::Container::; 3473our @ISA = CFClient::UI::Table::;
2952
2953use CFClient::OpenGL;
2954 3474
2955sub new { 3475sub new {
2956 my $class = shift; 3476 my $class = shift;
2957 3477
2958 $class->SUPER::new ( 3478 my $self = $class->SUPER::new (
3479 col_expand => [0, 1, 0],
3480 @_,
3481 );
3482
3483 $self
3484}
3485
3486sub set_items {
3487 my ($self, $items) = @_;
3488
3489 $self->clear;
3490 return unless $items;
3491
3492 my @items = sort {
3493 ($a->{type} <=> $b->{type})
3494 or ($a->{name} cmp $b->{name})
3495 } values %$items;
3496
3497 $self->{real_items} = \@items;
3498
3499 my $row = 0;
3500 for my $item (@items) {
3501 CFClient::Item::update_widgets $item;
3502
3503 $self->add (0, $row, $item->{face_widget});
3504 $self->add (1, $row, $item->{desc_widget});
3505 $self->add (2, $row, $item->{weight_widget});
3506
3507 $row++;
3508 }
3509}
3510
3511#############################################################################
3512
3513package CFClient::UI::SpellList;
3514
3515our @ISA = CFClient::UI::Table::;
3516
3517sub new {
3518 my $class = shift;
3519
3520 my $self = $class->SUPER::new (
3521 binding => [],
3522 commands => [],
2959 @_, 3523 @_,
2960 ) 3524 )
2961} 3525}
2962 3526
2963sub configure { 3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2964 my ($self, $x, $y, $w, $h) = @_;
2965 3528
2966 $self->{w} = $w; 3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2967 $self->{h} = $h; 3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2968} 3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2969 3539
2970sub check_size { 3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3612sub add_spell {
2971 my ($self) = @_; 3613 my ($self, $spell) = @_;
2972 3614
2973 $self->size_allocate ($self->{w}, $self->{h}) 3615 $self->{spell}->{$spell->{name}} = $spell;
2974 if $self->{w}; 3616 $self->rebuild_spell_list;
3617}
3618
3619sub remove_spell {
3620 my ($self, $spell) = @_;
3621
3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3633#############################################################################
3634
3635package CFClient::UI::Root;
3636
3637our @ISA = CFClient::UI::Container::;
3638
3639use List::Util qw(min max);
3640
3641use CFClient::OpenGL;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 visible => 1,
3648 @_,
3649 );
3650
3651 Scalar::Util::weaken ($self->{root} = $self);
3652
3653 $self
2975} 3654}
2976 3655
2977sub size_request { 3656sub size_request {
2978 my ($self) = @_; 3657 my ($self) = @_;
2979 3658
2980 ($self->{w}, $self->{h}) 3659 ($self->{w}, $self->{h})
2981} 3660}
2982 3661
3662sub _to_pixel {
3663 my ($coord, $size, $max) = @_;
3664
3665 $coord =
3666 $coord eq "center" ? ($max - $size) * 0.5
3667 : $coord eq "max" ? $max
3668 : $coord;
3669
3670 $coord = 0 if $coord < 0;
3671 $coord = $max - $size if $coord > $max - $size;
3672
3673 int $coord + 0.5
3674}
3675
2983sub size_allocate { 3676sub invoke_size_allocate {
2984 my ($self, $w, $h) = @_; 3677 my ($self, $w, $h) = @_;
2985 3678
2986 for my $child ($self->children) { 3679 for my $child ($self->children) {
2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3680 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2988 3681
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3682 $X = $child->{force_x} if exists $child->{force_x};
2990 if exists $child->{req_x}; 3683 $Y = $child->{force_y} if exists $child->{force_y};
2991 3684
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3685 $X = _to_pixel $X, $W, $self->{w};
2993 if exists $child->{req_y}; 3686 $Y = _to_pixel $Y, $H, $self->{h};
2994
2995 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997 3687
2998 $child->configure ($X, $Y, $W, $H); 3688 $child->configure ($X, $Y, $W, $H);
2999 } 3689 }
3690
3691 1
3000} 3692}
3001 3693
3002sub coord2local { 3694sub coord2local {
3003 my ($self, $x, $y) = @_; 3695 my ($self, $x, $y) = @_;
3004 3696
… …
3012} 3704}
3013 3705
3014sub update { 3706sub update {
3015 my ($self) = @_; 3707 my ($self) = @_;
3016 3708
3017 $self->check_size;
3018 $::WANT_REFRESH++; 3709 $::WANT_REFRESH++;
3019} 3710}
3020 3711
3021sub add { 3712sub add {
3022 my ($self, @children) = @_; 3713 my ($self, @children) = @_;
3023 3714
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
3030 for my $child (@children) {
3031 $child->{is_toplevel} = 1; 3715 $_->{is_toplevel} = 1
3032 3716 for @children;
3033 # integerise window positions
3034 $child->{x} = int $child->{x};
3035 $child->{y} = int $child->{y};
3036 }
3037 3717
3038 $self->SUPER::add (@children); 3718 $self->SUPER::add (@children);
3039} 3719}
3040 3720
3041sub remove { 3721sub remove {
3042 my ($self, @children) = @_; 3722 my ($self, @children) = @_;
3043 3723
3044 $self->SUPER::remove (@children); 3724 $self->SUPER::remove (@children);
3725
3726 delete $self->{is_toplevel}
3727 for @children;
3045 3728
3046 while (@children) { 3729 while (@children) {
3047 my $w = pop @children; 3730 my $w = pop @children;
3048 push @children, $w->children; 3731 push @children, $w->children;
3049 $w->set_invisible; 3732 $w->set_invisible;
… …
3068 while ($self->{refresh_hook}) { 3751 while ($self->{refresh_hook}) {
3069 $_->() 3752 $_->()
3070 for values %{delete $self->{refresh_hook}}; 3753 for values %{delete $self->{refresh_hook}};
3071 } 3754 }
3072 3755
3073 if ($self->{check_size}) { 3756 if ($self->{realloc}) {
3074 my @queue = ([], []); 3757 my %queue;
3758 my @queue;
3759 my $widget;
3075 3760
3076 for (;;) { 3761 outer:
3077 if ($self->{check_size}) { 3762 while () {
3078 # heuristic: check containers last 3763 if (my $realloc = delete $self->{realloc}) {
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3764 for $widget (values %$realloc) {
3080 for values %{delete $self->{check_size}} 3765 $widget->{visible} or next; # do not resize invisible widgets
3766
3767 $queue{$widget+0}++ and next; # duplicates are common
3768
3769 push @{ $queue[$widget->{visible}] }, $widget;
3770 }
3081 } 3771 }
3082 3772
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3773 while () {
3774 @queue or last outer;
3084 3775
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3776 $widget = pop @{ $queue[-1] || [] }
3086 ? @$widget{qw(user_w user_h)} 3777 and last;
3087 : $widget->size_request;
3088
3089 if (delete $widget->{force_alloc}
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092 3778
3779 pop @queue;
3780 }
3781
3782 delete $queue{$widget+0};
3783
3784 my ($w, $h) = $widget->size_request;
3785
3786 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3787 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3788
3789 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3790 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3791
3792 $w = $widget->{force_w} if exists $widget->{force_w};
3793 $h = $widget->{force_h} if exists $widget->{force_h};
3794
3795 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3796 || delete $widget->{force_realloc}) {
3093 $widget->{req_w} = $w; 3797 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h; 3798 $widget->{req_h} = $h;
3095 3799
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3800 $self->{size_alloc}{$widget+0} = $widget;
3097 3801
3098 $widget->{parent}->check_size
3099 if $widget->{parent}; 3802 if (my $parent = $widget->{parent}) {
3803 $self->{realloc}{$parent+0} = $parent
3804 unless $queue{$parent+0};
3805
3806 $parent->{force_size_alloc} = 1;
3807 $self->{size_alloc}{$parent+0} = $parent;
3808 }
3100 } 3809 }
3810
3811 delete $self->{realloc}{$widget+0};
3101 } 3812 }
3102 } 3813 }
3103 3814
3104 while ($self->{size_alloc}) { 3815 while (my $size_alloc = delete $self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) { 3816 my @queue = sort { $b->{visible} <=> $a->{visible} }
3106 my ($widget, $w, $h) = @$_; 3817 values %$size_alloc;
3818
3819 while () {
3820 my $widget = pop @queue || last;
3821
3822 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3107 3823
3108 $w = 0 if $w < 0; 3824 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0; 3825 $h = 0 if $h < 0;
3110 3826
3827 $w = int $w + 0.5;
3828 $h = int $h + 0.5;
3829
3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w};
3832 $widget->{old_h} = $widget->{h};
3833
3111 $widget->{w} = $w; 3834 $widget->{w} = $w;
3112 $widget->{h} = $h; 3835 $widget->{h} = $h;
3836
3113 $widget->emit (size_allocate => $w, $h); 3837 $widget->emit (size_allocate => $w, $h);
3838 }
3114 } 3839 }
3115 } 3840 }
3116 3841
3117 while ($self->{post_alloc_hook}) { 3842 while ($self->{post_alloc_hook}) {
3118 $_->() 3843 $_->()
3119 for values %{delete $self->{post_alloc_hook}}; 3844 for values %{delete $self->{post_alloc_hook}};
3120 } 3845 }
3846
3121 3847
3122 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3848 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3849 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3124 glClear GL_COLOR_BUFFER_BIT; 3850 glClear GL_COLOR_BUFFER_BIT;
3125 3851
… …
3127 glLoadIdentity; 3853 glLoadIdentity;
3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3129 glMatrixMode GL_MODELVIEW; 3855 glMatrixMode GL_MODELVIEW;
3130 glLoadIdentity; 3856 glLoadIdentity;
3131 3857
3858 {
3859 package CFClient::UI::Base;
3860
3861 ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h});
3863 }
3864
3132 $self->_draw; 3865 $self->_draw;
3133} 3866}
3134 3867
3135############################################################################# 3868#############################################################################
3136 3869

Diff Legend

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