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.35 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.47 by root, Sun Apr 9 22:24:43 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;
11#our @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 { } 15sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { } 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} 22}
24
25#sub activate {
26# push @ACTIVE_WIDGETS, $_[0];
27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
29
30#sub deactivate {
31# @ACTIVE_WIDGETS =
32# sort { $a->{z} <=> $b->{z} }
33# grep { $_ && $_ != $_[0] }
34# @ACTIVE_WIDGETS;
35#}
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;
40 $self->{y} = $y; 27 $self->{y} = $y;
… …
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;
55} 50}
56 51
57sub focus_out { 52sub focus_out {
58 my ($widget) = @_; 53 my ($widget) = @_;
59} 54}
… …
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 {
84 my ($self) = @_; 79 my ($self) = @_;
85 80
86 glPushMatrix; 81 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 82 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 83 $self->_draw;
84 if ($self == $::HOVER) {
85 glColor 1, 1, 1, 1;
86 glBegin GL_LINES;
87 glVertex 0, 0;
88 glVertex $self->{w} - 1, 0;
89 glVertex $self->{w} - 1, $self->{h} - 1;
90 glVertex 0, $self->{h} - 1;
91 glVertex 0, 0;
92 glEnd;
93 }
89 glPopMatrix; 94 glPopMatrix;
90} 95}
91 96
92sub _draw { 97sub _draw {
93 my ($widget) = @_; 98 my ($self) = @_;
99
100 warn "no draw defined for $self\n";
94} 101}
95 102
96sub bbox { 103sub bbox {
97 my ($self) = @_; 104 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 105 my ($w, $h) = $self->size_request;
… …
102 $self->{x} = $w, 109 $self->{x} = $w,
103 $self->{y} = $h 110 $self->{y} = $h
104 ) 111 )
105} 112}
106 113
114sub find_widget {
115 my ($self, $x, $y) = @_;
116
117 return $self
118 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
119 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
120
121 ()
122}
123
107sub del_parent { $_[0]->{parent} = undef } 124sub del_parent { $_[0]->{parent} = undef }
108 125
109sub set_parent { 126sub set_parent {
110 my ($self, $par) = @_; 127 my ($self, $par) = @_;
111 128
… …
128 my ($self) = @_; 145 my ($self) = @_;
129 146
130 #$self->deactivate; 147 #$self->deactivate;
131} 148}
132 149
150#############################################################################
151
152package Crossfire::Client::Widget::Container;
153
154our @ISA = Crossfire::Client::Widget::;
155
156sub new {
157 my ($class, @widgets) = @_;
158
159 my $self = $class->SUPER::new (children => []);
160 $self->add ($_) for @widgets;
161
162 $self
163}
164
165sub add {
166 my ($self, $chld, $expand) = @_;
167
168 $chld->{expand} = $expand;
169 $chld->set_parent ($self);
170
171 @{$self->{children}} =
172 sort { $a->{z} <=> $b->{z} }
173 @{$self->{children}}, $chld;
174
175 $self->size_allocate ($self->{w}, $self->{h})
176 if $self->{w}; #TODO: check for "realised state"
177}
178
179sub remove {
180 my ($self, $widget) = @_;
181
182 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
183
184 $self->size_allocate ($self->{w}, $self->{h});
185}
186
187sub find_widget {
188 my ($self, $x, $y) = @_;
189
190 $x -= $self->{x};
191 $y -= $self->{y};
192
193 my $res;
194
195 for (reverse @{ $self->{children} }) {
196 $res = $_->find_widget ($x, $y)
197 and return $res;
198 }
199
200 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
201}
202
203sub _draw {
204 my ($self) = @_;
205
206 $_->draw for @{$self->{children}};
207}
208
209#############################################################################
210
133package Crossfire::Client::Widget::Bin; 211package Crossfire::Client::Widget::Bin;
134 212
135our @ISA = Crossfire::Client::Widget::; 213our @ISA = Crossfire::Client::Widget::Container::;
136 214
137sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
138
139sub get { $_[0]->{child} } 215sub child { $_[0]->{children}[0] }
140
141sub remove {
142 my ($self, $chld) = @_;
143 delete $self->{child}
144 if $self->{child} == $chld;
145}
146 216
147sub size_request { 217sub size_request {
148 $_[0]->{child}->size_request if $_[0]->{child} 218 $_[0]{children}[0]->size_request if $_[0]{children}[0];
149} 219}
150 220
151sub _draw { 221sub size_allocate {
152 my ($self) = @_; 222 my ($self, $w, $h) = @_;
153 223
154 $self->{child}->draw; 224 $self->SUPER::size_allocate ($w, $h);
225 $self->{children}[0]->size_allocate ($w, $h)
226 if $self->{children}[0]
155} 227}
228
229#############################################################################
156 230
157package Crossfire::Client::Widget::Toplevel; 231package Crossfire::Client::Widget::Toplevel;
158 232
233our @ISA = Crossfire::Client::Widget::Container::;
234
235sub update {
236 my ($self) = @_;
237
238 ::refresh ();
239}
240
241sub add {
242 my ($self, $widget) = @_;
243
244 $self->SUPER::add ($widget);
245
246 $widget->size_allocate ($widget->size_request);
247}
248
249#############################################################################
250
251package Crossfire::Client::Widget::Window;
252
159our @ISA = Crossfire::Client::Widget::; 253our @ISA = Crossfire::Client::Widget::Bin::;
160 254
161use SDL::OpenGL; 255use SDL::OpenGL;
162 256
163sub add { 257sub new {
164 my ($self, $chld) = @_; 258 my ($class, $x, $y, $z, $w, $h) = @_;
165 259
166 push @{$self->{childs}}, $chld; 260 my $self = $class->SUPER::new;
167 @{$self->{childs}} =
168 sort { $a->{z} <=> $b->{z} }
169 @{$self->{childs}};
170 261
171 $chld->set_parent ($self); 262 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180} 263}
181 264
182sub update { 265sub update {
183 my ($self) = @_; 266 my ($self) = @_;
184 ::refresh ();
185}
186 267
187sub _draw {
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 $self->SUPER::add ($chld);
202 $chld->set_parent ($self);
203 $self->update; #TODO: Move this to the size_request event propably?
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld; 268 $self->render_chld;
269 $self->SUPER::update;
215} 270}
216 271
217sub render_chld { 272sub render_chld {
218 my ($self) = @_; 273 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221 274
222 $self->{texture} = 275 $self->{texture} =
223 Crossfire::Client::Texture->new_from_opengl ( 276 Crossfire::Client::Texture->new_from_opengl (
224 $w, $h, sub { $chld->draw } 277 $self->{w}, $self->{h}, sub { $self->child->draw }
225 ); 278 );
226 $self->{texture}->upload;
227} 279}
228 280
229sub size_request { 281sub size_allocate {
230 my ($self) = @_; 282 my ($self, $w, $h) = @_;
231 my $chld = $self->get 283
232 or return (0, 0); 284 $self->{w} = $w;
233 $chld->size_request 285 $self->{h} = $h;
286
287 $self->child->size_allocate ($w, $h);
288
289 $self->render_chld;
234} 290}
235 291
236sub _draw { 292sub _draw {
237 my ($self) = @_; 293 my ($self) = @_;
238 294
239 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 295 my ($w, $h) = ($self->w, $self->h);
240 296
241 my $tex = $self->{texture} 297 my $tex = $self->{texture}
242 or return; 298 or return;
243 299
244 glEnable GL_BLEND; 300 glEnable GL_BLEND;
… …
255 311
256 glDisable GL_BLEND; 312 glDisable GL_BLEND;
257 glDisable GL_TEXTURE_2D; 313 glDisable GL_TEXTURE_2D;
258} 314}
259 315
316#############################################################################
317
260package Crossfire::Client::Widget::Frame; 318package Crossfire::Client::Widget::Frame;
261 319
262our @ISA = Crossfire::Client::Widget::Bin::; 320our @ISA = Crossfire::Client::Widget::Bin::;
263 321
264use SDL::OpenGL; 322use SDL::OpenGL;
265 323
266sub size_request { 324sub size_request {
267 my ($self) = @_; 325 my ($self) = @_;
268 my $chld = $self->get 326 my $chld = $self->child
269 or return (0, 0); 327 or return (0, 0);
270 328
271 $chld->move (2, 2); 329 $chld->move (2, 2);
272 330
273 map { $_ + 4 } $chld->size_request; 331 map { $_ + 4 } $chld->size_request;
274} 332}
275 333
334sub size_allocate {
335 my ($self, $w, $h) = @_;
336
337 $self->{w} = $w;
338 $self->{h} = $h;
339
340 $self->child->size_allocate ($w - 4, $h - 4);
341 $self->child->move (2, 2);
342}
343
276sub _draw { 344sub _draw {
277 my ($self) = @_; 345 my ($self) = @_;
278 346
279 my $chld = $self->get; 347 my $chld = $self->child;
280 348
281 my ($w, $h) = $chld->size_request; 349 my ($w, $h) = $chld->size_request;
282 350
283 glBegin GL_QUADS; 351 glBegin GL_QUADS;
284 glColor 0, 0, 0; 352 glColor 0, 0, 0;
… …
289 glEnd; 357 glEnd;
290 358
291 $chld->draw; 359 $chld->draw;
292} 360}
293 361
362#############################################################################
363
294package Crossfire::Client::Widget::FancyFrame; 364package Crossfire::Client::Widget::FancyFrame;
295 365
296our @ISA = Crossfire::Client::Widget::Frame::; 366our @ISA = Crossfire::Client::Widget::Bin::;
297 367
298use SDL::OpenGL; 368use SDL::OpenGL;
299 369
300sub new { 370my @tex =
301 my ($self, $theme) = @_;
302 $self = $self->SUPER::new;
303
304 $self->{txts} = [
305 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 371 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
306 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 372 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
307 ];
308 $self
309
310}
311 373
312sub size_request { 374sub size_request {
313 my ($self) = @_; 375 my ($self) = @_;
376
314 my ($w, $h) = $self->get->size_request; 377 my ($w, $h) = $self->SUPER::size_request;
315 378
316 $h += $self->{txts}->[1]->{height}; 379 $h += $tex[1]->{height};
317 $h += $self->{txts}->[4]->{height}; 380 $h += $tex[4]->{height};
318 $w += $self->{txts}->[2]->{width}; 381 $w += $tex[2]->{width};
319 $w += $self->{txts}->[3]->{width}; 382 $w += $tex[3]->{width};
320
321 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
322 383
323 ($w, $h) 384 ($w, $h)
324} 385}
325 386
387sub size_allocate {
388 my ($self, $w, $h) = @_;
389
390 $self->SUPER::size_allocate ($w, $h);
391
392 $h -= $tex[1]->{height};
393 $h -= $tex[4]->{height};
394 $w -= $tex[2]->{width};
395 $w -= $tex[3]->{width};
396
397 $h = $h < 0 ? 0 : $h;
398 $w = $w < 0 ? 0 : $w;
399
400 $self->child->size_allocate ($w, $h);
401 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
402}
403
326sub _draw { 404sub _draw {
327 my ($self) = @_; 405 my ($self) = @_;
328 406
329 my ($w, $h) = $self->size_request; 407 my ($w, $h) = ($self->{w}, $self->{h});
330 my ($cw, $ch) = $self->get->size_request; 408 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
331 409
332 glEnable GL_BLEND; 410 glEnable GL_BLEND;
333 glEnable GL_TEXTURE_2D; 411 glEnable GL_TEXTURE_2D;
334 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 412 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
336 414
337
338 my $top = $self->{txts}->[1]; 415 my $top = $tex[1];
339 glBindTexture GL_TEXTURE_2D, $top->{name}; 416 glBindTexture GL_TEXTURE_2D, $top->{name};
340 417
341 glColor 1, 1, 1, 0.8;
342
343 glBegin GL_QUADS; 418 glBegin GL_QUADS;
344 glTexCoord 0, 0; glVertex 0 , 0; 419 glTexCoord 0, 0; glVertex 0 , 0;
345 glTexCoord 0, 1; glVertex 0 , $top->{height}; 420 glTexCoord 0, 1; glVertex 0 , $top->{height};
346 glTexCoord 1, 1; glVertex $w , $top->{height}; 421 glTexCoord 1, 1; glVertex $w , $top->{height};
347 glTexCoord 1, 0; glVertex $w , 0; 422 glTexCoord 1, 0; glVertex $w , 0;
348 glEnd; 423 glEnd;
349 424
350 my $left = $self->{txts}->[3]; 425 my $left = $tex[3];
351 glBindTexture GL_TEXTURE_2D, $left->{name}; 426 glBindTexture GL_TEXTURE_2D, $left->{name};
352 427
353 glColor 1, 1, 1, 0.8;
354
355 glBegin GL_QUADS; 428 glBegin GL_QUADS;
356 glTexCoord 0, 0; glVertex 0 , $top->{height}; 429 glTexCoord 0, 0; glVertex 0 , $top->{height};
357 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch; 430 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
358 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch; 431 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
359 glTexCoord 1, 0; glVertex $left->{width}, $top->{height}; 432 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
360 glEnd; 433 glEnd;
361 434
362 my $right = $self->{txts}->[2]; 435 my $right = $tex[2];
363 glBindTexture GL_TEXTURE_2D, $right->{name}; 436 glBindTexture GL_TEXTURE_2D, $right->{name};
364 437
365 glColor 1, 1, 1, 0.8;
366
367 glBegin GL_QUADS; 438 glBegin GL_QUADS;
368 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height}; 439 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
369 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch; 440 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
370 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch; 441 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
371 glTexCoord 1, 0; glVertex $w , $top->{height}; 442 glTexCoord 1, 0; glVertex $w , $top->{height};
372 glEnd; 443 glEnd;
373 444
374 my $bottom = $self->{txts}->[4]; 445 my $bottom = $tex[4];
375 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 446 glBindTexture GL_TEXTURE_2D, $bottom->{name};
376 447
377 glColor 1, 1, 1, 0.8;
378
379 glBegin GL_QUADS; 448 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height}; 449 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
381 glTexCoord 0, 1; glVertex 0 , $h; 450 glTexCoord 0, 1; glVertex 0 , $h;
382 glTexCoord 1, 1; glVertex $w , $h; 451 glTexCoord 1, 1; glVertex $w , $h;
383 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height}; 452 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
384 glEnd; 453 glEnd;
385 454
386 my $bg = $self->{txts}->[0]; 455 my $bg = $tex[0];
387 glBindTexture GL_TEXTURE_2D, $bg->{name}; 456 glBindTexture GL_TEXTURE_2D, $bg->{name};
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
388 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
389 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
390 460
391 glColor 1, 1, 1, 0.8;
392
393 my $rep_x = $cw / $bg->{width}; 461 my $rep_x = $cw / $bg->{width};
394 my $rep_y = $ch / $bg->{height}; 462 my $rep_y = $ch / $bg->{height};
395 463
396 glBegin GL_QUADS; 464 glBegin GL_QUADS;
397 glTexCoord 0, 0; glVertex $left->{width}, $top->{height}; 465 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
398 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch; 466 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
399 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch; 467 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
400 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height}; 468 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
401 glEnd; 469 glEnd;
402
403 $self->get->draw;
404 470
405 glDisable GL_BLEND; 471 glDisable GL_BLEND;
406 glDisable GL_TEXTURE_2D; 472 glDisable GL_TEXTURE_2D;
473
474 $self->child->draw;
475
407} 476}
477
478#############################################################################
408 479
409package Crossfire::Client::Widget::Table; 480package Crossfire::Client::Widget::Table;
410 481
411our @ISA = Crossfire::Client::Widget::Bin::; 482our @ISA = Crossfire::Client::Widget::Bin::;
412 483
413use SDL::OpenGL; 484use SDL::OpenGL;
414 485
415sub add { 486sub add {
416 my ($self, $x, $y, $chld) = @_; 487 my ($self, $x, $y, $chld) = @_;
417 my $old_chld = $self->{childs}[$y][$x]; 488 my $old_chld = $self->{children}[$y][$x];
418 489
419 $self->{childs}[$y][$x] = $chld; 490 $self->{children}[$y][$x] = $chld;
420 $chld->set_parent ($self); 491 $chld->set_parent ($self);
421 $self->update; 492 $self->update;
422} 493}
423 494
424sub max_row_height { 495sub max_row_height {
425 my ($self, $row) = @_; 496 my ($self, $row) = @_;
426 497
427 my $hs = 0; 498 my $hs = 0;
428 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 499 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
429 my $c = $self->{childs}->[$row]->[$xi]; 500 my $c = $self->{children}->[$row]->[$xi];
430 if ($c) { 501 if ($c) {
431 my ($w, $h) = $c->size_request; 502 my ($w, $h) = $c->size_request;
432 if ($hs < $h) { $hs = $h } 503 if ($hs < $h) { $hs = $h }
433 } 504 }
434 } 505 }
… …
437 508
438sub max_col_width { 509sub max_col_width {
439 my ($self, $col) = @_; 510 my ($self, $col) = @_;
440 511
441 my $ws = 0; 512 my $ws = 0;
442 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 513 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
443 my $c = ($self->{childs}->[$yi] || [])->[$col]; 514 my $c = ($self->{children}->[$yi] || [])->[$col];
444 if ($c) { 515 if ($c) {
445 my ($w, $h) = $c->size_request; 516 my ($w, $h) = $c->size_request;
446 if ($ws < $w) { $ws = $w } 517 if ($ws < $w) { $ws = $w }
447 } 518 }
448 } 519 }
… …
452sub size_request { 523sub size_request {
453 my ($self) = @_; 524 my ($self) = @_;
454 525
455 my ($hs, $ws) = (0, 0); 526 my ($hs, $ws) = (0, 0);
456 527
457 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 528 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
458 $hs += $self->max_row_height ($yi); 529 $hs += $self->max_row_height ($yi);
459 } 530 }
460 531
461 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
462 my $wm = 0; 533 my $wm = 0;
463 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 534 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
464 $wm += $self->max_col_width ($xi) 535 $wm += $self->max_col_width ($xi)
465 } 536 }
466 if ($ws < $wm) { $ws = $wm } 537 if ($ws < $wm) { $ws = $wm }
467 } 538 }
468 539
… …
471 542
472sub _draw { 543sub _draw {
473 my ($self) = @_; 544 my ($self) = @_;
474 545
475 my $y = 0; 546 my $y = 0;
476 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 547 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
477 my $x = 0; 548 my $x = 0;
478 549
479 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 550 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
480 551
481 my $c = $self->{childs}->[$yi]->[$xi]; 552 my $c = $self->{children}->[$yi]->[$xi];
482 if ($c) { 553 if ($c) {
483 $c->move ($x, $y, 0); #TODO: Move to size_request 554 $c->move ($x, $y, 0); #TODO: Move to size_request
484 $c->draw if $c; 555 $c->draw if $c;
485 } 556 }
486 557
… …
489 560
490 $y += $self->max_row_height ($yi); 561 $y += $self->max_row_height ($yi);
491 } 562 }
492} 563}
493 564
565#############################################################################
566
494package Crossfire::Client::Widget::VBox; 567package Crossfire::Client::Widget::VBox;
495 568
496our @ISA = Crossfire::Client::Widget::Bin::; 569our @ISA = Crossfire::Client::Widget::Container::;
497 570
498use SDL::OpenGL; 571use SDL::OpenGL;
499 572
500sub add {
501 my ($self, $chld) = @_;
502 push @{$self->{childs}}, $chld;
503 $chld->set_parent ($self);
504 $self->update;
505}
506
507sub size_request { 573sub size_request {
508 my ($self) = @_; 574 my ($self) = @_;
509 575
510 my ($hs, $ws) = (0, 0); 576 my @alloc = map [$_->size_request], @{$self->{children}};
577
578 (
579 (List::Util::max map $_->[0], @alloc),
580 (List::Util::sum map $_->[1], @alloc),
581 )
582}
583
584sub size_allocate {
585 my ($self, $w, $h) = @_;
586
587 $self->w ($w);
588 $self->h ($h);
589
590 my $exp;
591 my @oth;
592 # find expand widget
511 for (@{$self->{childs} || []}) { 593 for (@{$self->{children}}) {
594 if ($_->{expand}) {
595 $exp = $_;
596 last;
597 }
598 push @oth, $_;
599 }
600
601 my ($ow, $oh);
602
603 # get sizes of other widgets
604 for (@oth) {
512 my ($w, $h) = $_->size_request; 605 my ($w, $h) = $_->size_request;
513 $hs += $h; 606 $oh += $h;
514 if ($ws < $w) { $ws = $w } 607 if ($ow < $w) { $ow = $w }
515 } 608 }
516 609
517 return ($ws, $hs); 610 my $y = 0;
518}
519
520sub _draw {
521 my ($self) = @_;
522
523 my ($x, $y);
524 for (@{$self->{childs} || []}) { 611 for (@{$self->{children}}) {
525 $_->move (0, $y, 0); #TODO: move to size_request 612 $_->move (0, $y);
526 $_->draw; 613
614 if ($_ == $exp) {
615 $_->size_allocate ($w, $h - $oh);
616 $y += $h - $oh;
617 } else {
527 my ($w, $h) = $_->size_request; 618 my ($cw, $h) = $_->size_request;
619 $_->size_allocate ($w, $h);
528 $y += $h; 620 $y += $h;
621 }
529 } 622 }
530} 623}
624
625#############################################################################
531 626
532package Crossfire::Client::Widget::Label; 627package Crossfire::Client::Widget::Label;
533 628
534our @ISA = Crossfire::Client::Widget::; 629our @ISA = Crossfire::Client::Widget::;
535 630
… …
579 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
580 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
582 glBindTexture GL_TEXTURE_2D, $tex->{name}; 677 glBindTexture GL_TEXTURE_2D, $tex->{name};
583 678
584 glColor 1, 1, 1, 0.6; # TODO color 679 glColor 1, 0, 0, 1; # TODO color
585 680
586 glBegin GL_QUADS; 681 glBegin GL_QUADS;
587 glTexCoord 0, 0; glVertex 0 , 0; 682 glTexCoord 0, 0; glVertex 0 , 0;
588 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 683 glTexCoord 0, 1; glVertex 0 , $tex->{height};
589 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 684 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
592 687
593 glDisable GL_BLEND; 688 glDisable GL_BLEND;
594 glDisable GL_TEXTURE_2D; 689 glDisable GL_TEXTURE_2D;
595} 690}
596 691
692#############################################################################
693
597package Crossfire::Client::Widget::TextEntry; 694package Crossfire::Client::Widget::TextEntry;
598 695
599our @ISA = Crossfire::Client::Widget::Label::; 696our @ISA = Crossfire::Client::Widget::Label::;
600 697
601use SDL; 698use SDL;
… …
619 $text .= chr $uni; 716 $text .= chr $uni;
620 } 717 }
621 $self->set_text ($text); 718 $self->set_text ($text);
622} 719}
623 720
624 721#############################################################################
625# XXX: TextView isn't neccessary with pango multiline text rendering
626package Crossfire::Client::Widget::TextView;
627
628use strict;
629
630our @ISA = qw/Crossfire::Client::Widget/;
631
632use SDL::OpenGL;
633use SDL::OpenGL::Constants;
634
635sub new {
636 my ($class, $text, $h) = @_;
637 my $self = $class->SUPER::new ();
638
639 $self->{txt_height} = $h;
640 @{$self->{lines}} = split /\r?\n/, $text;
641
642 for (split /\r?\n/, $text) {
643 $self->add_line ($_);
644 }
645 $self
646}
647
648#sub render_lines {
649# my ($self) = @_;
650#
651# $self->{txt_lines} = [];
652#
653# for (@{$self->{lines}}) {
654# push @{$self->{txt_lines}},
655# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
656# }
657#}
658
659sub add_line {
660 my ($self, $line) = @_;
661 push @{$self->{lines}}, $line;
662
663 push @{$self->{txt_lines}},
664 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
665}
666
667sub size_request {
668 my ($self) = @_;
669
670 my $w = 0;
671 my $h = 0;
672
673 for (@{$self->{txt_lines}}) {
674 if ($w < $_->{width}) { $w = $_->{width} }
675 $h += $_->{height};
676 }
677
678 return ($w, $h);
679}
680
681sub draw_line {
682 my ($self, $tex, $y) = @_;
683
684 glBindTexture GL_TEXTURE_2D, $tex->{name};
685
686 glColor 1, 0, 1;
687
688 glBegin GL_QUADS;
689 glTexCoord 0, 0; glVertex 0 , $y;
690 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
691 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
692 glTexCoord 1, 0; glVertex $tex->{width}, $y;
693 glEnd;
694}
695
696sub _draw {
697 my ($self) = @_;
698
699 glEnable GL_BLEND;
700 glEnable GL_TEXTURE_2D;
701 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
702
703 my $l = 0;
704 for (@{$self->{txt_lines}}) {
705 $self->draw_line ($_, $l);
706 $l += $_->{height};
707 }
708
709 glDisable GL_BLEND;
710 glDisable GL_TEXTURE_2D;
711}
712 722
713package Crossfire::Client::Widget::MapWidget; 723package Crossfire::Client::Widget::MapWidget;
714 724
715use strict; 725use strict;
716 726
… …
725sub key_down { 735sub key_down {
726 print "MAPKEYDOWN\n"; 736 print "MAPKEYDOWN\n";
727} 737}
728 738
729sub key_up { 739sub key_up {
740}
741
742sub size_request {
743
744}
745
746sub size_allocate {
730} 747}
731 748
732sub _draw { 749sub _draw {
733 my ($self) = @_; 750 my ($self) = @_;
734 751
… …
876 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 893 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
877 $::CONN->send ("command run_stop"); 894 $::CONN->send ("command run_stop");
878 } 895 }
879} 896}
880 897
898#############################################################################
899
881package Crossfire::Client::Widget::Animator; 900package Crossfire::Client::Widget::Animator;
882 901
883use SDL::OpenGL; 902use SDL::OpenGL;
884 903
885our @ISA = Crossfire::Client::Widget::Bin::; 904our @ISA = Crossfire::Client::Widget::Bin::;
886 905
887sub moveto { 906sub moveto {
888 my ($self, $x, $y) = @_; 907 my ($self, $x, $y) = @_;
889 908
890 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 909 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
891 $self->{speed} = 0.01; 910 $self->{speed} = 0.2;
892 $self->{time} = 1; 911 $self->{time} = 1;
893 912
894 ::animation_start $self; 913 ::animation_start $self;
895} 914}
896 915
… …
912sub _draw { 931sub _draw {
913 my ($self) = @_; 932 my ($self) = @_;
914 933
915 glPushMatrix; 934 glPushMatrix;
916 glRotate $self->{time} * 10000, 0, 1, 0; 935 glRotate $self->{time} * 10000, 0, 1, 0;
917 $self->{child}->draw; 936 $self->{children}[0]->draw;
918 glPopMatrix; 937 glPopMatrix;
919} 938}
920 939
9211; 9401;
922 941

Diff Legend

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