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.53 by root, Mon Apr 10 11:56:28 2006 UTC vs.
Revision 1.68 by root, Tue Apr 11 17:02:36 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client; 10use CFClient;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $TOPLEVEL; 14our $TOPLEVEL;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
… …
34 $GRAB->update if $GRAB; 34 $GRAB->update if $GRAB;
35 } 35 }
36 36
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38 38
39 $GRAB->button_down ($ev) if $GRAB; 39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40} 40}
41 41
42sub feed_sdl_button_up_event { 42sub feed_sdl_button_up_event {
43 my ($ev) = @_; 43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45 45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49 51
50 if (!$BUTTON_STATE) { 52 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 53 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 54 $grab->update if $grab;
53 $GRAB->update if $GRAB; 55 $GRAB->update if $GRAB;
… …
65 67
66 $hover->update if $hover; 68 $hover->update if $hover;
67 $HOVER->update if $HOVER; 69 $HOVER->update if $HOVER;
68 } 70 }
69 71
70 $HOVER->mouse_motion ($ev) if $HOVER; 72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71} 73}
72 74
73sub new { 75sub new {
74 my $class = shift; 76 my $class = shift;
75 77
76 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
77} 84}
78 85
79sub move { 86sub move {
80 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
81 $self->{x} = $x; 88 $self->{x} = $x;
… …
97 104
98 $self->{w} = $w; 105 $self->{w} = $w;
99 $self->{h} = $h; 106 $self->{h} = $h;
100} 107}
101 108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114}
115
102sub focus_in { 116sub focus_in {
103 my ($self) = @_; 117 my ($self) = @_;
118
119 return if $FOCUS == $self;
104 120
105 my $focus = $FOCUS; $FOCUS = $self; 121 my $focus = $FOCUS; $FOCUS = $self;
106 $focus->update if $focus; 122 $focus->update if $focus;
107 $FOCUS->update; 123 $FOCUS->update;
108} 124}
… …
116 $focus->update if $focus; #? 132 $focus->update if $focus; #?
117} 133}
118 134
119sub mouse_motion { } 135sub mouse_motion { }
120sub button_up { } 136sub button_up { }
121sub button_down { }
122sub key_down { } 137sub key_down { }
123sub key_up { } 138sub key_up { }
139
140sub button_down {
141 my ($self, $ev, $x, $y) = @_;
142
143 $self->focus_in;
144}
124 145
125sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 146sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
126sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 147sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
127sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 148sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
128sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 149sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
129sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 150sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
130 151
131sub draw { 152sub draw {
132 my ($self) = @_; 153 my ($self) = @_;
154
155 return unless $self->{h} && $self->{w};
133 156
134 glPushMatrix; 157 glPushMatrix;
135 glTranslate $self->{x}, $self->{y}, 0; 158 glTranslate $self->{x}, $self->{y}, 0;
136 $self->_draw; 159 $self->_draw;
137 if ($self == $HOVER) { 160 if ($self == $HOVER) {
… …
201 #$self->deactivate; 224 #$self->deactivate;
202} 225}
203 226
204############################################################################# 227#############################################################################
205 228
206package Crossfire::Client::Widget::Container; 229package CFClient::Widget::DrawBG;
207 230
208our @ISA = Crossfire::Client::Widget::; 231our @ISA = CFClient::Widget::;
232
233use strict;
234use SDL::OpenGL;
209 235
210sub new { 236sub new {
237 my $class = shift;
238
239 # range [value, low, high, page]
240
241 $class->SUPER::new (
242 bg => [0, 0, 0, 0.4],
243 active_bg => [1, 1, 1],
244 @_
245 )
246}
247
248sub _draw {
249 my ($self) = @_;
250
251 my ($w, $h) = @$self{qw(w h)};
252
253 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
254 glBegin GL_QUADS;
255 glVertex 0 , 0;
256 glVertex 0 , $h;
257 glVertex $w, $h;
258 glVertex $w, 0;
259 glEnd;
260}
261
262#############################################################################
263
264package CFClient::Widget::Empty;
265
266our @ISA = CFClient::Widget::;
267
268sub size_request {
269 (0, 0)
270}
271
272sub draw { }
273
274#############################################################################
275
276package CFClient::Widget::Container;
277
278our @ISA = CFClient::Widget::;
279
280sub new {
211 my ($class, @widgets) = @_; 281 my ($class, %arg) = @_;
212 282
283 my $children = delete $arg{children} || [];
284
213 my $self = $class->SUPER::new (children => []); 285 my $self = $class->SUPER::new (children => [], %arg);
214 $self->add ($_) for @widgets; 286 $self->add ($_) for @$children;
215 287
216 $self 288 $self
217} 289}
218 290
219sub add { 291sub add {
220 my ($self, $chld, $expand) = @_; 292 my ($self, $chld, $expand) = @_;
221 293
222 $chld->{expand} = $expand; 294 $chld->{expand} = $expand;
223 $chld->set_parent ($self); 295 $chld->set_parent ($self);
224 296
225 @{$self->{children}} = 297 $self->{children} = [
226 sort { $a->{z} <=> $b->{z} } 298 sort { $a->{z} <=> $b->{z} }
227 @{$self->{children}}, $chld; 299 @{$self->{children}}, $chld
300 ];
228 301
229 $self->size_allocate ($self->{w}, $self->{h}) 302 $self->size_allocate ($self->{w}, $self->{h})
230 if $self->{w}; #TODO: check for "realised state" 303 if $self->{w}; #TODO: check for "realised state"
231} 304}
232 305
… …
260 $_->draw for @{$self->{children}}; 333 $_->draw for @{$self->{children}};
261} 334}
262 335
263############################################################################# 336#############################################################################
264 337
265package Crossfire::Client::Widget::Bin; 338package CFClient::Widget::Bin;
266 339
267our @ISA = Crossfire::Client::Widget::Container::; 340our @ISA = CFClient::Widget::Container::;
341
342sub new {
343 my ($class, %arg) = @_;
344
345 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
346
347 $class->SUPER::new (children => [$child], %arg)
348}
349
350sub add {
351 my ($self, $widget) = @_;
352
353 $self->{children} = [];
354
355 $self->SUPER::add ($widget);
356}
357
358sub remove {
359 my ($self, $widget) = @_;
360
361 $self->SUPER::remove ($widget);
362
363 $self->{children} = [new CFClient::Widget::Empty]
364 unless @{$self->{children}};
365}
268 366
269sub child { $_[0]->{children}[0] } 367sub child { $_[0]->{children}[0] }
270 368
271sub size_request { 369sub size_request {
272 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 370 $_[0]{children}[0]->size_request
273} 371}
274 372
275sub size_allocate { 373sub size_allocate {
276 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
277 375
376 return unless $self->{w} != $w || $self->{h} != $h;
377
278 $self->SUPER::size_allocate ($w, $h); 378 $self->SUPER::size_allocate ($w, $h);
279 $self->{children}[0]->size_allocate ($w, $h) 379 $self->{children}[0]->size_allocate ($w, $h);
280 if $self->{children}[0]
281} 380}
282 381
283############################################################################# 382#############################################################################
284 383
285package Crossfire::Client::Widget::Window; 384package CFClient::Widget::Window;
286 385
287our @ISA = Crossfire::Client::Widget::Bin::; 386our @ISA = CFClient::Widget::Bin::;
288 387
289use SDL::OpenGL; 388use SDL::OpenGL;
290 389
291sub new { 390sub new {
292 my ($class, $x, $y, $z, $w, $h) = @_; 391 my ($class, %arg) = @_;
293 392
294 my $self = $class->SUPER::new; 393 my $self = $class->SUPER::new (%arg);
295
296 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297} 394}
298 395
299sub update { 396sub update {
300 my ($self) = @_; 397 my ($self) = @_;
301 398
399 # we want to do this delayed...
302 $self->render_chld; 400 $self->render_chld;
303 $self->SUPER::update; 401 $self->SUPER::update;
304} 402}
305 403
306sub render_chld { 404sub render_chld {
307 my ($self) = @_; 405 my ($self) = @_;
308 406
309 $self->{texture} = 407 $self->{texture} =
310 Crossfire::Client::Texture->new_from_opengl ( 408 CFClient::Texture->new_from_opengl (
311 $self->{w}, $self->{h}, sub { $self->child->draw } 409 $self->{w}, $self->{h}, sub { $self->child->draw }
312 ); 410 );
313} 411}
314 412
315sub size_allocate { 413sub size_allocate {
316 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
415
416 return unless $self->{w} != $w || $self->{h} != $h;
317 417
318 $self->{w} = $w; 418 $self->{w} = $w;
319 $self->{h} = $h; 419 $self->{h} = $h;
320 420
321 $self->child->size_allocate ($w, $h); 421 $self->child->size_allocate ($w, $h);
… …
332 or return; 432 or return;
333 433
334 glEnable GL_BLEND; 434 glEnable GL_BLEND;
335 glEnable GL_TEXTURE_2D; 435 glEnable GL_TEXTURE_2D;
336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337 glBindTexture GL_TEXTURE_2D, $tex->{name};
338 437
339 glBegin GL_QUADS; 438 $tex->draw_quad (0, 0, $w, $h);
340 glTexCoord 0, 0; glVertex 0, 0;
341 glTexCoord 0, 1; glVertex 0, $h;
342 glTexCoord 1, 1; glVertex $w, $h;
343 glTexCoord 1, 0; glVertex $w, 0;
344 glEnd;
345 439
346 glDisable GL_BLEND; 440 glDisable GL_BLEND;
347 glDisable GL_TEXTURE_2D; 441 glDisable GL_TEXTURE_2D;
348} 442}
349 443
350############################################################################# 444#############################################################################
351 445
352package Crossfire::Client::Widget::Frame; 446package CFClient::Widget::Frame;
353 447
354our @ISA = Crossfire::Client::Widget::Bin::; 448our @ISA = CFClient::Widget::Bin::;
355 449
356use SDL::OpenGL; 450use SDL::OpenGL;
357 451
358sub size_request { 452sub size_request {
359 my ($self) = @_; 453 my ($self) = @_;
… …
366} 460}
367 461
368sub size_allocate { 462sub size_allocate {
369 my ($self, $w, $h) = @_; 463 my ($self, $w, $h) = @_;
370 464
465 return unless $self->{w} != $w || $self->{h} != $h;
466
371 $self->{w} = $w; 467 $self->{w} = $w;
372 $self->{h} = $h; 468 $self->{h} = $h;
373 469
374 $self->child->size_allocate ($w - 4, $h - 4); 470 $self->child->size_allocate ($w - 4, $h - 4);
375 $self->child->move (2, 2); 471 $self->child->move (2, 2);
… …
382 478
383 my ($w, $h) = $chld->size_request; 479 my ($w, $h) = $chld->size_request;
384 480
385 glBegin GL_QUADS; 481 glBegin GL_QUADS;
386 glColor 0, 0, 0; 482 glColor 0, 0, 0;
387 glTexCoord 0, 0; glVertex 0 , 0; 483 glVertex 0 , 0;
388 glTexCoord 0, 1; glVertex 0 , $h + 4; 484 glVertex 0 , $h + 4;
389 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 485 glVertex $w + 4 , $h + 4;
390 glTexCoord 1, 0; glVertex $w + 4 , 0; 486 glVertex $w + 4 , 0;
391 glEnd; 487 glEnd;
392 488
393 $chld->draw; 489 $chld->draw;
394} 490}
395 491
396############################################################################# 492#############################################################################
397 493
398package Crossfire::Client::Widget::FancyFrame; 494package CFClient::Widget::FancyFrame;
399 495
400our @ISA = Crossfire::Client::Widget::Bin::; 496our @ISA = CFClient::Widget::Bin::;
401 497
402use SDL::OpenGL; 498use SDL::OpenGL;
403 499
404my @tex = 500my @tex =
405 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 501 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
406 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 502 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
407 503
408sub size_request { 504sub size_request {
409 my ($self) = @_; 505 my ($self) = @_;
410 506
… …
419} 515}
420 516
421sub size_allocate { 517sub size_allocate {
422 my ($self, $w, $h) = @_; 518 my ($self, $w, $h) = @_;
423 519
520 return unless $self->{w} != $w || $self->{h} != $h;
521
424 $self->SUPER::size_allocate ($w, $h); 522 $self->SUPER::size_allocate ($w, $h);
425 523
426 $h -= $tex[1]->{height}; 524 $h -= $tex[1]->{height};
427 $h -= $tex[4]->{height}; 525 $h -= $tex[4]->{height};
428 $w -= $tex[2]->{width}; 526 $w -= $tex[2]->{width};
429 $w -= $tex[3]->{width}; 527 $w -= $tex[3]->{width};
430 528
431 $h = $h < 0 ? 0 : $h; 529 $h = $h < 0 ? 0 : $h;
432 $w = $w < 0 ? 0 : $w; 530 $w = $w < 0 ? 0 : $w;
433 531
532 my $child = $self->child;
533
434 $self->child->size_allocate ($w, $h); 534 $child->size_allocate ($w, $h);
435 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 535 $child->move ($tex[3]->{width}, $tex[1]->{height});
436} 536}
437 537
438sub _draw { 538sub _draw {
439 my ($self) = @_; 539 my ($self) = @_;
440 540
… …
445 glEnable GL_TEXTURE_2D; 545 glEnable GL_TEXTURE_2D;
446 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
448 548
449 my $top = $tex[1]; 549 my $top = $tex[1];
450 glBindTexture GL_TEXTURE_2D, $top->{name}; 550 $top->draw_quad (0, 0, $w, $top->{height});
451
452 glBegin GL_QUADS;
453 glTexCoord 0, 0; glVertex 0 , 0;
454 glTexCoord 0, 1; glVertex 0 , $top->{height};
455 glTexCoord 1, 1; glVertex $w , $top->{height};
456 glTexCoord 1, 0; glVertex $w , 0;
457 glEnd;
458 551
459 my $left = $tex[3]; 552 my $left = $tex[3];
460 glBindTexture GL_TEXTURE_2D, $left->{name}; 553 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
461
462 glBegin GL_QUADS;
463 glTexCoord 0, 0; glVertex 0 , $top->{height};
464 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
465 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
466 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
467 glEnd;
468 554
469 my $right = $tex[2]; 555 my $right = $tex[2];
470 glBindTexture GL_TEXTURE_2D, $right->{name}; 556 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
471
472 glBegin GL_QUADS;
473 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
474 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
475 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
476 glTexCoord 1, 0; glVertex $w , $top->{height};
477 glEnd;
478 557
479 my $bottom = $tex[4]; 558 my $bottom = $tex[4];
480 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 559 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
481
482 glBegin GL_QUADS;
483 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
484 glTexCoord 0, 1; glVertex 0 , $h;
485 glTexCoord 1, 1; glVertex $w , $h;
486 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
487 glEnd;
488 560
489 my $bg = $tex[0]; 561 my $bg = $tex[0];
490 glBindTexture GL_TEXTURE_2D, $bg->{name}; 562 glBindTexture GL_TEXTURE_2D, $bg->{name};
491 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
492 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 564 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
493 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 565 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
494 566
495 my $rep_x = $cw / $bg->{width}; 567 my $rep_x = $cw / $bg->{width};
496 my $rep_y = $ch / $bg->{height}; 568 my $rep_y = $ch / $bg->{height};
497 569
498 glBegin GL_QUADS; 570 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
499 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
500 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
501 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
502 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
503 glEnd;
504 571
505 glDisable GL_BLEND; 572 glDisable GL_BLEND;
506 glDisable GL_TEXTURE_2D; 573 glDisable GL_TEXTURE_2D;
507 574
508 $self->child->draw; 575 $self->child->draw;
509 576
510} 577}
511 578
512############################################################################# 579#############################################################################
513 580
514package Crossfire::Client::Widget::Table; 581package CFClient::Widget::Table;
515 582
516our @ISA = Crossfire::Client::Widget::Bin::; 583our @ISA = CFClient::Widget::Bin::;
517 584
518use SDL::OpenGL; 585use SDL::OpenGL;
519 586
520sub add { 587sub add {
521 my ($self, $x, $y, $chld) = @_; 588 my ($self, $x, $y, $chld) = @_;
… …
596 } 663 }
597} 664}
598 665
599############################################################################# 666#############################################################################
600 667
601package Crossfire::Client::Widget::VBox; 668package CFClient::Widget::VBox;
602 669
603our @ISA = Crossfire::Client::Widget::Container::; 670our @ISA = CFClient::Widget::Container::;
604 671
605use SDL::OpenGL; 672use SDL::OpenGL;
606 673
607sub size_request { 674sub size_request {
608 my ($self) = @_; 675 my ($self) = @_;
… …
616} 683}
617 684
618sub size_allocate { 685sub size_allocate {
619 my ($self, $w, $h) = @_; 686 my ($self, $w, $h) = @_;
620 687
688 return unless $self->{w} != $w || $self->{h} != $h;
689
621 $self->w ($w); 690 $self->{w} = $w;
622 $self->h ($h); 691 $self->{h} = $h;
623 692
624 my $exp; 693 return unless $self->{h};
625 my @oth; 694
626 # find expand widget 695 my $children = $self->{children};
627 for (@{$self->{children}}) { 696
628 if ($_->{expand}) { 697 my @h = map +($_->size_request)[1], @$children;
629 $exp = $_; 698
630 last; 699 my $req_h = List::Util::sum @h;
700
701 if ($req_h > $h) {
702 # ah well, not enough space
703 $_ = $h[$_] * $h / $req_h for @h;
704 } else {
705 my @exp = grep $_->{expand}, @$children;
706 @exp = @$children unless @exp;
707
708 my %exp = map +($_ => 1), @exp;
709
710 for (0 .. $#$children) {
711 my $child = $children->[$_];
712
713 my $alloc_h = $h[$_];
714 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
715 $h[$_] = $alloc_h;
631 } 716 }
632 push @oth, $_;
633 }
634
635 my ($ow, $oh);
636
637 # get sizes of other widgets
638 for (@oth) {
639 my ($w, $h) = $_->size_request;
640 $oh += $h;
641 if ($ow < $w) { $ow = $w }
642 } 717 }
643 718
644 my $y = 0; 719 my $y = 0;
645 for (@{$self->{children}}) { 720 for (0 .. $#$children) {
721 my $child = $children->[$_];
722 my $h = $h[$_];
646 $_->move (0, $y); 723 $child->move (0, $y);
647
648 if ($_ == $exp) {
649 $_->size_allocate ($w, $h - $oh);
650 $y += $h - $oh;
651 } else {
652 my ($cw, $h) = $_->size_request;
653 $_->size_allocate ($w, $h); 724 $child->size_allocate ($w, $h);
725
654 $y += $h; 726 $y += $h;
655 }
656 } 727 }
657} 728}
658 729
659############################################################################# 730#############################################################################
660 731
661package Crossfire::Client::Widget::Label; 732package CFClient::Widget::Label;
662 733
663our @ISA = Crossfire::Client::Widget::; 734our @ISA = CFClient::Widget::;
664 735
665use SDL::OpenGL; 736use SDL::OpenGL;
666 737
667sub new { 738sub new {
668 my ($class, $x, $y, $z, $height, $text) = @_; 739 my ($class, %arg) = @_;
669 740
741 my $self = $class->SUPER::new (
742 fg => [1, 1, 1],
670 $height ||= $::FONTSIZE; 743 height => $::FONTSIZE,
744 text => "",
745 layout => new CFClient::Layout,
746 %arg
747 );
671 748
672 # TODO: color, and make height, xyz etc. optional
673 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
674
675 $self->set_text ($text); 749 $self->set_text ($self->{text});
676 750
677 $self 751 $self
752}
753
754sub escape_text {
755 local $_ = $_[1];
756
757 s/&/&amp;/g;
758 s/>/&gt;/g;
759 s/</&lt;/g;
760
761 $_[1]
678} 762}
679 763
680sub set_text { 764sub set_text {
681 my ($self, $text) = @_; 765 my ($self, $text) = @_;
682 766
683 $self->{text} = $text; 767 $self->{text} = $text;
684 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 768 $self->{layout}->set_markup ($text);
685 769
770 delete $self->{texture};
686 $self->update; 771 $self->update;
687} 772}
688 773
689sub get_text { 774sub get_text {
690 my ($self, $text) = @_; 775 my ($self, $text) = @_;
… …
693} 778}
694 779
695sub size_request { 780sub size_request {
696 my ($self) = @_; 781 my ($self) = @_;
697 782
783 $self->{layout}->set_width;
784 $self->{layout}->set_height ($self->{height});
785 $self->{layout}->size
698 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 786# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
699 ( 787# (
700 $self->{texture}{width}, 788# $self->{texture}{width},
701 $self->{texture}{height}, 789# $self->{texture}{height},
702 ) 790# )
703 } else { 791# } else {
704 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height}; 792# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
705 793#
706 ($w, $h) 794# ($w, $h)
707 } 795# }
796}
708 797
798sub size_allocate {
799 my ($self, $w, $h) = @_;
800
801 return unless $self->{w} != $w || $self->{h} != $h;
802
803 $self->SUPER::size_allocate ($w, $h);
804 delete $self->{texture};
805}
806
807sub update {
808 my ($self) = @_;
809
810 delete $self->{texture};
811 $self->SUPER::update;
709} 812}
710 813
711sub _draw { 814sub _draw {
712 my ($self) = @_; 815 my ($self) = @_;
713 816
714 my $tex = $self->{texture}; 817 my $tex = $self->{texture} ||= do {
818 $self->{layout}->set_width ($self->{w});
819 new_from_layout CFClient::Texture $self->{layout};
820 };
715 821
716 glEnable GL_BLEND; 822 glEnable GL_BLEND;
717 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 824 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
720 glBindTexture GL_TEXTURE_2D, $tex->{name};
721 826
722 glColor 1, 0, 0, 1; # TODO color 827 glColor @{$self->{fg}};
723 828
724 glBegin GL_QUADS; 829 $tex->draw_quad (0, 0);
725 glTexCoord 0, 0; glVertex 0 , 0;
726 glTexCoord 0, 1; glVertex 0 , $tex->{height};
727 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
728 glTexCoord 1, 0; glVertex $tex->{width}, 0;
729 glEnd;
730 830
731 glDisable GL_BLEND; 831 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D; 832 glDisable GL_TEXTURE_2D;
733} 833}
734 834
735############################################################################# 835#############################################################################
736 836
737package Crossfire::Client::Widget::Entry; 837package CFClient::Widget::Entry;
738 838
739our @ISA = Crossfire::Client::Widget::Label::; 839our @ISA = CFClient::Widget::Label::;
740 840
741use SDL; 841use SDL;
742use SDL::OpenGL; 842use SDL::OpenGL;
743 843
844sub new {
845 my $class = shift;
846
847 $class->SUPER::new (
848 fg => [1, 1, 1],
849 bg => [0, 0, 0, 0.4],
850 active_bg => [1, 1, 1],
851 active_fg => [0, 0, 0],
852 @_
853 )
854}
855
856sub _set_text {
857 my ($self, $text) = @_;
858
859 $self->{last_activity} = $::NOW;
860
861 $self->{text} = $text;
862 $self->{layout}->set_width ($self->{w});
863 $self->{layout}->set_markup ($self->escape_text ($text));
864
865 $text = substr $text, 0, $self->{cursor};
866 utf8::encode $text;
867
868 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
869}
870
871sub size_request {
872 my ($self) = @_;
873
874 my ($w, $h) = $self->SUPER::size_request;
875
876 ($w + 1, $h) # add 1 for cursor
877}
878
879sub size_allocate {
880 my ($self, $w, $h) = @_;
881
882 return unless $self->{w} != $w || $self->{h} != $h;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 $self->_set_text ($self->{text});
887}
888
889sub set_text {
890 my ($self, $text) = @_;
891
892 $self->{cursor} = length $text;
893 $self->_set_text ($text);
894 $self->update;
895}
896
744sub key_down { 897sub key_down {
745 my ($self, $ev) = @_; 898 my ($self, $ev) = @_;
746 899
747 my $mod = $ev->key_mod; 900 my $mod = $ev->key_mod;
748 my $sym = $ev->key_sym; 901 my $sym = $ev->key_sym;
… …
750 my $uni = $ev->key_unicode; 903 my $uni = $ev->key_unicode;
751 904
752 my $text = $self->get_text; 905 my $text = $self->get_text;
753 906
754 if ($sym == SDLK_BACKSPACE) { 907 if ($sym == SDLK_BACKSPACE) {
755 substr $text, -1, 1, ''; 908 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
909 } elsif ($sym == SDLK_DELETE) {
910 substr $text, $self->{cursor}, 1, "";
911 } elsif ($sym == SDLK_LEFT) {
912 --$self->{cursor} if $self->{cursor};
913 } elsif ($sym == SDLK_RIGHT) {
914 ++$self->{cursor} if $self->{cursor} < length $self->{text};
756 } elsif ($uni) { 915 } elsif ($uni) {
757 $text .= chr $uni; 916 substr $text, $self->{cursor}++, 0, chr $uni;
758 print "$uni <$text>\n";#d#
759 } 917 }
760 918
761 $self->set_text ($text); 919 $self->_set_text ($text);
920 $self->update;
921}
922
923sub focus_in {
924 my ($self) = @_;
925
926 $self->{last_activity} = $::NOW;
927
928 $self->SUPER::focus_in;
762} 929}
763 930
764sub button_down { 931sub button_down {
765 my ($self, $ev) = @_; 932 my ($self, $ev, $x, $y) = @_;
766 933
767 $self->focus_in; 934 $self->SUPER::button_down ($ev, $x, $y);
935
936 my $idx = $self->{layout}->xy_to_index ($x, $y);
937
938 # byte-index to char-index
939 my $text = $self->{layout};
940 utf8::encode $text;
941 $self->{cursor} = length substr $text, 0, $idx;
942
943 $self->_set_text ($self->{text});
944 $self->update;
945}
946
947sub mouse_motion {
948 my ($self, $ev, $x, $y) = @_;
949# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
768} 950}
769 951
770sub _draw { 952sub _draw {
771 my ($self) = @_; 953 my ($self) = @_;
772 954
955 local $self->{fg} = $self->{fg};
956
773 if ($FOCUS == $self) { 957 if ($FOCUS == $self) {
774 glColor 1, 1, 1; 958 glColor @{$self->{active_bg}};
959 $self->{fg} = $self->{active_fg};
775 } else { 960 } else {
776 glColor 0.7, 0.7, 0.7; 961 glColor @{$self->{bg}};
777 } 962 }
778 963
779 glBegin GL_QUADS; 964 glBegin GL_QUADS;
780 glVertex 0 , 0; 965 glVertex 0 , 0;
781 glVertex 0 , $self->{h} - 1; 966 glVertex 0 , $self->{h};
782 glVertex $self->{w} - 1, $self->{h} - 1; 967 glVertex $self->{w}, $self->{h};
783 glVertex $self->{w} - 1, 0; 968 glVertex $self->{w}, 0;
784 glEnd; 969 glEnd;
785 970
786 $self->SUPER::_draw; 971 $self->SUPER::_draw;
787}
788 972
789############################################################################# 973 #TODO: force update every cursor change :(
974 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
975 glColor @{$self->{fg}};
976 glBegin GL_LINES;
977 glVertex $self->{cur_x}, $self->{cur_y};
978 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
979 glEnd;
980 }
981}
790 982
983#############################################################################
984
985package CFClient::Widget::Slider;
986
987use strict;
988
989use SDL::OpenGL;
990use SDL::OpenGL::Constants;
991
992our @ISA = CFClient::Widget::DrawBG::;
993
994sub size_request {
995 my ($self) = @_;
996
997 my $w =
998 my $h = 10;
999
1000 $self->{vertical} ? ($h, $w) : ($w, $h)
1001}
1002
1003sub new {
1004 my $class = shift;
1005
1006 # range [value, low, high, page]
1007
1008 $class->SUPER::new (
1009 fg => [1, 1, 1],
1010 active_fg => [0, 0, 0],
1011 range => [0, 0, 100, 10],
1012 vertical => 0,
1013 @_
1014 )
1015}
1016
1017sub _draw {
1018 my ($self) = @_;
1019
1020 $self->SUPER::_draw ();
1021
1022 my ($w, $h) = @$self{qw(w h)};
1023
1024 if ($self->{vertical}) {
1025 # draw a vertical slider like a rotated horizontal slider
1026
1027 glTranslate 0, $self->{w};
1028 glRotate 90, 0, 0, 1;
1029
1030 ($w, $h) = ($h, $w);
1031 }
1032
1033 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1034 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1035
1036 glColor @$fg;
1037 glBegin GL_LINES;
1038 glVertex 0, 0; glVertex 0, $h;
1039 glVertex $w - 1, 0; glVertex $w - 1, $h;
1040 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1041 glEnd;
1042}
1043
1044#############################################################################
1045
791package Crossfire::Client::Widget::MapWidget; 1046package CFClient::Widget::MapWidget;
792 1047
793use strict; 1048use strict;
794 1049
795use List::Util qw(min max); 1050use List::Util qw(min max);
796 1051
797use SDL; 1052use SDL;
798use SDL::OpenGL; 1053use SDL::OpenGL;
799use SDL::OpenGL::Constants; 1054use SDL::OpenGL::Constants;
800 1055
801our @ISA = Crossfire::Client::Widget::; 1056our @ISA = CFClient::Widget::;
1057
1058sub new {
1059 my $class = shift;
1060
1061 $class->SUPER::new (
1062 z => -1,
1063 list => (glGenLists 1),
1064 @_
1065 )
1066}
802 1067
803sub key_down { 1068sub key_down {
804 print "MAPKEYDOWN\n"; 1069 print "MAPKEYDOWN\n";
805} 1070}
806 1071
… …
812 1 + int $::WIDTH / 32, 1077 1 + int $::WIDTH / 32,
813 1 + int $::HEIGHT / 32, 1078 1 + int $::HEIGHT / 32,
814 ) 1079 )
815} 1080}
816 1081
1082sub update {
1083 my ($self) = @_;
1084
1085 $self->{need_update} = 1;
1086}
1087
817sub _draw { 1088sub _draw {
818 my ($self) = @_; 1089 my ($self) = @_;
819 1090
1091 if (delete $self->{need_update}) {
1092 glNewList $self->{list}, GL_COMPILE;
1093
820 my $mx = $::CONN->{mapx}; 1094 my $mx = $::CONN->{mapx};
821 my $my = $::CONN->{mapy}; 1095 my $my = $::CONN->{mapy};
822 1096
823 my $map = $::CONN->{map}; 1097 my $map = $::CONN->{map};
824 1098
825 my ($xofs, $yofs); 1099 my ($xofs, $yofs);
826 1100
827 my $sw = 1 + int $::WIDTH / 32; 1101 my $sw = 1 + int $::WIDTH / 32;
828 my $sh = 1 + int $::HEIGHT / 32; 1102 my $sh = 1 + int $::HEIGHT / 32;
829 1103
830 if ($::CONN->{mapw} > $sw) { 1104 if ($::CONN->{mapw} > $sw) {
831 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1105 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
832 } else { 1106 } else {
833 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1107 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
834 } 1108 }
835 1109
836 if ($::CONN->{maph} > $sh) { 1110 if ($::CONN->{maph} > $sh) {
837 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1111 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
838 } else { 1112 } else {
839 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1113 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
840 } 1114 }
841 1115
842 glEnable GL_TEXTURE_2D; 1116 glEnable GL_TEXTURE_2D;
843 glEnable GL_BLEND; 1117 glEnable GL_BLEND;
844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
845 1119
846 my $sw4 = ($sw + 3) & ~3; 1120 my $sw4 = ($sw + 3) & ~3;
847 my $lighting = "\x00" x ($sw4 * $sh); 1121 my $darkness = "\x00" x ($sw4 * $sh);
848 1122
849 for my $x (0 .. $sw - 1) { 1123 for my $x (0 .. $sw - 1) {
1124 my $row = $map->[$x + $xofs];
850 for my $y (0 .. $sh - 1) { 1125 for my $y (0 .. $sh - 1) {
851 1126
852 my $cell = $map->[$x + $xofs][$y + $yofs] 1127 my $cell = $row->[$y + $yofs]
853 or next; 1128 or next;
854 1129
855 my $darkness = $cell->[0] * (1 / 255); 1130 my $dark = $cell->[0];
856 if ($darkness < 0) { 1131 if ($dark < 0) {
857 $darkness = $cell->[1] ? 0.2 : 0; 1132 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1133 } else {
1134 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
858 } 1135 }
859 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
860 1136
861 for my $num (grep $_, @$cell[1,2,3]) { 1137 for my $num (grep $_, @$cell[1,2,3]) {
862 my $tex = $::CONN->{face}[$num]{texture} || next; 1138 my $tex = $::CONN->{face}[$num]{texture} || next;
863 1139
864 glBindTexture GL_TEXTURE_2D, $tex->{name};
865
866 my $w = $tex->{width}; 1140 my $w = $tex->{width};
867 my $h = $tex->{height}; 1141 my $h = $tex->{height};
868 1142
869 my $px = ($x + 1) * 32 - $w; 1143 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
870 my $py = ($y + 1) * 32 - $h;
871
872 glBegin GL_QUADS;
873 glTexCoord 0, 0; glVertex $px , $py;
874 glTexCoord 0, 1; glVertex $px , $py + $h;
875 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
876 glTexCoord 1, 0; glVertex $px + $w, $py;
877 glEnd; 1144 }
878 } 1145 }
879 } 1146 }
880 }
881 1147
882# if (1) { # higher quality darkness 1148# if (1) { # higher quality darkness
883# $lighting =~ s/(.)/$1$1$1/gs; 1149# $lighting =~ s/(.)/$1$1$1/gs;
884# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1150# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
885# 1151#
… …
887# 1153#
888# $lighting = $pb->get_pixels; 1154# $lighting = $pb->get_pixels;
889# $lighting =~ s/(.)../$1/gs; 1155# $lighting =~ s/(.)../$1/gs;
890# } 1156# }
891 1157
892 $lighting = new Crossfire::Client::Texture
893 width => $sw4,
894 height => $sh,
895 data => $lighting,
896 internalformat => GL_ALPHA,
897 format => GL_ALPHA;
898
899 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1158 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
900 glColor 0.5, 0.5, 0.5, 1;
901 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
902 glBindTexture GL_TEXTURE_2D, $lighting->{name};
903 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
904 glBegin GL_QUADS;
905 glTexCoord 0, 0; glVertex 0 , 0;
906 glTexCoord 0, 1; glVertex 0 , $sh * 32;
907 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
908 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
909 glEnd;
910 1160
1161 $darkness = new CFClient::Texture
1162 width => $sw4,
1163 height => $sh,
1164 data => $darkness,
1165 internalformat => GL_ALPHA,
1166 format => GL_ALPHA;
1167
1168 glColor 0.45, 0.45, 0.45, 1;
1169 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1170
911 glDisable GL_TEXTURE_2D; 1171 glDisable GL_TEXTURE_2D;
912 glDisable GL_BLEND; 1172 glDisable GL_BLEND;
1173
1174 glEndList;
1175 }
1176
1177 glCallList $self->{list};
913} 1178}
914 1179
915my %DIR = ( 1180my %DIR = (
916 SDLK_KP8, [1, "north"], 1181 SDLK_KP8, [1, "north"],
917 SDLK_KP9, [2, "northeast"], 1182 SDLK_KP9, [2, "northeast"],
… …
963 } 1228 }
964} 1229}
965 1230
966############################################################################# 1231#############################################################################
967 1232
968package Crossfire::Client::Widget::Animator; 1233package CFClient::Widget::Animator;
969 1234
970use SDL::OpenGL; 1235use SDL::OpenGL;
971 1236
972our @ISA = Crossfire::Client::Widget::Bin::; 1237our @ISA = CFClient::Widget::Bin::;
973 1238
974sub moveto { 1239sub moveto {
975 my ($self, $x, $y) = @_; 1240 my ($self, $x, $y) = @_;
976 1241
977 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1242 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
978 $self->{speed} = 2; 1243 $self->{speed} = 0.001;
979 $self->{time} = 1; 1244 $self->{time} = 1;
980 1245
981 ::animation_start $self; 1246 ::animation_start $self;
982} 1247}
983 1248
… …
1005 glPopMatrix; 1270 glPopMatrix;
1006} 1271}
1007 1272
1008############################################################################# 1273#############################################################################
1009 1274
1010package Crossfire::Client::Widget::Toplevel; 1275package CFClient::Widget::Toplevel;
1011 1276
1012our @ISA = Crossfire::Client::Widget::Container::; 1277our @ISA = CFClient::Widget::Container::;
1013 1278
1014sub size_request { 1279sub size_request {
1015 ($::WIDTH, $::HEIGHT) 1280 ($::WIDTH, $::HEIGHT)
1016} 1281}
1017 1282
… …
1022 1287
1023 $_->size_allocate ($_->size_request) 1288 $_->size_allocate ($_->size_request)
1024 for @{$self->{children}}; 1289 for @{$self->{children}};
1025} 1290}
1026 1291
1292sub translate {
1293 my ($self, $x, $y) = @_;
1294
1295 ($x, $y)
1296}
1297
1027sub update { 1298sub update {
1028 my ($self) = @_; 1299 my ($self) = @_;
1029 1300
1030 $self->size_allocate ($self->size_request); 1301 $self->size_allocate ($self->size_request);
1031 ::refresh (); 1302 ::refresh ();
… …
1045 $self->_draw; 1316 $self->_draw;
1046} 1317}
1047 1318
1048############################################################################# 1319#############################################################################
1049 1320
1050package Crossfire::Client::Widget; 1321package CFClient::Widget;
1051 1322
1052$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 1323$TOPLEVEL = new CFClient::Widget::Toplevel;
1053 1324
10541 13251
1055 1326

Diff Legend

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