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.26 by elmex, Sat Apr 8 22:23:57 2006 UTC vs.
Revision 1.53 by root, Mon Apr 10 11:56:28 2006 UTC

5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use Crossfire::Client;
11our @ACTIVE_WIDGETS; 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
12 16
13# class methods for events 17# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 20}
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev) if $GRAB;
40}
41
42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab;
53 $GRAB->update if $GRAB;
54 }
55}
56
57sub feed_sdl_motion_event {
58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62
63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget;
65
66 $hover->update if $hover;
67 $HOVER->update if $HOVER;
68 }
69
70 $HOVER->mouse_motion ($ev) if $HOVER;
71}
18 72
19sub new { 73sub new {
20 my $class = shift; 74 my $class = shift;
21 75
22 bless { @_ }, $class 76 bless { @_ }, $class
23}
24
25sub activate {
26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 77}
36 78
37sub move { 79sub move {
38 my ($self, $x, $y, $z) = @_; 80 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 81 $self->{x} = $x;
44sub needs_redraw { 86sub needs_redraw {
45 0 87 0
46} 88}
47 89
48sub size_request { 90sub size_request {
91 require Carp;
49 die "size_request is abtract"; 92 Carp::confess "size_request is abtract";
93}
94
95sub size_allocate {
96 my ($self, $w, $h) = @_;
97
98 $self->{w} = $w;
99 $self->{h} = $h;
50} 100}
51 101
52sub focus_in { 102sub focus_in {
53 my ($widget) = @_; 103 my ($self) = @_;
54 $FOCUS = $widget; 104
105 my $focus = $FOCUS; $FOCUS = $self;
106 $focus->update if $focus;
107 $FOCUS->update;
55} 108}
56 109
57sub focus_out { 110sub focus_out {
58 my ($widget) = @_; 111 my ($self) = @_;
59}
60 112
61sub key_down { 113 return unless $FOCUS == $self;
62 my ($widget, $sdlev) = @_;
63}
64 114
65sub key_up { 115 my $focus = $FOCUS; undef $FOCUS;
66 my ($widget, $sdlev) = @_; 116 $focus->update if $focus; #?
67} 117}
68 118
119sub mouse_motion { }
120sub button_up { }
69sub button_down { 121sub button_down { }
70 my ($widget, $sdlev) = @_; 122sub key_down { }
71} 123sub key_up { }
72 124
73sub button_up { 125sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
74 my ($widget, $sdlev) = @_; 126sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
75}
76
77sub w { $_[0]->{w} }
78sub h { $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 127sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 128sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 129sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82 130
83sub draw { 131sub draw {
84 my ($self) = @_; 132 my ($self) = @_;
85 133
86 glPushMatrix; 134 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 135 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 136 $self->_draw;
137 if ($self == $HOVER) {
138 glColor 1, 1, 1, 0.4;
139 glEnable GL_BLEND;
140 glBegin GL_QUADS;
141 glVertex 0 , 0;
142 glVertex $self->{w}, 0;
143 glVertex $self->{w}, $self->{h};
144 glVertex 0 , $self->{h};
145 glEnd;
146 glDisable GL_BLEND;
147 }
89 glPopMatrix; 148 glPopMatrix;
90} 149}
91 150
92sub _draw { 151sub _draw {
93 my ($widget) = @_; 152 my ($self) = @_;
153
154 warn "no draw defined for $self\n";
94} 155}
95 156
96sub bbox { 157sub bbox {
97 my ($widget) = @_; 158 my ($self) = @_;
159 my ($w, $h) = $self->size_request;
160 (
161 $self->{x},
162 $self->{y},
163 $self->{x} = $w,
164 $self->{y} = $h
165 )
166}
167
168sub find_widget {
169 my ($self, $x, $y) = @_;
170
171 return $self
172 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
173 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
174
175 ()
176}
177
178sub del_parent { $_[0]->{parent} = undef }
179
180sub set_parent {
181 my ($self, $par) = @_;
182
183 $self->{parent} = $par;
184 Scalar::Util::weaken $self->{parent};
185}
186
187sub get_parent {
188 $_[0]->{parent}
189}
190
191sub update {
192 my ($self) = @_;
193
194 $self->{parent}->update
195 if $self->{parent};
98} 196}
99 197
100sub DESTROY { 198sub DESTROY {
101 my ($self) = @_; 199 my ($self) = @_;
102 200
103 $self->deactivate; 201 #$self->deactivate;
104} 202}
203
204#############################################################################
105 205
106package Crossfire::Client::Widget::Container; 206package Crossfire::Client::Widget::Container;
107 207
108our @ISA = Crossfire::Client::Widget::; 208our @ISA = Crossfire::Client::Widget::;
109 209
210sub new {
211 my ($class, @widgets) = @_;
212
213 my $self = $class->SUPER::new (children => []);
214 $self->add ($_) for @widgets;
215
216 $self
217}
218
219sub add {
220 my ($self, $chld, $expand) = @_;
221
222 $chld->{expand} = $expand;
223 $chld->set_parent ($self);
224
225 @{$self->{children}} =
226 sort { $a->{z} <=> $b->{z} }
227 @{$self->{children}}, $chld;
228
229 $self->size_allocate ($self->{w}, $self->{h})
230 if $self->{w}; #TODO: check for "realised state"
231}
232
233sub remove {
234 my ($self, $widget) = @_;
235
236 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
237
238 $self->size_allocate ($self->{w}, $self->{h});
239}
240
241sub find_widget {
242 my ($self, $x, $y) = @_;
243
244 $x -= $self->{x};
245 $y -= $self->{y};
246
247 my $res;
248
249 for (reverse @{ $self->{children} }) {
250 $res = $_->find_widget ($x, $y)
251 and return $res;
252 }
253
254 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
255}
256
257sub _draw {
258 my ($self) = @_;
259
260 $_->draw for @{$self->{children}};
261}
262
263#############################################################################
264
265package Crossfire::Client::Widget::Bin;
266
267our @ISA = Crossfire::Client::Widget::Container::;
268
269sub child { $_[0]->{children}[0] }
270
271sub size_request {
272 $_[0]{children}[0]->size_request if $_[0]{children}[0];
273}
274
275sub size_allocate {
276 my ($self, $w, $h) = @_;
277
278 $self->SUPER::size_allocate ($w, $h);
279 $self->{children}[0]->size_allocate ($w, $h)
280 if $self->{children}[0]
281}
282
283#############################################################################
284
285package Crossfire::Client::Widget::Window;
286
287our @ISA = Crossfire::Client::Widget::Bin::;
288
110use SDL::OpenGL; 289use SDL::OpenGL;
111 290
112sub add { $_[0]->{child} = $_[1] } 291sub new {
113sub get { $_[0]->{child} } 292 my ($class, $x, $y, $z, $w, $h) = @_;
114 293
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 294 my $self = $class->SUPER::new;
116 295
117sub _draw { die "Containers can't be drawn!" } 296 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297}
118 298
119package Crossfire::Client::Widget::Window; 299sub update {
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 300 my ($self) = @_;
127 $self->SUPER::add ($chld); 301
128 $self->render_chld; #TODO: Move this to the size_request event propably? 302 $self->render_chld;
303 $self->SUPER::update;
129} 304}
130 305
131sub render_chld { 306sub render_chld {
132 my ($self) = @_; 307 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 308
136 $self->{texture} = 309 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 310 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 311 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 312 );
140 $self->{texture}->upload;
141} 313}
142 314
143sub size_request { 315sub size_allocate {
144 my ($self) = @_; 316 my ($self, $w, $h) = @_;
145 my $chld = $self->get 317
146 or return (0, 0); 318 $self->{w} = $w;
147 $chld->size_request 319 $self->{h} = $h;
320
321 $self->child->size_allocate ($w, $h);
322
323 $self->render_chld;
148} 324}
149 325
150sub _draw { 326sub _draw {
151 my ($self) = @_; 327 my ($self) = @_;
152 328
153 my ($w, $h) = $self->size_request;#TODO# use widht/height of texture 329 my ($w, $h) = ($self->w, $self->h);
330
154 my $tex = $self->{texture} 331 my $tex = $self->{texture}
155 or return; 332 or return;
156 333
157 glEnable GL_BLEND; 334 glEnable GL_BLEND;
158 glEnable GL_TEXTURE_2D; 335 glEnable GL_TEXTURE_2D;
159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
160 glBindTexture GL_TEXTURE_2D, $tex->{name}; 337 glBindTexture GL_TEXTURE_2D, $tex->{name};
161
162 glColor 1, 1, 1;
163 338
164 glBegin GL_QUADS; 339 glBegin GL_QUADS;
165 glTexCoord 0, 0; glVertex 0, 0; 340 glTexCoord 0, 0; glVertex 0, 0;
166 glTexCoord 0, 1; glVertex 0, $h; 341 glTexCoord 0, 1; glVertex 0, $h;
167 glTexCoord 1, 1; glVertex $w, $h; 342 glTexCoord 1, 1; glVertex $w, $h;
170 345
171 glDisable GL_BLEND; 346 glDisable GL_BLEND;
172 glDisable GL_TEXTURE_2D; 347 glDisable GL_TEXTURE_2D;
173} 348}
174 349
350#############################################################################
351
175package Crossfire::Client::Widget::Frame; 352package Crossfire::Client::Widget::Frame;
176 353
177our @ISA = Crossfire::Client::Widget::Container::; 354our @ISA = Crossfire::Client::Widget::Bin::;
178 355
179use SDL::OpenGL; 356use SDL::OpenGL;
180 357
181sub size_request { 358sub size_request {
182 my ($self) = @_; 359 my ($self) = @_;
183 my $chld = $self->get 360 my $chld = $self->child
184 or return (0, 0); 361 or return (0, 0);
362
363 $chld->move (2, 2);
364
185 map { $_ + 4 } $chld->size_request; 365 map { $_ + 4 } $chld->size_request;
186} 366}
187 367
368sub size_allocate {
369 my ($self, $w, $h) = @_;
370
371 $self->{w} = $w;
372 $self->{h} = $h;
373
374 $self->child->size_allocate ($w - 4, $h - 4);
375 $self->child->move (2, 2);
376}
377
188sub _draw { 378sub _draw {
189 my ($self) = @_; 379 my ($self) = @_;
190 380
191 my $chld = $self->get; 381 my $chld = $self->child;
192
193 $chld->move (2, 2, 0); #TODO:move to size_request
194 382
195 my ($w, $h) = $chld->size_request; 383 my ($w, $h) = $chld->size_request;
196 384
197 glColor 1, 0, 0;
198 glBegin GL_QUADS; 385 glBegin GL_QUADS;
386 glColor 0, 0, 0;
199 glTexCoord 0, 0; glVertex 0 , 0; 387 glTexCoord 0, 0; glVertex 0 , 0;
200 glTexCoord 0, 1; glVertex 0 , $h + 4; 388 glTexCoord 0, 1; glVertex 0 , $h + 4;
201 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 389 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
202 glTexCoord 1, 0; glVertex $w + 4 , 0; 390 glTexCoord 1, 0; glVertex $w + 4 , 0;
203 glEnd; 391 glEnd;
204 392
205 $chld->draw; 393 $chld->draw;
206} 394}
207 395
396#############################################################################
397
398package Crossfire::Client::Widget::FancyFrame;
399
400our @ISA = Crossfire::Client::Widget::Bin::;
401
402use SDL::OpenGL;
403
404my @tex =
405 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
406 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
407
408sub size_request {
409 my ($self) = @_;
410
411 my ($w, $h) = $self->SUPER::size_request;
412
413 $h += $tex[1]->{height};
414 $h += $tex[4]->{height};
415 $w += $tex[2]->{width};
416 $w += $tex[3]->{width};
417
418 ($w, $h)
419}
420
421sub size_allocate {
422 my ($self, $w, $h) = @_;
423
424 $self->SUPER::size_allocate ($w, $h);
425
426 $h -= $tex[1]->{height};
427 $h -= $tex[4]->{height};
428 $w -= $tex[2]->{width};
429 $w -= $tex[3]->{width};
430
431 $h = $h < 0 ? 0 : $h;
432 $w = $w < 0 ? 0 : $w;
433
434 $self->child->size_allocate ($w, $h);
435 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
436}
437
438sub _draw {
439 my ($self) = @_;
440
441 my ($w, $h) = ($self->{w}, $self->{h});
442 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
443
444 glEnable GL_BLEND;
445 glEnable GL_TEXTURE_2D;
446 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
448
449 my $top = $tex[1];
450 glBindTexture GL_TEXTURE_2D, $top->{name};
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
459 my $left = $tex[3];
460 glBindTexture GL_TEXTURE_2D, $left->{name};
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
469 my $right = $tex[2];
470 glBindTexture GL_TEXTURE_2D, $right->{name};
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
479 my $bottom = $tex[4];
480 glBindTexture GL_TEXTURE_2D, $bottom->{name};
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
489 my $bg = $tex[0];
490 glBindTexture GL_TEXTURE_2D, $bg->{name};
491 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
492 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
493 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
494
495 my $rep_x = $cw / $bg->{width};
496 my $rep_y = $ch / $bg->{height};
497
498 glBegin GL_QUADS;
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
505 glDisable GL_BLEND;
506 glDisable GL_TEXTURE_2D;
507
508 $self->child->draw;
509
510}
511
512#############################################################################
513
208package Crossfire::Client::Widget::Table; 514package Crossfire::Client::Widget::Table;
209 515
210our @ISA = Crossfire::Client::Widget::Container::; 516our @ISA = Crossfire::Client::Widget::Bin::;
211 517
212use SDL::OpenGL; 518use SDL::OpenGL;
213 519
214sub add { 520sub add {
215 my ($self, $x, $y, $chld) = @_; 521 my ($self, $x, $y, $chld) = @_;
522 my $old_chld = $self->{children}[$y][$x];
523
216 $self->{childs}[$y][$x] = $chld; 524 $self->{children}[$y][$x] = $chld;
525 $chld->set_parent ($self);
526 $self->update;
217} 527}
218 528
219sub max_row_height { 529sub max_row_height {
220 my ($self, $row) = @_; 530 my ($self, $row) = @_;
221 531
222 my $hs = 0; 532 my $hs = 0;
223 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 533 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
224 my $c = $self->{childs}->[$row]->[$xi]; 534 my $c = $self->{children}->[$row]->[$xi];
225 if ($c) { 535 if ($c) {
226 my ($w, $h) = $c->size_request; 536 my ($w, $h) = $c->size_request;
227 if ($hs < $h) { $hs = $h } 537 if ($hs < $h) { $hs = $h }
228 } 538 }
229 } 539 }
232 542
233sub max_col_width { 543sub max_col_width {
234 my ($self, $col) = @_; 544 my ($self, $col) = @_;
235 545
236 my $ws = 0; 546 my $ws = 0;
237 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 547 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
238 my $c = ($self->{childs}->[$yi] || [])->[$col]; 548 my $c = ($self->{children}->[$yi] || [])->[$col];
239 if ($c) { 549 if ($c) {
240 my ($w, $h) = $c->size_request; 550 my ($w, $h) = $c->size_request;
241 if ($ws < $w) { $ws = $w } 551 if ($ws < $w) { $ws = $w }
242 } 552 }
243 } 553 }
247sub size_request { 557sub size_request {
248 my ($self) = @_; 558 my ($self) = @_;
249 559
250 my ($hs, $ws) = (0, 0); 560 my ($hs, $ws) = (0, 0);
251 561
252 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 562 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
253 $hs += $self->max_row_height ($yi); 563 $hs += $self->max_row_height ($yi);
254 } 564 }
255 565
256 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 566 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
257 my $wm = 0; 567 my $wm = 0;
258 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 568 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
259 $wm += $self->max_col_width ($xi) 569 $wm += $self->max_col_width ($xi)
260 } 570 }
261 if ($ws < $wm) { $ws = $wm } 571 if ($ws < $wm) { $ws = $wm }
262 } 572 }
263 573
266 576
267sub _draw { 577sub _draw {
268 my ($self) = @_; 578 my ($self) = @_;
269 579
270 my $y = 0; 580 my $y = 0;
271 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 581 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
272 my $x = 0; 582 my $x = 0;
273 583
274 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
275 585
276 my $c = $self->{childs}->[$yi]->[$xi]; 586 my $c = $self->{children}->[$yi]->[$xi];
277 if ($c) { 587 if ($c) {
278 $c->move ($x, $y, 0); #TODO: Move to size_request 588 $c->move ($x, $y, 0); #TODO: Move to size_request
279 $c->draw if $c; 589 $c->draw if $c;
280 } 590 }
281 591
284 594
285 $y += $self->max_row_height ($yi); 595 $y += $self->max_row_height ($yi);
286 } 596 }
287} 597}
288 598
599#############################################################################
600
289package Crossfire::Client::Widget::VBox; 601package Crossfire::Client::Widget::VBox;
290 602
291our @ISA = Crossfire::Client::Widget::Container::; 603our @ISA = Crossfire::Client::Widget::Container::;
292 604
293use SDL::OpenGL; 605use SDL::OpenGL;
294 606
295sub add {
296 my ($self, $chld) = @_;
297 push @{$self->{childs}}, $chld;
298}
299
300sub size_request { 607sub size_request {
301 my ($self) = @_; 608 my ($self) = @_;
302 609
303 my ($hs, $ws) = (0, 0); 610 my @alloc = map [$_->size_request], @{$self->{children}};
611
612 (
613 (List::Util::max map $_->[0], @alloc),
614 (List::Util::sum map $_->[1], @alloc),
615 )
616}
617
618sub size_allocate {
619 my ($self, $w, $h) = @_;
620
621 $self->w ($w);
622 $self->h ($h);
623
624 my $exp;
625 my @oth;
626 # find expand widget
304 for (@{$self->{childs} || []}) { 627 for (@{$self->{children}}) {
628 if ($_->{expand}) {
629 $exp = $_;
630 last;
631 }
632 push @oth, $_;
633 }
634
635 my ($ow, $oh);
636
637 # get sizes of other widgets
638 for (@oth) {
305 my ($w, $h) = $_->size_request; 639 my ($w, $h) = $_->size_request;
306 $hs += $h; 640 $oh += $h;
307 if ($ws < $w) { $ws = $w } 641 if ($ow < $w) { $ow = $w }
308 } 642 }
309 643
310 return ($ws, $hs); 644 my $y = 0;
311}
312
313sub _draw {
314 my ($self) = @_;
315
316 my ($x, $y);
317 for (@{$self->{childs} || []}) { 645 for (@{$self->{children}}) {
318 $_->move (0, $y, 0); #TODO: move to size_request 646 $_->move (0, $y);
319 $_->draw; 647
648 if ($_ == $exp) {
649 $_->size_allocate ($w, $h - $oh);
650 $y += $h - $oh;
651 } else {
320 my ($w, $h) = $_->size_request; 652 my ($cw, $h) = $_->size_request;
653 $_->size_allocate ($w, $h);
321 $y += $h; 654 $y += $h;
655 }
322 } 656 }
323} 657}
658
659#############################################################################
324 660
325package Crossfire::Client::Widget::Label; 661package Crossfire::Client::Widget::Label;
326 662
327our @ISA = Crossfire::Client::Widget::; 663our @ISA = Crossfire::Client::Widget::;
328 664
329use SDL::OpenGL; 665use SDL::OpenGL;
330 666
331sub new { 667sub new {
332 my ($class, $x, $y, $z, $ttf, $text) = @_; 668 my ($class, $x, $y, $z, $height, $text) = @_;
333 669
670 $height ||= $::FONTSIZE;
671
672 # TODO: color, and make height, xyz etc. optional
334 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); 673 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
335 674
336 $self->set_text ($text); 675 $self->set_text ($text);
337 676
338 $self 677 $self
339} 678}
340 679
341sub set_text { 680sub set_text {
342 my ($self, $text) = @_; 681 my ($self, $text) = @_;
682
683 $self->{text} = $text;
343 $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; 684 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
685
686 $self->update;
344} 687}
345 688
346sub get_text { 689sub get_text {
347 my ($self, $text) = @_; 690 my ($self, $text) = @_;
691
348 $self->{text} 692 $self->{text}
349} 693}
350 694
351sub size_request { 695sub size_request {
352 my ($self) = @_; 696 my ($self) = @_;
353 697
354 ( 698 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
699 (
355 $self->{texture}{width}, 700 $self->{texture}{width},
356 $self->{texture}{height}, 701 $self->{texture}{height},
702 )
703 } else {
704 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
705
706 ($w, $h)
357 ) 707 }
708
358} 709}
359 710
360sub _draw { 711sub _draw {
361 my ($self) = @_; 712 my ($self) = @_;
362 713
363 my $tex = $self->{texture}; 714 my $tex = $self->{texture};
364 715
365 glEnable GL_BLEND; 716 glEnable GL_BLEND;
366 glEnable GL_TEXTURE_2D; 717 glEnable GL_TEXTURE_2D;
718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
367 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL; 719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
368 glBindTexture GL_TEXTURE_2D, $tex->{name}; 720 glBindTexture GL_TEXTURE_2D, $tex->{name};
369 721
370 glColor 1, 0, 1; 722 glColor 1, 0, 0, 1; # TODO color
371 723
372 glBegin GL_QUADS; 724 glBegin GL_QUADS;
373 glTexCoord 0, 0; glVertex 0 , 0; 725 glTexCoord 0, 0; glVertex 0 , 0;
374 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 726 glTexCoord 0, 1; glVertex 0 , $tex->{height};
375 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 727 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
378 730
379 glDisable GL_BLEND; 731 glDisable GL_BLEND;
380 glDisable GL_TEXTURE_2D; 732 glDisable GL_TEXTURE_2D;
381} 733}
382 734
735#############################################################################
736
383package Crossfire::Client::Widget::TextView; 737package Crossfire::Client::Widget::Entry;
384 738
385use strict;
386
387our @ISA = qw/Crossfire::Client::Widget/; 739our @ISA = Crossfire::Client::Widget::Label::;
388 740
741use SDL;
389use SDL::OpenGL; 742use SDL::OpenGL;
390use SDL::OpenGL::Constants;
391 743
392sub add_line { 744sub key_down {
393 my ($self, $line) = @_; 745 my ($self, $ev) = @_;
394 push @{$self->{lines}}, $line; 746
747 my $mod = $ev->key_mod;
748 my $sym = $ev->key_sym;
749
750 my $uni = $ev->key_unicode;
751
752 my $text = $self->get_text;
753
754 if ($sym == SDLK_BACKSPACE) {
755 substr $text, -1, 1, '';
756 } elsif ($uni) {
757 $text .= chr $uni;
758 print "$uni <$text>\n";#d#
759 }
760
761 $self->set_text ($text);
762}
763
764sub button_down {
765 my ($self, $ev) = @_;
766
767 $self->focus_in;
395} 768}
396 769
397sub _draw { 770sub _draw {
398 my ($self) = @_; 771 my ($self) = @_;
399 772
773 if ($FOCUS == $self) {
774 glColor 1, 1, 1;
775 } else {
776 glColor 0.7, 0.7, 0.7;
777 }
778
779 glBegin GL_QUADS;
780 glVertex 0 , 0;
781 glVertex 0 , $self->{h} - 1;
782 glVertex $self->{w} - 1, $self->{h} - 1;
783 glVertex $self->{w} - 1, 0;
784 glEnd;
785
786 $self->SUPER::_draw;
400} 787}
788
789#############################################################################
401 790
402package Crossfire::Client::Widget::MapWidget; 791package Crossfire::Client::Widget::MapWidget;
403 792
404use strict; 793use strict;
405 794
416} 805}
417 806
418sub key_up { 807sub key_up {
419} 808}
420 809
810sub size_request {
811 (
812 1 + int $::WIDTH / 32,
813 1 + int $::HEIGHT / 32,
814 )
815}
816
421sub _draw { 817sub _draw {
422 my ($self) = @_; 818 my ($self) = @_;
423 819
424 my $mx = $::CONN->{mapx}; 820 my $mx = $::CONN->{mapx};
425 my $my = $::CONN->{mapy}; 821 my $my = $::CONN->{mapy};
430 826
431 my $sw = 1 + int $::WIDTH / 32; 827 my $sw = 1 + int $::WIDTH / 32;
432 my $sh = 1 + int $::HEIGHT / 32; 828 my $sh = 1 + int $::HEIGHT / 32;
433 829
434 if ($::CONN->{mapw} > $sw) { 830 if ($::CONN->{mapw} > $sw) {
435 $xofs = ($sw - $::CONN->{mapw}) * 0.5; 831 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
436 } else { 832 } else {
437 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 833 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
438 } 834 }
439 835
440 if ($::CONN->{maph} > $sh) { 836 if ($::CONN->{maph} > $sh) {
441 $yofs = ($sh - $::CONN->{maph}) * 0.5; 837 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
442 } else { 838 } else {
443 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 839 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
444 } 840 }
445 841
446 glEnable GL_TEXTURE_2D; 842 glEnable GL_TEXTURE_2D;
447 glEnable GL_BLEND; 843 glEnable GL_BLEND;
448 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
449 845
450 warn "<$mx,$my> <$xofs,$yofs>\n";#d# 846 my $sw4 = ($sw + 3) & ~3;
847 my $lighting = "\x00" x ($sw4 * $sh);
451 848
452 for my $x (0 .. $sw - 1) { 849 for my $x (0 .. $sw - 1) {
453 for my $y (0 .. $sh - 1) { 850 for my $y (0 .. $sh - 1) {
454 851
455 my $cell = $map->[$x + $xofs][$y + $yofs] 852 my $cell = $map->[$x + $xofs][$y + $yofs]
456 or next; 853 or next;
457 854
458 my $darkness = $cell->[0] * (1 / 255); 855 my $darkness = $cell->[0] * (1 / 255);
459 if ($darkness < 0) { 856 if ($darkness < 0) {
460 glColor 0.3, 0.3, 0.3; 857 $darkness = $cell->[1] ? 0.2 : 0;
461 } else {
462 glColor $darkness, $darkness, $darkness;
463 } 858 }
859 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
464 860
465 for my $num (grep $_, @$cell[1,2,3]) { 861 for my $num (grep $_, @$cell[1,2,3]) {
466 my $tex = $::CONN->{face}[$num]{texture} || next; 862 my $tex = $::CONN->{face}[$num]{texture} || next;
467 863
468 glBindTexture GL_TEXTURE_2D, $tex->{name}; 864 glBindTexture GL_TEXTURE_2D, $tex->{name};
480 glTexCoord 1, 0; glVertex $px + $w, $py; 876 glTexCoord 1, 0; glVertex $px + $w, $py;
481 glEnd; 877 glEnd;
482 } 878 }
483 } 879 }
484 } 880 }
881
882# if (1) { # higher quality darkness
883# $lighting =~ s/(.)/$1$1$1/gs;
884# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
885#
886# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
887#
888# $lighting = $pb->get_pixels;
889# $lighting =~ s/(.)../$1/gs;
890# }
891
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;
900 glColor 0.5, 0.5, 0.5, 1;
901 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;
485 910
486 glDisable GL_TEXTURE_2D; 911 glDisable GL_TEXTURE_2D;
487 glDisable GL_BLEND; 912 glDisable GL_BLEND;
488} 913}
489 914
536 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 961 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
537 $::CONN->send ("command run_stop"); 962 $::CONN->send ("command run_stop");
538 } 963 }
539} 964}
540 965
5411; 966#############################################################################
542 967
968package Crossfire::Client::Widget::Animator;
969
970use SDL::OpenGL;
971
972our @ISA = Crossfire::Client::Widget::Bin::;
973
974sub moveto {
975 my ($self, $x, $y) = @_;
976
977 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
978 $self->{speed} = 2;
979 $self->{time} = 1;
980
981 ::animation_start $self;
982}
983
984sub animate {
985 my ($self, $interval) = @_;
986
987 $self->{time} -= $interval * $self->{speed};
988 if ($self->{time} <= 0) {
989 $self->{time} = 0;
990 ::animation_stop $self;
991 }
992
993 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
994
995 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
996 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
997}
998
999sub _draw {
1000 my ($self) = @_;
1001
1002 glPushMatrix;
1003 glRotate $self->{time} * 1000, 0, 1, 0;
1004 $self->{children}[0]->draw;
1005 glPopMatrix;
1006}
1007
1008#############################################################################
1009
1010package Crossfire::Client::Widget::Toplevel;
1011
1012our @ISA = Crossfire::Client::Widget::Container::;
1013
1014sub size_request {
1015 ($::WIDTH, $::HEIGHT)
1016}
1017
1018sub size_allocate {
1019 my ($self, $w, $h) = @_;
1020
1021 $self->SUPER::size_allocate ($w, $h);
1022
1023 $_->size_allocate ($_->size_request)
1024 for @{$self->{children}};
1025}
1026
1027sub update {
1028 my ($self) = @_;
1029
1030 $self->size_allocate ($self->size_request);
1031 ::refresh ();
1032}
1033
1034sub add {
1035 my ($self, $widget) = @_;
1036
1037 $self->SUPER::add ($widget);
1038
1039 $widget->size_allocate ($widget->size_request);
1040}
1041
1042sub draw {
1043 my ($self) = @_;
1044
1045 $self->_draw;
1046}
1047
1048#############################################################################
1049
1050package Crossfire::Client::Widget;
1051
1052$TOPLEVEL = new Crossfire::Client::Widget::Toplevel;
1053
10541
1055

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines