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.30 by root, Sun Apr 9 00:18:45 2006 UTC vs.
Revision 1.40 by root, Sun Apr 9 21:41:11 2006 UTC

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 10our $FOCUS; # the widget with current focus
11our @ACTIVE_WIDGETS;
12 11
13# class methods for events 12# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 15sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 16sub feed_sdl_button_up_event { }
18 17
19sub new { 18sub new {
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 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} 22}
36 23
37sub move { 24sub move {
38 my ($self, $x, $y, $z) = @_; 25 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 26 $self->{x} = $x;
44sub needs_redraw { 31sub needs_redraw {
45 0 32 0
46} 33}
47 34
48sub size_request { 35sub size_request {
36 require Carp;
49 die "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38}
39
40sub size_allocate {
41 my ($self, $w, $h) = @_;
42
43 $self->{w} = $w;
44 $self->{h} = $h;
50} 45}
51 46
52sub focus_in { 47sub focus_in {
53 my ($widget) = @_; 48 my ($widget) = @_;
54 $FOCUS = $widget; 49 $FOCUS = $widget;
72 67
73sub button_up { 68sub button_up {
74 my ($widget, $sdlev) = @_; 69 my ($widget, $sdlev) = @_;
75} 70}
76 71
77sub w { $_[0]->{w} } 72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 77
83sub draw { 78sub draw {
88 $self->_draw; 83 $self->_draw;
89 glPopMatrix; 84 glPopMatrix;
90} 85}
91 86
92sub _draw { 87sub _draw {
93 my ($widget) = @_; 88 my ($self) = @_;
89
90 warn "no draw defined for $self\n";
94} 91}
95 92
96sub bbox { 93sub bbox {
97 my ($widget) = @_; 94 my ($self) = @_;
95 my ($w, $h) = $self->size_request;
96 (
97 $self->{x},
98 $self->{y},
99 $self->{x} = $w,
100 $self->{y} = $h
101 )
102}
103
104sub find_widget {
105 my ($self, $x, $y) = @_;
106
107 return $self
108 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
109 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
110
111 ()
112}
113
114sub del_parent { $_[0]->{parent} = undef }
115
116sub set_parent {
117 my ($self, $par) = @_;
118
119 $self->{parent} = $par;
120 Scalar::Util::weaken $self->{parent};
121}
122
123sub get_parent {
124 $_[0]->{parent}
125}
126
127sub update {
128 my ($self) = @_;
129
130 $self->{parent}->update
131 if $self->{parent};
98} 132}
99 133
100sub DESTROY { 134sub DESTROY {
101 my ($self) = @_; 135 my ($self) = @_;
102 136
103 $self->deactivate; 137 #$self->deactivate;
104} 138}
139
140#############################################################################
105 141
106package Crossfire::Client::Widget::Container; 142package Crossfire::Client::Widget::Container;
107 143
108our @ISA = Crossfire::Client::Widget::; 144our @ISA = Crossfire::Client::Widget::;
109 145
110use SDL::OpenGL; 146sub new {
147 my ($class, @widgets) = @_;
111 148
112sub add { $_[0]->{child} = $_[1] } 149 my $self = $class->SUPER::new (children => []);
150 $self->add ($_) for @widgets;
151
152 $self
153}
154
155sub add {
156 my ($self, $chld, $expand) = @_;
157
158 $chld->{expand} = $expand;
159 $chld->set_parent ($self);
160
161 @{$self->{children}} =
162 sort { $a->{z} <=> $b->{z} }
163 @{$self->{children}}, $chld;
164
165 $self->size_allocate ($self->{w}, $self->{h});
166}
167
168sub remove {
169 my ($self, $widget) = @_;
170
171 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
172
173 $self->size_allocate ($self->{w}, $self->{h});
174}
175
176sub find_widget {
177 my ($self, $x, $y) = @_;
178
179 my $res;
180
181 for (@{ $self->{children} }) {
182 $res = $_->find_widget ($x, $y)
183 and return $res;
184 }
185
186 ()
187}
188
189sub size_request {
190 my ($self) = @_;
191
192 my ($hs, $ws) = (0, 0);
193 for (@{$self->{children} || []}) {
194 my ($w, $h) = $_->size_request;
195 $hs += $h;
196 if ($ws < $w) { $ws = $w }
197 }
198
199 return ($ws, $hs);
200}
201
202sub _draw {
203 my ($self) = @_;
204
205 $_->draw for @{$self->{children}};
206}
207
208#############################################################################
209
210package Crossfire::Client::Widget::Bin;
211
212our @ISA = Crossfire::Client::Widget::Container::;
213
113sub get { $_[0]->{child} } 214sub child { $_[0]->{children}[0] }
114 215
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 216sub size_request {
217 $_[0]{children}[0]->size_request if $_[0]{children}[0];
218}
116 219
117sub _draw { die "Containers can't be drawn!" } 220sub size_allocate {
221 my ($self, $w, $h) = @_;
222 $self->SUPER::size_allocate ($w, $h);
223 $self->{children}[0]->size_allocate ($w, $h)
224 if $self->{children}[0]
225}
226
227#############################################################################
228
229package Crossfire::Client::Widget::Toplevel;
230
231our @ISA = Crossfire::Client::Widget::Container::;
232
233sub update {
234 my ($self) = @_;
235
236 ::refresh ();
237}
238
239#############################################################################
118 240
119package Crossfire::Client::Widget::Window; 241package Crossfire::Client::Widget::Window;
120 242
121our @ISA = Crossfire::Client::Widget::Container::; 243our @ISA = Crossfire::Client::Widget::Bin::;
122 244
123use SDL::OpenGL; 245use SDL::OpenGL;
124 246
125sub add { 247sub add {
126 my ($self, $chld) = @_; 248 my ($self, $chld) = @_;
249 warn "ADD $chld\n";
127 $self->SUPER::add ($chld); 250 $self->SUPER::add ($chld);
128 $self->render_chld; #TODO: Move this to the size_request event propably? 251 $chld->set_parent ($self);
252}
253
254sub remove {
255 my ($self) = @_;
256 # TODO FIXME: removing a child from a window will crash, see render_chld
257 # $self->update;
258}
259
260sub update {
261 my ($self) = @_;
262 $self->render_chld;
129} 263}
130 264
131sub render_chld { 265sub render_chld {
132 my ($self) = @_; 266 my ($self) = @_;
133 my $chld = $self->get; 267 my $chld = $self->get;
134 my ($w, $h) = $self->size_request; 268 my ($w, $h) = $self->size_request;
135 269
270 require Carp;
271 Carp::cluck "RENDERCHI $w $h";
272 warn "RENDERCHI $w $h\n";
136 $self->{texture} = 273 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 274 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 275 $w, $h, sub { $chld->draw }
139 ); 276 );
140 $self->{texture}->upload; 277 $self->{texture}->upload;
141} 278}
142 279
143sub size_request { 280sub size_request {
144 my ($self) = @_; 281 my ($self) = @_;
145 my $chld = $self->get 282 ($self->w, $self->h)
146 or return (0, 0); 283}
147 $chld->size_request 284
285sub size_allocate {
286 my ($self, $w, $h) = @_;
287
288 $self->w ($w);
289 $self->h ($h);
290 $self->get->size_allocate ($w, $h);
291
292 $self->update; #TODO: Move this to the size_request event propably?
148} 293}
149 294
150sub _draw { 295sub _draw {
151 my ($self) = @_; 296 my ($self) = @_;
152 297
153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 298 my ($w, $h) = ($self->w, $self->h);
154 299
155 my $tex = $self->{texture} 300 my $tex = $self->{texture}
156 or return; 301 or return;
157 302
158 glEnable GL_BLEND; 303 glEnable GL_BLEND;
159 glEnable GL_TEXTURE_2D; 304 glEnable GL_TEXTURE_2D;
160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 305 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
161 glBindTexture GL_TEXTURE_2D, $tex->{name}; 306 glBindTexture GL_TEXTURE_2D, $tex->{name};
162
163 glColor 1, 1, 1;
164 307
165 glBegin GL_QUADS; 308 glBegin GL_QUADS;
166 glTexCoord 0, 0; glVertex 0, 0; 309 glTexCoord 0, 0; glVertex 0, 0;
167 glTexCoord 0, 1; glVertex 0, $h; 310 glTexCoord 0, 1; glVertex 0, $h;
168 glTexCoord 1, 1; glVertex $w, $h; 311 glTexCoord 1, 1; glVertex $w, $h;
171 314
172 glDisable GL_BLEND; 315 glDisable GL_BLEND;
173 glDisable GL_TEXTURE_2D; 316 glDisable GL_TEXTURE_2D;
174} 317}
175 318
319#############################################################################
320
176package Crossfire::Client::Widget::Frame; 321package Crossfire::Client::Widget::Frame;
177 322
178our @ISA = Crossfire::Client::Widget::Container::; 323our @ISA = Crossfire::Client::Widget::Bin::;
179 324
180use SDL::OpenGL; 325use SDL::OpenGL;
181 326
182sub size_request { 327sub size_request {
183 my ($self) = @_; 328 my ($self) = @_;
184 my $chld = $self->get 329 my $chld = $self->child
185 or return (0, 0); 330 or return (0, 0);
186 331
187 $chld->move (2, 2); 332 $chld->move (2, 2);
188 333
189 map { $_ + 4 } $chld->size_request; 334 map { $_ + 4 } $chld->size_request;
190} 335}
191 336
337sub size_allocate {
338 my ($self, $w, $h) = @_;
339
340 $self->w ($w);
341 $self->h ($h);
342
343 $self->child->size_allocate ($w - 4, $h - 4);
344 $self->child->move (2, 2);
345}
346
192sub _draw { 347sub _draw {
193 my ($self) = @_; 348 my ($self) = @_;
194 349
195 my $chld = $self->get; 350 my $chld = $self->child;
196 351
197 my ($w, $h) = $chld->size_request; 352 my ($w, $h) = $chld->size_request;
198 353
199 glBegin GL_QUADS; 354 glBegin GL_QUADS;
200 glColor 0, 0, 0; 355 glColor 0, 0, 0;
205 glEnd; 360 glEnd;
206 361
207 $chld->draw; 362 $chld->draw;
208} 363}
209 364
365#############################################################################
366
367package Crossfire::Client::Widget::FancyFrame;
368
369our @ISA = Crossfire::Client::Widget::Frame::;
370
371use SDL::OpenGL;
372
373sub new {
374 my ($self, $theme) = @_;
375 $self = $self->SUPER::new;
376
377 $self->{txts} = [
378 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
379 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png)
380 ];
381 $self
382}
383
384sub size_request {
385 my ($self) = @_;
386
387 my ($w, $h) = $self->SUPER::size_request;
388
389 $h += $self->{txts}->[1]->{height};
390 $h += $self->{txts}->[4]->{height};
391 $w += $self->{txts}->[2]->{width};
392 $w += $self->{txts}->[3]->{width};
393
394 ($w, $h)
395}
396
397sub size_allocate {
398 my ($self, $w, $h) = @_;
399
400 $self->SUPER::size_allocate ($w, $h);
401
402 $h -= $self->{txts}->[1]->{height};
403 $h -= $self->{txts}->[4]->{height};
404 $w -= $self->{txts}->[2]->{width};
405 $w -= $self->{txts}->[3]->{width};
406
407 $h = $h < 0 ? 0 : $h;
408 $w = $w < 0 ? 0 : $w;
409 warn "CHILD:$w $h\n";
410 $self->child->size_allocate ($w, $h);
411 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
412}
413
414sub _draw {
415 my ($self) = @_;
416
417 my ($w, $h) = ($self->w, $self->h);
418 my ($cw, $ch) = ($self->child->w, $self->child->h);
419
420 glEnable GL_BLEND;
421 glEnable GL_TEXTURE_2D;
422 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
423 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
424
425 my $top = $self->{txts}->[1];
426 glBindTexture GL_TEXTURE_2D, $top->{name};
427
428 glBegin GL_QUADS;
429 glTexCoord 0, 0; glVertex 0 , 0;
430 glTexCoord 0, 1; glVertex 0 , $top->{height};
431 glTexCoord 1, 1; glVertex $w , $top->{height};
432 glTexCoord 1, 0; glVertex $w , 0;
433 glEnd;
434
435 my $left = $self->{txts}->[3];
436 glBindTexture GL_TEXTURE_2D, $left->{name};
437
438 glBegin GL_QUADS;
439 glTexCoord 0, 0; glVertex 0 , $top->{height};
440 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
441 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
442 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
443 glEnd;
444
445 my $right = $self->{txts}->[2];
446 glBindTexture GL_TEXTURE_2D, $right->{name};
447
448 glBegin GL_QUADS;
449 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
450 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
451 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
452 glTexCoord 1, 0; glVertex $w , $top->{height};
453 glEnd;
454
455 my $bottom = $self->{txts}->[4];
456 glBindTexture GL_TEXTURE_2D, $bottom->{name};
457
458 glBegin GL_QUADS;
459 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
460 glTexCoord 0, 1; glVertex 0 , $h;
461 glTexCoord 1, 1; glVertex $w , $h;
462 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
463 glEnd;
464
465 my $bg = $self->{txts}->[0];
466 glBindTexture GL_TEXTURE_2D, $bg->{name};
467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
469 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
470
471 my $rep_x = $cw / $bg->{width};
472 my $rep_y = $ch / $bg->{height};
473
474 glBegin GL_QUADS;
475 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
476 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
477 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
478 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
479 glEnd;
480
481 glDisable GL_BLEND;
482 glDisable GL_TEXTURE_2D;
483
484 $self->child->draw;
485
486}
487
488#############################################################################
489
210package Crossfire::Client::Widget::Table; 490package Crossfire::Client::Widget::Table;
211 491
212our @ISA = Crossfire::Client::Widget::Container::; 492our @ISA = Crossfire::Client::Widget::Bin::;
213 493
214use SDL::OpenGL; 494use SDL::OpenGL;
215 495
216sub add { 496sub add {
217 my ($self, $x, $y, $chld) = @_; 497 my ($self, $x, $y, $chld) = @_;
498 my $old_chld = $self->{children}[$y][$x];
499
218 $self->{childs}[$y][$x] = $chld; 500 $self->{children}[$y][$x] = $chld;
501 $chld->set_parent ($self);
502 $self->update;
219} 503}
220 504
221sub max_row_height { 505sub max_row_height {
222 my ($self, $row) = @_; 506 my ($self, $row) = @_;
223 507
224 my $hs = 0; 508 my $hs = 0;
225 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 509 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
226 my $c = $self->{childs}->[$row]->[$xi]; 510 my $c = $self->{children}->[$row]->[$xi];
227 if ($c) { 511 if ($c) {
228 my ($w, $h) = $c->size_request; 512 my ($w, $h) = $c->size_request;
229 if ($hs < $h) { $hs = $h } 513 if ($hs < $h) { $hs = $h }
230 } 514 }
231 } 515 }
234 518
235sub max_col_width { 519sub max_col_width {
236 my ($self, $col) = @_; 520 my ($self, $col) = @_;
237 521
238 my $ws = 0; 522 my $ws = 0;
239 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 523 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
240 my $c = ($self->{childs}->[$yi] || [])->[$col]; 524 my $c = ($self->{children}->[$yi] || [])->[$col];
241 if ($c) { 525 if ($c) {
242 my ($w, $h) = $c->size_request; 526 my ($w, $h) = $c->size_request;
243 if ($ws < $w) { $ws = $w } 527 if ($ws < $w) { $ws = $w }
244 } 528 }
245 } 529 }
249sub size_request { 533sub size_request {
250 my ($self) = @_; 534 my ($self) = @_;
251 535
252 my ($hs, $ws) = (0, 0); 536 my ($hs, $ws) = (0, 0);
253 537
254 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 538 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
255 $hs += $self->max_row_height ($yi); 539 $hs += $self->max_row_height ($yi);
256 } 540 }
257 541
258 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 542 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
259 my $wm = 0; 543 my $wm = 0;
260 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 544 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
261 $wm += $self->max_col_width ($xi) 545 $wm += $self->max_col_width ($xi)
262 } 546 }
263 if ($ws < $wm) { $ws = $wm } 547 if ($ws < $wm) { $ws = $wm }
264 } 548 }
265 549
268 552
269sub _draw { 553sub _draw {
270 my ($self) = @_; 554 my ($self) = @_;
271 555
272 my $y = 0; 556 my $y = 0;
273 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 557 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
274 my $x = 0; 558 my $x = 0;
275 559
276 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 560 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
277 561
278 my $c = $self->{childs}->[$yi]->[$xi]; 562 my $c = $self->{children}->[$yi]->[$xi];
279 if ($c) { 563 if ($c) {
280 $c->move ($x, $y, 0); #TODO: Move to size_request 564 $c->move ($x, $y, 0); #TODO: Move to size_request
281 $c->draw if $c; 565 $c->draw if $c;
282 } 566 }
283 567
286 570
287 $y += $self->max_row_height ($yi); 571 $y += $self->max_row_height ($yi);
288 } 572 }
289} 573}
290 574
575#############################################################################
576
291package Crossfire::Client::Widget::VBox; 577package Crossfire::Client::Widget::VBox;
292 578
293our @ISA = Crossfire::Client::Widget::Container::; 579our @ISA = Crossfire::Client::Widget::Container::;
294 580
295use SDL::OpenGL; 581use SDL::OpenGL;
296 582
297sub add { 583sub size_allocate {
298 my ($self, $chld) = @_; 584 my ($self, $w, $h) = @_;
299 push @{$self->{childs}}, $chld;
300}
301 585
302sub size_request { 586 $self->w ($w);
303 my ($self) = @_; 587 $self->h ($h);
304 588
305 my ($hs, $ws) = (0, 0); 589 my $exp;
590 my @oth;
591 # find expand widget
306 for (@{$self->{childs} || []}) { 592 for (@{$self->{children}}) {
593 if ($_->{expand}) {
594 $exp = $_;
595 last;
596 }
597 push @oth, $_;
598 }
599
600 my ($ow, $oh);
601
602 # get sizes of other widgets
603 for (@oth) {
307 my ($w, $h) = $_->size_request; 604 my ($w, $h) = $_->size_request;
308 $hs += $h; 605 $oh += $h;
309 if ($ws < $w) { $ws = $w } 606 if ($ow < $w) { $ow = $w }
310 } 607 }
311 608
312 return ($ws, $hs); 609 my $y = 0;
610 for (@{$self->{children}}) {
611 $_->move (0, $y);
612
613 if ($_ == $exp) {
614 $_->size_allocate ($w, $h - $oh);
615 $y += $h - $oh;
616 } else {
617 my ($cw, $h) = $_->size_request;
618 $_->size_allocate ($w, $h);
619 $y += $h;
620 }
621 }
313} 622}
314 623
315sub _draw { 624sub _draw {
316 my ($self) = @_; 625 my ($self) = @_;
317 626
318 my ($x, $y); 627 my ($x, $y);
319 for (@{$self->{childs} || []}) { 628 for (@{$self->{children} || []}) {
320 $_->move (0, $y, 0); #TODO: move to size_request
321 $_->draw; 629 $_->draw;
322 my ($w, $h) = $_->size_request;
323 $y += $h; 630 $y += $_->h;
324 } 631 }
325} 632}
633
634#############################################################################
326 635
327package Crossfire::Client::Widget::Label; 636package Crossfire::Client::Widget::Label;
328 637
329our @ISA = Crossfire::Client::Widget::; 638our @ISA = Crossfire::Client::Widget::;
330 639
331use SDL::OpenGL; 640use SDL::OpenGL;
332 641
333sub new { 642sub new {
334 my ($class, $x, $y, $z, $height, $text) = @_; 643 my ($class, $x, $y, $z, $height, $text) = @_;
335 644
645 # TODO: color, and make height, xyz etc. optional
336 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 646 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
337 647
338 $self->set_text ($text); 648 $self->set_text ($text);
339 649
340 $self 650 $self
342 652
343sub set_text { 653sub set_text {
344 my ($self, $text) = @_; 654 my ($self, $text) = @_;
345 655
346 $self->{text} = $text; 656 $self->{text} = $text;
347
348 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 657 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
658
659 $self->update;
349} 660}
350 661
351sub get_text { 662sub get_text {
352 my ($self, $text) = @_; 663 my ($self, $text) = @_;
353 664
372 glEnable GL_TEXTURE_2D; 683 glEnable GL_TEXTURE_2D;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
374 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 685 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
375 glBindTexture GL_TEXTURE_2D, $tex->{name}; 686 glBindTexture GL_TEXTURE_2D, $tex->{name};
376 687
377 glColor 1, 1, 1, 0.8; 688 glColor 1, 0, 0, 1; # TODO color
378 689
379 glBegin GL_QUADS; 690 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , 0; 691 glTexCoord 0, 0; glVertex 0 , 0;
381 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 692 glTexCoord 0, 1; glVertex 0 , $tex->{height};
382 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 693 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
385 696
386 glDisable GL_BLEND; 697 glDisable GL_BLEND;
387 glDisable GL_TEXTURE_2D; 698 glDisable GL_TEXTURE_2D;
388} 699}
389 700
701#############################################################################
702
390package Crossfire::Client::Widget::TextView; 703package Crossfire::Client::Widget::TextEntry;
391 704
392use strict;
393
394our @ISA = qw/Crossfire::Client::Widget/; 705our @ISA = Crossfire::Client::Widget::Label::;
395 706
707use SDL;
396use SDL::OpenGL; 708use SDL::OpenGL;
397use SDL::OpenGL::Constants;
398 709
399sub add_line { 710sub key_down {
400 my ($self, $line) = @_; 711 my ($self, $ev) = @_;
401 push @{$self->{lines}}, $line;
402}
403 712
404sub _draw { 713 my $mod = $ev->key_mod;
405 my ($self) = @_; 714 my $sym = $ev->key_sym;
406 715
716 $ev->set_unicode (1);
717 my $uni = $ev->key_unicode;
718
719 my $text = $self->get_text;
720
721 if ($sym == SDLK_BACKSPACE) {
722 substr $text, -1, 1, '';
723
724 } elsif ($uni) {
725 $text .= chr $uni;
726 }
727 $self->set_text ($text);
407} 728}
729
730#############################################################################
408 731
409package Crossfire::Client::Widget::MapWidget; 732package Crossfire::Client::Widget::MapWidget;
410 733
411use strict; 734use strict;
412 735
421sub key_down { 744sub key_down {
422 print "MAPKEYDOWN\n"; 745 print "MAPKEYDOWN\n";
423} 746}
424 747
425sub key_up { 748sub key_up {
749}
750
751sub size_request {
752
753}
754
755sub size_allocate {
426} 756}
427 757
428sub _draw { 758sub _draw {
429 my ($self) = @_; 759 my ($self) = @_;
430 760
450 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 780 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
451 } 781 }
452 782
453 glEnable GL_TEXTURE_2D; 783 glEnable GL_TEXTURE_2D;
454 glEnable GL_BLEND; 784 glEnable GL_BLEND;
455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
786
787 my $sw4 = ($sw + 3) & ~3;
788 my $lighting = "\x00" x ($sw4 * $sh);
456 789
457 for my $x (0 .. $sw - 1) { 790 for my $x (0 .. $sw - 1) {
458 for my $y (0 .. $sh - 1) { 791 for my $y (0 .. $sh - 1) {
459 792
460 my $cell = $map->[$x + $xofs][$y + $yofs] 793 my $cell = $map->[$x + $xofs][$y + $yofs]
461 or next; 794 or next;
462 795
463 my $darkness = $cell->[0] * (1 / 255); 796 my $darkness = $cell->[0] * (1 / 255);
464 if ($darkness < 0) { 797 if ($darkness < 0) {
465 glColor 0.3, 0.3, 0.3; 798 $darkness = 0.15;
466 } else {
467 glColor $darkness, $darkness, $darkness;
468 } 799 }
800 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
469 801
470 for my $num (grep $_, @$cell[1,2,3]) { 802 for my $num (grep $_, @$cell[1,2,3]) {
471 my $tex = $::CONN->{face}[$num]{texture} || next; 803 my $tex = $::CONN->{face}[$num]{texture} || next;
472 804
473 glBindTexture GL_TEXTURE_2D, $tex->{name}; 805 glBindTexture GL_TEXTURE_2D, $tex->{name};
485 glTexCoord 1, 0; glVertex $px + $w, $py; 817 glTexCoord 1, 0; glVertex $px + $w, $py;
486 glEnd; 818 glEnd;
487 } 819 }
488 } 820 }
489 } 821 }
822
823# if (1) { # higher quality darkness
824# $lighting =~ s/(.)/$1$1$1/gs;
825# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
826#
827# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
828#
829# $lighting = $pb->get_pixels;
830# $lighting =~ s/(.)../$1/gs;
831# }
832
833 $lighting = new Crossfire::Client::Texture
834 width => $sw4,
835 height => $sh,
836 data => $lighting,
837 internalformat => GL_ALPHA4,
838 format => GL_ALPHA;
839
840 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
841 glColor 0, 0, 0, 0.75;
842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
843 glBindTexture GL_TEXTURE_2D, $lighting->{name};
844 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
845 glBegin GL_QUADS;
846 glTexCoord 0, 0; glVertex 0 , 0;
847 glTexCoord 0, 1; glVertex 0 , $sh * 32;
848 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
849 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
850 glEnd;
490 851
491 glDisable GL_TEXTURE_2D; 852 glDisable GL_TEXTURE_2D;
492 glDisable GL_BLEND; 853 glDisable GL_BLEND;
493} 854}
494 855
541 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 902 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
542 $::CONN->send ("command run_stop"); 903 $::CONN->send ("command run_stop");
543 } 904 }
544} 905}
545 906
907#############################################################################
908
909package Crossfire::Client::Widget::Animator;
910
911use SDL::OpenGL;
912
913our @ISA = Crossfire::Client::Widget::Bin::;
914
915sub moveto {
916 my ($self, $x, $y) = @_;
917
918 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
919 $self->{speed} = 0.2;
920 $self->{time} = 1;
921
922 ::animation_start $self;
923}
924
925sub animate {
926 my ($self, $interval) = @_;
927
928 $self->{time} -= $interval * $self->{speed};
929 if ($self->{time} <= 0) {
930 $self->{time} = 0;
931 ::animation_stop $self;
932 }
933
934 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
935
936 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
937 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
938}
939
940sub _draw {
941 my ($self) = @_;
942
943 glPushMatrix;
944 glRotate $self->{time} * 10000, 0, 1, 0;
945 $self->{children}[0]->draw;
946 glPopMatrix;
947}
948
5461; 9491;
547 950

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines